Merge pull request #202 from wp99cp/develop

Fix signin with Google

Author: wp99cp

frontend/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@emeal/menuplanung",
-  "version": "1.14.8",
+  "version": "1.14.9",
   "license": "MIT",
-  "copyrights": "© 2019 - 2022 Cevi Züri 11 - eMeal Menüplanung",
+  "copyrights": "© 2019 - 2023 Cevi Züri 11 - eMeal Menüplanung",
   "scripts": {
     "ng": "ng",
     "start": "angular-build-info && ng serve --ssl",

frontend/src/app/modules/application-module/services/authentication.service.ts

@@ -42,11 +42,11 @@ export class AuthenticationService {
    * Authenticates a Firebase client using a full-page redirect flow with the GoogleAuthProvider
    *
    */
-  signInWithGoogle() {
+  async signInWithGoogle() {
 
     this.location.replaceState('login/oauth-callback?method=google');
-    this.fireAuth.signInWithRedirect(new firebase.auth.GoogleAuthProvider())
-      .then(console.log)
+    this.fireAuth.signInWithPopup(new firebase.auth.GoogleAuthProvider())
+      .then(() => this.router.navigate(['/app']))
       .catch(console.error);
 
   }

frontend/src/app/modules/application-module/services/settings.service.ts

@@ -1,6 +1,6 @@
 import {FirestoreSettings, UserGroups} from '../interfaces/firestoreDatatypes';
 import {AuthenticationService} from './authentication.service';
-import {map, mergeMap} from 'rxjs/operators';
+import {filter, map, mergeMap, tap} from 'rxjs/operators';
 import {Injectable} from '@angular/core';
 import {Observable} from 'rxjs';
 import {AngularFirestore, AngularFirestoreDocument} from '@angular/fire/compat/firestore';
@@ -23,8 +23,10 @@ export class SettingsService {
 
   constructor(private db: AngularFirestore, authService: AuthenticationService) {
 
-    this.globalSettings = authService.getCurrentUser().pipe(mergeMap(user =>
-      this.loadUserSettings(user.uid)));
+    this.globalSettings = authService.getCurrentUser()
+      .pipe(tap(console.log))
+      .pipe(filter(user => !!user?.uid))
+      .pipe(mergeMap(user => this.loadUserSettings(user.uid)));
 
   }