fix(package): assign default config after initializing the main compo…

…nent # 190
AnthonyNahas · Feb 24, 2019 · 5684afd · 5684afd
1 parent b428970
commit 5684afd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/src/module/components/auth/auth.component.ts b/src/module/components/auth/auth.component.ts
@@ -8,6 +8,8 @@ import {Subscription} from 'rxjs/internal/Subscription';
 import {AuthProcessService, AuthProvider} from '../../services/auth-process.service';
 import {LegalityDialogComponent} from '../../components/legality-dialog/legality-dialog.component';
 import {LegalityDialogParams, LegalityDialogResult} from '../../interfaces/legality.dialog.intreface';
+import {NgxAuthFirebaseUIConfig, NgxAuthFirebaseUIConfigToken} from '../../ngx-auth-firebase-u-i.module';
+import {defaultAuthFirebaseUIConfig} from '../../interfaces/config.interface';
 
 
 export const EMAIL_REGEX = new RegExp(['^(([^<>()[\\]\\\.,;:\\s@\"]+(\\.[^<>()\\[\\]\\\.,;:\\s@\"]+)*)',
@@ -83,6 +85,7 @@ export class AuthComponent implements OnInit, OnChanges, OnDestroy {
   resetPasswordEmailFormControl: AbstractControl;
 
   constructor(@Inject(PLATFORM_ID) private platformId: Object,
+              @Inject(NgxAuthFirebaseUIConfigToken) private config: NgxAuthFirebaseUIConfig,
               public auth: AngularFireAuth,
               public authProcess: AuthProcessService,
               public dialog: MatDialog) {
@@ -92,6 +95,8 @@ export class AuthComponent implements OnInit, OnChanges, OnDestroy {
   }
 
   public ngOnInit(): void {
+    this.config = Object.assign(defaultAuthFirebaseUIConfig, this.config);
+
     if (isPlatformBrowser(this.platformId)) {
       this.onErrorSubscription = this.onError.subscribe(() => this.authenticationError = true);
     }

diff --git a/src/module/guards/logged-in.guard.ts b/src/module/guards/logged-in.guard.ts
@@ -18,7 +18,8 @@ export class LoggedInGuard implements CanActivate {
     private config: NgxAuthFirebaseUIConfig,
     private router: Router,
     private auth: AuthProcessService,
-  ) {}
+  ) {
+  }
 
   canActivate(): Observable<boolean> {
     return this.auth.afa.user.pipe(

diff --git a/src/module/ngx-auth-firebase-u-i.module.ts b/src/module/ngx-auth-firebase-u-i.module.ts
@@ -99,7 +99,7 @@ export const NgxAuthFirebaseUIConfigToken = new InjectionToken<NgxAuthFirebaseUI
 export class NgxAuthFirebaseUIModule {
   static forRoot(configFactory: FirebaseAppConfig,
                  appNameFactory?: () => string,
-                 config?: NgxAuthFirebaseUIConfig): ModuleWithProviders {
+                 config: NgxAuthFirebaseUIConfig = defaultAuthFirebaseUIConfig): ModuleWithProviders {
     return {
       ngModule: NgxAuthFirebaseUIModule,
       providers:

diff --git a/src/module/services/auth-process.service.ts b/src/module/services/auth-process.service.ts
@@ -72,6 +72,7 @@ export class AuthProcessService implements ISignInProcess, ISignUpProcess {
    * @returns
    */
   public async signInWith(provider: AuthProvider, credentials?: ICredentials) {
+    // console.log('this.config on signInWith', this.config);
     try {
       this.isLoading = true;
       let signInResult: UserCredential | any;
@@ -102,7 +103,7 @@ export class AuthProcessService implements ISignInProcess, ISignUpProcess {
           break;
 
         case AuthProvider.PhoneNumber:
-
+          // coming soon - see feature/sms branch
           break;
 
         default: