feat(auth): only show auth form if define in config

infra-geo-ouverte · Sep 15, 2017 · bb496a5 · bb496a5
1 parent 158c7e0
commit bb496a5
Show file tree

Hide file tree

Showing 10 changed files with 75 additions and 31 deletions.
diff --git a/src/demo-app/app/app.component.html b/src/demo-app/app/app.component.html
@@ -1,6 +1,6 @@
 <igo-spinner igoSpinnerBinding></igo-spinner>
 <igo-message-center></igo-message-center>
-<!--igo-auth-form></igo-auth-form-->
+<igo-auth-form></igo-auth-form>
 
 <md-sidenav-container>
 
@@ -95,7 +95,7 @@
         [map]="map">
         <igo-zoom-button [map]="map" color="primary"></igo-zoom-button>
         <igo-geolocate-button [map]="map" color="primary"></igo-geolocate-button>
-        <!--igo-user-button [map]="map" color="primary"></igo-user-button-->
+        <igo-user-button [map]="map" color="primary"></igo-user-button>
       </igo-map-browser>
     </md-card-content>
   </md-card>
@@ -173,5 +173,4 @@
       </form>
     </md-card-content>
   </md-card>
-
 </md-sidenav-container>
diff --git a/src/demo-app/app/app.component.ts b/src/demo-app/app/app.component.ts
@@ -72,10 +72,10 @@ export class AppComponent implements OnInit {
 
       if (map !== undefined) {
         this.dataSourceService
-          .createAsyncDataSource(feature.properties as AnyDataSourceContext)
+          .createAsyncDataSource(feature.layer as AnyDataSourceContext)
           .subscribe(dataSource =>  {
             map.addLayer(
-              this.layerService.createLayer(dataSource, feature.properties));
+              this.layerService.createLayer(dataSource, feature.layer));
           });
       }
     }

diff --git a/src/lib/auth/auth-form/auth-form.component.html b/src/lib/auth/auth-form/auth-form.component.html
@@ -1,23 +1,25 @@
-<div *ngIf="!auth.logged && backgroundDisable" class="backgroundDisable"></div>
+<div *ngIf="visible">
+  <div *ngIf="!auth.logged && backgroundDisable" class="backgroundDisable"></div>
 
-<div *ngIf="!auth.logged" class="login center-block">
-  <h1>{{'igo.auth.connection' | translate}}</h1>
+  <div *ngIf="!auth.logged" class="login center-block">
+    <h1>{{'igo.auth.connection' | translate}}</h1>
 
-  <igo-auth-google
-    *ngIf="options.google && options.google.enabled !== false"
-    (onLogin)="login()">
-  </igo-auth-google>
-  <igo-auth-facebook
-    *ngIf="options.facebook && options.facebook.enabled !== false"
-    (onLogin)="login()">
-  </igo-auth-facebook>
-  <igo-auth-intern
-    *ngIf="!options.intern || options.intern.enabled !== false"
-    (onLogin)="login()">
-  </igo-auth-intern>
-</div>
+    <igo-auth-google
+      *ngIf="options.google && options.google.enabled !== false"
+      (onLogin)="login()">
+    </igo-auth-google>
+    <igo-auth-facebook
+      *ngIf="options.facebook && options.facebook.enabled !== false"
+      (onLogin)="login()">
+    </igo-auth-facebook>
+    <igo-auth-intern
+      *ngIf="!options.intern || options.intern.enabled !== false"
+      (onLogin)="login()">
+    </igo-auth-intern>
+  </div>
 
-<div *ngIf="auth.logged && alreadyConnectedDiv" class="login center-block">
-  <p>{{'igo.auth.welcome' | translate: user}}</p>
-  <button type="button" (click)="logout()">{{'igo.auth.signOut' | translate}}</button>
+  <div *ngIf="auth.logged && alreadyConnectedDiv" class="login center-block">
+    <p>{{'igo.auth.welcome' | translate: user}}</p>
+    <button type="button" (click)="logout()">{{'igo.auth.signOut' | translate}}</button>
+  </div>
 </div>
diff --git a/src/lib/auth/auth-form/auth-form.component.ts b/src/lib/auth/auth-form/auth-form.component.ts
@@ -34,12 +34,15 @@ export class AuthFormComponent implements OnInit {
   private options: AuthOptions;
   private user;
 
+  public visible: boolean = true;
+
   constructor(
     public auth: AuthService,
     private config: ConfigService,
     @Optional() private router: Router
   ) {
     this.options = this.config.getConfig('auth') || {};
+    this.visible = Object.getOwnPropertyNames(this.options).length !== 0;
 
     if (this.auth.decodeToken()) {
         this.user = {

diff --git a/src/lib/catalog/catalog-list/catalog-list-binding.directive.ts b/src/lib/catalog/catalog-list/catalog-list-binding.directive.ts
@@ -27,6 +27,8 @@ export class CatalogListBindingDirective implements OnInit, OnDestroy {
     // Override input catalogs
     this.catalogs$$ = this.catalogService.catalogs$
       .subscribe(catalogs => this.handleCatalogsChange(catalogs));
+
+    this.catalogService.load();
   }
 
   ngOnDestroy() {

diff --git a/src/lib/catalog/shared/catalog.service.ts b/src/lib/catalog/shared/catalog.service.ts
@@ -19,12 +19,8 @@ export class CatalogService {
               private config: ConfigService) {
 
     const options = this.config.getConfig('context') || {};
-    const catalog = this.config.getConfig('catalog') || {};
-    this.baseUrl = options.url;
 
-    if (catalog.sources) {
-      this.catalogs$.next(catalog.sources);
-    }
+    this.baseUrl = options.url;
   }
 
   get(): Observable<Catalog[]> {
@@ -53,4 +49,17 @@ export class CatalogService {
     }
   }
 
+  load() {
+    this.get().subscribe((catalogs) => {
+      const catalogConfig = this.config.getConfig('catalog') || {};
+
+      if (catalogConfig.sources) {
+        catalogs = catalogs.concat(catalogConfig.sources);
+      }
+      if (catalogs) {
+        this.catalogs$.next(catalogs);
+      }
+    });
+  }
+
 }
diff --git a/src/lib/map/user-button/user-button.component.html b/src/lib/map/user-button/user-button.component.html
@@ -1,4 +1,4 @@
-<div class="igo-user-button-container">
+<div *ngIf="visible" class="igo-user-button-container">
   <div class="igo-user-button-more-container" [@userButtonState]="expand ? 'expand' : 'collapse'">
 
     <igo-poi-button [color]="color" [map]="map"></igo-poi-button>

diff --git a/src/lib/map/user-button/user-button.component.ts b/src/lib/map/user-button/user-button.component.ts
@@ -1,6 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { MdDialog } from '@angular/material';
 
+import { ConfigService } from '../../core';
 import { AuthService } from '../../auth';
 import { IgoMap } from '../shared';
 import { UserDialogComponent } from './user-dialog.component';
@@ -31,11 +32,15 @@ export class UserButtonComponent {
   private _color: string;
 
   public expand: boolean = false;
+  public visible: boolean = false;
 
   constructor(
     private dialog: MdDialog,
+    private config: ConfigService,
     public auth: AuthService
-  ) {}
+  ) {
+    this.visible = this.config.getConfig('auth') ? true : false;
+  }
 
   accountClick() {
     if (this.auth.authenticated) {

diff --git a/src/locale/en.json b/src/locale/en.json
@@ -109,6 +109,18 @@
 			"title": "Title"
 		},
 		"searchResults": "Search Results",
+    "search": {
+      "dataSources": {
+        "name": "Layers",
+        "properties": {
+          "title": "Title",
+          "group": "Group",
+          "abstract": "Abstract",
+          "url": "URL",
+          "type": "Type"
+        }
+      }
+    },
 		"table": {
 			"filter": "Filter"
 		},

diff --git a/src/locale/fr.json b/src/locale/fr.json
@@ -109,6 +109,18 @@
 			"resolution": "Résolution",
 			"title": "Titre"
 		},
+    "search": {
+      "dataSources": {
+        "name": "Couches",
+        "properties": {
+          "title": "Titre",
+          "group": "Groupe",
+          "abstract": "Description",
+          "url": "URL",
+          "type": "Type"
+        }
+      }
+    },
 		"searchResults": "Résultats de recherche",
 		"table": {
 			"filter": "Filtre"