Merge pull request #795 from marucjmar/protect-google-ref

Skip call to google ref when is undefined

Author: Heatmanofurioso

projects/lib/src/directives/google-signin-button.directive.ts

@@ -1,6 +1,7 @@
 import { Directive, ElementRef, Input } from '@angular/core';
 import { take } from 'rxjs/operators';
 import { SocialAuthService } from '../socialauth.service';
+import { isGoogleAccountsDefined } from '../utils/google';
 
 @Directive({
   // eslint-disable-next-line @angular-eslint/directive-selector
@@ -39,7 +40,7 @@ export class GoogleSigninButtonDirective {
             'Please note .. max-width 400 , min-width 200 ' +
               '(https://developers.google.com/identity/gsi/web/tools/configurator)'
           );
-        } else {
+        } else if (isGoogleAccountsDefined()) {
           google.accounts.id.renderButton(el.nativeElement, {
             type: this.type,
             size: this.size,

projects/lib/src/providers/google-login-provider.ts

@@ -3,6 +3,7 @@ import { SocialUser } from '../entities/social-user';
 import { EventEmitter } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { filter, skip, take } from 'rxjs/operators';
+import { getGoogleAccountsOrThrow, isGoogleAccountsDefined } from '../utils/google';
 
 export interface GoogleInitOptions {
   /**
@@ -69,6 +70,8 @@ export class GoogleLoginProvider extends BaseLoginProvider {
           GoogleLoginProvider.PROVIDER_ID,
           this.getGoogleLoginScriptSrc(lang),
           () => {
+            if (!isGoogleAccountsDefined()) return;
+
             google.accounts.id.initialize({
               client_id: this.clientId,
               auto_select: autoLogin,
@@ -134,7 +137,7 @@ export class GoogleLoginProvider extends BaseLoginProvider {
 
   refreshToken(): Promise<SocialUser | null> {
     return new Promise((resolve, reject) => {
-      google.accounts.id.revoke(this._socialUser.value.id, (response) => {
+      getGoogleAccountsOrThrow().id.revoke(this._socialUser.value.id, (response) => {
         if (response.error) reject(response.error);
         else resolve(this._socialUser.value);
       });
@@ -169,7 +172,7 @@ export class GoogleLoginProvider extends BaseLoginProvider {
       } else if (!this._accessToken.value) {
         reject('No access token to revoke');
       } else {
-        google.accounts.oauth2.revoke(this._accessToken.value, () => {
+        getGoogleAccountsOrThrow().oauth2.revoke(this._accessToken.value, () => {
           this._accessToken.next(null);
           resolve();
         });
@@ -186,7 +189,7 @@ export class GoogleLoginProvider extends BaseLoginProvider {
   }
 
   async signOut(): Promise<void> {
-    google.accounts.id.disableAutoSelect();
+    getGoogleAccountsOrThrow().id.disableAutoSelect();
     this._socialUser.next(null);
   }
 

projects/lib/src/utils/google.ts

@@ -0,0 +1,16 @@
+
+export const isGoogleAccountsDefined = (): boolean => {
+  return typeof window.google?.accounts !== 'undefined';
+}
+
+export const assertGoogleAccountsDefined = (): void => {
+  if (!isGoogleAccountsDefined()) {
+    throw new Error('Google Accounts API is undefined');
+  } 
+}
+
+export const getGoogleAccountsOrThrow = (): typeof google.accounts=> {
+  assertGoogleAccountsDefined();
+
+  return window.google.accounts;
+}