Listener for user state change

CodetrixStudio · Feb 15, 2020 · 0c3e2ee · 0c3e2ee
1 parent a9a5101
commit 0c3e2ee
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 26 deletions.
diff --git a/demo/src/app/app.component.ts b/demo/src/app/app.component.ts
@@ -16,17 +16,21 @@ export class AppComponent implements OnInit {
 
   ngOnInit() {
     SplashScreen.hide();
+
+    GoogleAuth.addListener('userChange', (googleUser) => {
+      console.log("userChange:", googleUser);
+    });
   }
 
   async signIn() {
     let googleUser = await GoogleAuth.signIn();
     this.username = googleUser.name;
-    console.log(googleUser);
+    console.log("signIn:", googleUser);
   }
 
   async refreshToken() {
     let response = await GoogleAuth.refresh();
-    console.log(response);
+    console.log("refresh:", response);
   }
 
   async signOut() {

diff --git a/src/user.ts b/src/user.ts
@@ -0,0 +1,17 @@
+export interface User {
+    id: string;
+    email: string;
+
+    name: string;
+    familyName: string;
+    givenName: string;
+    imageUrl: string;
+
+    serverAuthCode: string;
+    authentication: Authentication;
+}
+
+export interface Authentication {
+    accessToken: string;
+    idToken: string;
+}
diff --git a/src/web.ts b/src/web.ts
@@ -1,21 +1,34 @@
 import { WebPlugin } from '@capacitor/core';
 import { GoogleAuthPlugin } from './definitions';
+import { User, Authentication } from './user';
+
 // @ts-ignore
 import config from '../../../../../capacitor.config.json';
 
 export class GoogleAuthWeb extends WebPlugin implements GoogleAuthPlugin {
+
+  gapiLoaded: Promise<void>;
+
+  get webConfigured(): boolean {
+    return document.getElementsByName('google-signin-client_id').length > 0;
+  }
+
   constructor() {
     super({
       name: 'GoogleAuth',
       platforms: ['web']
     });
 
-    if (this.webConfigured)
+    if (!this.webConfigured)
+      return;
+
+    this.gapiLoaded = new Promise(resolve => {
+      // HACK: Relying on window object, can't get property in gapi.load callback
+      (window as any).gapiResolve = resolve;
       this.initialize();
-  }
+    });
 
-  get webConfigured(): boolean {
-    return document.getElementsByName('google-signin-client_id').length > 0;
+    this.addUserChangeListener();
   }
 
   initialize() {
@@ -30,7 +43,7 @@ export class GoogleAuthWeb extends WebPlugin implements GoogleAuthPlugin {
   }
 
   platformJsLoaded() {
-    gapi.load('auth2', async () => {
+    gapi.load('auth2', () => {
       const clientConfig: gapi.auth2.ClientConfig = {
         client_id: (document.getElementsByName('google-signin-client_id')[0] as any).content
       };
@@ -40,15 +53,16 @@ export class GoogleAuthWeb extends WebPlugin implements GoogleAuthPlugin {
       }
 
       gapi.auth2.init(clientConfig);
+      (window as any).gapiResolve();
     });
   }
 
   async signIn(): Promise<any> {
     return new Promise(async (resolve, reject) => {
       try {
-        const user: any = {};
-
+        var serverAuthCode: string;
         var needsOfflineAccess = false;
+
         try {
           needsOfflineAccess = config.plugins.GoogleAuth.serverClientId != null;
         } catch {
@@ -57,7 +71,7 @@ export class GoogleAuthWeb extends WebPlugin implements GoogleAuthPlugin {
 
         if (needsOfflineAccess) {
           const offlineAccessResponse = await gapi.auth2.getAuthInstance().grantOfflineAccess();
-          user.serverAuthCode = offlineAccessResponse.code;
+          serverAuthCode = offlineAccessResponse.code;
         } else {
           await gapi.auth2.getAuthInstance().signIn();
         }
@@ -69,29 +83,16 @@ export class GoogleAuthWeb extends WebPlugin implements GoogleAuthPlugin {
           await googleUser.reloadAuthResponse();
         }
 
-        const authResponse = googleUser.getAuthResponse(true);
-
-        const profile = googleUser.getBasicProfile();
-        user.email = profile.getEmail();
-        user.familyName = profile.getFamilyName();
-        user.givenName = profile.getGivenName();
-        user.id = profile.getId();
-        user.imageUrl = profile.getImageUrl();
-        user.name = profile.getName();
-
-        user.authentication = {
-          accessToken: authResponse.access_token,
-          idToken: authResponse.id_token
-        }
-
+        const user = this.getUserFrom(googleUser);
+        user.serverAuthCode = serverAuthCode;
         resolve(user);
       } catch (error) {
         reject(error);
       }
     });
   }
 
-  async refresh(): Promise<any> {
+  async refresh(): Promise<Authentication> {
     const authResponse = await gapi.auth2.getAuthInstance().currentUser.get().reloadAuthResponse()
     return {
       accessToken: authResponse.access_token,
@@ -102,6 +103,33 @@ export class GoogleAuthWeb extends WebPlugin implements GoogleAuthPlugin {
   async signOut(): Promise<any> {
     return gapi.auth2.getAuthInstance().signOut();
   }
+
+  private async addUserChangeListener() {
+    await this.gapiLoaded;
+    gapi.auth2.getAuthInstance().currentUser.listen(googleUser => {
+      this.notifyListeners("userChange", googleUser.isSignedIn() ? this.getUserFrom(googleUser) : null);
+    });
+  }
+
+  private getUserFrom(googleUser: gapi.auth2.GoogleUser): User {
+    const user = {} as User;
+    const profile = googleUser.getBasicProfile();
+
+    user.email = profile.getEmail();
+    user.familyName = profile.getFamilyName();
+    user.givenName = profile.getGivenName();
+    user.id = profile.getId();
+    user.imageUrl = profile.getImageUrl();
+    user.name = profile.getName();
+
+    const authResponse = googleUser.getAuthResponse(true);
+    user.authentication = {
+      accessToken: authResponse.access_token,
+      idToken: authResponse.id_token
+    }
+
+    return user;
+  }
 }
 
 const GoogleAuth = new GoogleAuthWeb();