fix(google-signin): api changes

Author: NathanWalker

packages/google-signin/index.android.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import { AndroidApplication, Application, AndroidActivityResultEventData, Utils } from '@nativescript/core';
 import { colorSchemeProperty, ColorSchemeType, colorStyleProperty, ColorStyleType, Configuration, GoogleSignInButtonBase, IUser } from './common';
 import lazy from '@nativescript/core/utils/lazy';
@@ -13,7 +14,6 @@ const COLOR_DARK = lazy(() => com.google.android.gms.common.SignInButton.COLOR_D
 const COLOR_LIGHT = lazy(() => com.google.android.gms.common.SignInButton.COLOR_LIGHT);
 const COLOR_AUTO = lazy(() => com.google.android.gms.common.SignInButton.COLOR_AUTO);
 
-
 export class GoogleError extends Error {
 	#native: java.lang.Exception;
 	static fromNative(native: java.lang.Exception, message?: string) {
@@ -27,13 +27,12 @@ export class GoogleError extends Error {
 	}
 }
 
-
 export class User implements IUser {
-	#native: com.google.android.gms.auth.api.signin.GoogleSignInAccount;
+	#native: com.google.android.gms.auth.api.identity.SignInCredential;
 	#grantedScopes: string[];
 	#accessToken: string;
-	static fromNative(account: com.google.android.gms.auth.api.signin.GoogleSignInAccount, accessToken: string = null) {
-		if (account instanceof com.google.android.gms.auth.api.signin.GoogleSignInAccount) {
+	static fromNative(account: com.google.android.gms.auth.api.identity.SignInCredential, accessToken: string = null) {
+		if (account instanceof com.google.android.gms.auth.api.identity.SignInCredential) {
 			const user = new User();
 			user.#native = account;
 			user.#accessToken = accessToken;
@@ -51,7 +50,8 @@ export class User implements IUser {
 	}
 
 	get email() {
-		return this.native.getEmail();
+		console.log('request scope for access.');
+		return '';
 	}
 
 	get givenName() {
@@ -63,7 +63,7 @@ export class User implements IUser {
 	}
 
 	get idToken() {
-		return this.native.getIdToken();
+		return this.native.getGoogleIdToken();
 	}
 
 	get accessToken() {
@@ -72,16 +72,17 @@ export class User implements IUser {
 
 	get grantedScopes() {
 		if (!this.#grantedScopes) {
-			const grantedScopes = [];
-			const scopes = this.native.getGrantedScopes().toArray();
-			const length = scopes.length;
-			for (let i = 0; i < length; i++) {
-				const scope = scopes[i]?.toString?.();
-				if (scope) {
-					grantedScopes.push(scope);
-				}
-			}
-			this.#grantedScopes = grantedScopes;
+			// removed.
+			// const grantedScopes = [];
+			// const scopes = this.native.getGrantedScopes().toArray();
+			// const length = scopes.length;
+			// for (let i = 0; i < length; i++) {
+			// 	const scope = scopes[i]?.toString?.();
+			// 	if (scope) {
+			// 		grantedScopes.push(scope);
+			// 	}
+			// }
+			// this.#grantedScopes = grantedScopes;
 		}
 		return this.#grantedScopes;
 	}
@@ -91,7 +92,7 @@ export class User implements IUser {
 	}
 
 	get serverAuthCode() {
-		return this.native.getServerAuthCode();
+		// return this.native.getServerAuthCode();
 	}
 
 	requestScopes(scopes: string[]): Promise<User> {
@@ -248,7 +249,7 @@ export class GoogleSignin {
 	static playServicesAvailable() {
 		return new Promise((resolve, reject) => {
 			resolve(org.nativescript.plugins.googlesignin.GoogleSignIn.playServicesAvailable(false, Application.android.foregroundActivity || Application.android.startActivity));
-		})
+		});
 	}
 }
 

packages/google-signin/index.ios.ts

@@ -17,6 +17,7 @@ export class GoogleError extends Error {
 export class User implements IUser {
 	#native: GIDGoogleUser;
 	#grantedScopes: string[];
+	private _serverAuthCode: string;
 	static fromNative(user: GIDGoogleUser) {
 		if (user instanceof GIDGoogleUser) {
 			const usr = new User();
@@ -47,11 +48,11 @@ export class User implements IUser {
 	}
 
 	get idToken() {
-		return this.native?.authentication?.idToken;
+		return this.native?.idToken.tokenString;
 	}
 
 	get accessToken() {
-		return this.native?.authentication?.accessToken;
+		return this.native?.accessToken.tokenString;
 	}
 
 	get grantedScopes() {
@@ -75,16 +76,17 @@ export class User implements IUser {
 	}
 
 	get serverAuthCode() {
-		return this.native.serverAuthCode;
+		return this._serverAuthCode;
 	}
 
 	requestScopes(scopes: string[]): Promise<User> {
 		return new Promise((resolve, reject) => {
-			GIDSignIn.sharedInstance.addScopesPresentingViewControllerCallback(scopes, GoogleSignin.topViewController, (user, error) => {
+			GIDSignIn.sharedInstance.signInWithPresentingViewControllerHintAdditionalScopesCompletion(GoogleSignin.topViewController, 'Requesting additional scopes', scopes, (result, error) => {
 				if (error) {
 					reject(GoogleError.fromNative(error));
 				} else {
-					resolve(User.fromNative(user));
+					this._serverAuthCode = result.serverAuthCode;
+					resolve(User.fromNative(result.user));
 				}
 			});
 		});
@@ -150,7 +152,7 @@ export class GoogleSignin {
 
 	static disconnect(): Promise<void> {
 		return new Promise((resolve, reject) => {
-			GIDSignIn.sharedInstance.disconnectWithCallback((error) => {
+			GIDSignIn.sharedInstance.disconnectWithCompletion((error) => {
 				if (error) {
 					reject(GoogleError.fromNative(error));
 				} else {
@@ -162,19 +164,19 @@ export class GoogleSignin {
 
 	static signIn() {
 		return new Promise((resolve, reject) => {
-			GIDSignIn.sharedInstance.signInWithConfigurationPresentingViewControllerCallback(this.#nativeConfig, this.topViewController, (user, error) => {
+			GIDSignIn.sharedInstance.signInWithPresentingViewControllerCompletion(this.topViewController, (result, error) => {
 				if (error) {
 					reject(GoogleError.fromNative(error));
 				} else {
-					resolve(User.fromNative(user));
+					resolve(User.fromNative(result?.user));
 				}
 			});
 		});
 	}
 
 	static signInSilently(): Promise<User> {
 		return new Promise((resolve, reject) => {
-			GIDSignIn.sharedInstance.restorePreviousSignInWithCallback((user, error) => {
+			GIDSignIn.sharedInstance.restorePreviousSignInWithCompletion((user, error) => {
 				if (error) {
 					reject(GoogleError.fromNative(error));
 				} else {
@@ -199,7 +201,7 @@ export class GoogleSignin {
 				return;
 			}
 
-			user.authentication.doWithFreshTokens((auth, error) => {
+			user.refreshTokensIfNeededWithCompletion((auth, error) => {
 				if (error) {
 					reject(GoogleError.fromNative(error));
 				} else {

packages/google-signin/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/google-signin",
-	"version": "2.0.0",
+	"version": "2.0.2",
 	"description": "Google Sign-in for your NativeScript applications",
 	"main": "index",
 	"typings": "index.d.ts",