fix(google-signin): getTokens

Author: triniwiz

packages/google-signin/package.json

@@ -1,35 +1,35 @@
 {
-    "name": "@nativescript/google-signin",
-    "version": "1.0.0-alpha.7",
-    "description": "Google Sign-in for your NativeScript applications",
-    "main": "index",
-    "typings": "index.d.ts",
-    "nativescript": {
-        "platforms": {
-            "ios": "6.0.0",
-            "android": "6.0.0"
-        }
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/NativeScript/plugins.git"
-    },
-    "keywords": [
-        "NativeScript",
-        "JavaScript",
-        "TypeScript",
-        "iOS",
-        "Android"
-    ],
-    "author": {
-        "name": "NativeScript",
-        "email": "oss@nativescript.org"
-    },
-    "bugs": {
-        "url": "https://github.com/NativeScript/plugins/issues"
-    },
-    "license": "Apache-2.0",
-    "homepage": "https://github.com/NativeScript/plugins",
-    "readmeFilename": "README.md",
-    "bootstrapper": "@nativescript/plugin-seed"
+  "name": "@nativescript/google-signin",
+  "version": "1.0.0-alpha.8",
+  "description": "Google Sign-in for your NativeScript applications",
+  "main": "index",
+  "typings": "index.d.ts",
+  "nativescript": {
+    "platforms": {
+      "ios": "6.0.0",
+      "android": "6.0.0"
+    }
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/NativeScript/plugins.git"
+  },
+  "keywords": [
+    "NativeScript",
+    "JavaScript",
+    "TypeScript",
+    "iOS",
+    "Android"
+  ],
+  "author": {
+    "name": "NativeScript",
+    "email": "oss@nativescript.org"
+  },
+  "bugs": {
+    "url": "https://github.com/NativeScript/plugins/issues"
+  },
+  "license": "Apache-2.0",
+  "homepage": "https://github.com/NativeScript/plugins",
+  "readmeFilename": "README.md",
+  "bootstrapper": "@nativescript/plugin-seed"
 }

packages/google-signin/src-native/android/googlesignin/src/main/java/org/nativescript/plugins/googlesignin/GoogleSignIn.kt

@@ -111,7 +111,7 @@ class GoogleSignIn {
 					}
 
 				parsedOptions.optJSONArray("scopes")?.let {
-					for(i in 0 until it.length()) {
+					for (i in 0 until it.length()) {
 						builder.requestScopes(Scope(it.getString(i)))
 					}
 				}
@@ -267,6 +267,8 @@ class GoogleSignIn {
 			return getAccessToken(context, GoogleSignIn.getLastSignedInAccount(context))
 		}
 
+		private const val GET_TOKENS_ERROR = "getTokens requires a user to be signed in";
+
 		private fun getAccessToken(context: Context, account: GoogleSignInAccount?): String? {
 			if (account?.account != null) {
 				return GoogleAuthUtil.getToken(
@@ -275,7 +277,7 @@ class GoogleSignIn {
 					scopesToString(account.grantedScopes)
 				)
 			} else {
-				throw Exception("getTokens requires a user to be signed in")
+				throw Exception(GET_TOKENS_ERROR)
 			}
 		}
 
@@ -284,23 +286,30 @@ class GoogleSignIn {
 			executors.submit {
 				try {
 					val account = GoogleSignIn.getLastSignedInAccount(context)
-						?: throw Exception("getTokens requires a user to be signed in")
-					val token = getAccessToken(context)
-					val tokens = JSONObject()
-					tokens.put("idToken", account.idToken)
-					tokens.put("accessToken", token)
-					runOnMain {
-						callback.onSuccess(tokens.toString())
+					if (account != null) {
+						val token = getAccessToken(context)
+						val tokens = JSONObject()
+						tokens.put("idToken", account.idToken)
+						tokens.put("accessToken", token)
+
+						if (retrieveAccessToken) {
+							accessToken = token
+						}
+
+						runOnMain {
+							callback.onSuccess(tokens.toString())
+						}
+					} else {
+						callback.onError(Exception(GET_TOKENS_ERROR))
 					}
 				} catch (e: Exception) {
 					runOnMain {
-						callback.onError(Exception("getTokens requires a user to be signed in"))
+						callback.onError(Exception(GET_TOKENS_ERROR))
 					}
 				}
 			}
 		}
 
-
 		@JvmStatic
 		fun getSignedInAccountFromIntent(intent: Intent, callback: Callback<GoogleUser>) {
 			GoogleSignIn.getSignedInAccountFromIntent(intent)