capacitor-auth-manager 2.4.0 → 2.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +180 -0
- package/CapacitorAuthManager.podspec +10 -18
- package/LICENSE +1 -1
- package/Readme.md +136 -595
- package/android/build.gradle +14 -18
- package/android/src/main/java/com/aoneahsan/capacitor_auth_manager/CapacitorAuthManager.java +44 -16
- package/android/src/main/java/com/aoneahsan/capacitor_auth_manager/CapacitorAuthManagerPlugin.java +24 -3
- package/android/src/main/java/com/aoneahsan/capacitor_auth_manager/GoogleAuthProvider.java +424 -226
- package/android/src/main/java/com/aoneahsan/capacitor_auth_manager/ProviderFactory.java +27 -99
- package/dist/angular.cjs.js +942 -4545
- package/dist/core.cjs.js +913 -4515
- package/dist/esm/angular/auth.guard.js +0 -1
- package/dist/esm/angular/auth.module.js +0 -1
- package/dist/esm/angular/auth.service.js +0 -1
- package/dist/esm/angular/index.d.ts +1 -0
- package/dist/esm/angular/index.js +4 -1
- package/dist/esm/capacitor-plugin.js +0 -1
- package/dist/esm/core/auth-manager.d.ts +6 -0
- package/dist/esm/core/auth-manager.js +25 -4
- package/dist/esm/core/index.js +0 -1
- package/dist/esm/core/platform.js +0 -1
- package/dist/esm/core/provider-manifests.js +0 -1
- package/dist/esm/core/provider-registry.d.ts +7 -0
- package/dist/esm/core/provider-registry.js +55 -53
- package/dist/esm/core/types.js +0 -1
- package/dist/esm/definitions.d.ts +30 -1
- package/dist/esm/definitions.js +8 -1
- package/dist/esm/index.js +0 -1
- package/dist/esm/providers/base-provider.js +0 -1
- package/dist/esm/providers/native/google-native-provider.d.ts +26 -0
- package/dist/esm/providers/native/google-native-provider.js +114 -0
- package/dist/esm/providers/oauth-provider.js +0 -1
- package/dist/esm/providers/provider-factory.d.ts +9 -0
- package/dist/esm/providers/provider-factory.js +20 -57
- package/dist/esm/providers/web/google-provider.d.ts +70 -92
- package/dist/esm/providers/web/google-provider.js +262 -205
- package/dist/esm/providers/web/index.d.ts +0 -14
- package/dist/esm/providers/web/index.js +7 -16
- package/dist/esm/react/hooks.js +0 -1
- package/dist/esm/react/index.d.ts +1 -0
- package/dist/esm/react/index.js +4 -1
- package/dist/esm/react/types.js +0 -1
- package/dist/esm/utils/auth-error.js +0 -1
- package/dist/esm/utils/error-message.js +0 -1
- package/dist/esm/utils/event-emitter.js +0 -1
- package/dist/esm/utils/logger.js +0 -1
- package/dist/esm/utils/pending-verification-store.js +0 -1
- package/dist/esm/utils/storage.js +0 -1
- package/dist/esm/vue/composables.js +0 -1
- package/dist/esm/vue/index.d.ts +1 -0
- package/dist/esm/vue/index.js +4 -1
- package/dist/esm/web.js +0 -1
- package/dist/plugin.cjs.js +435 -4664
- package/dist/plugin.js +435 -4664
- package/dist/react.cjs.js +942 -4545
- package/dist/vue.cjs.js +942 -4545
- package/ios/Plugin/CapacitorAuthManager.swift +12 -21
- package/ios/Plugin/GoogleAuthProvider.swift +213 -105
- package/ios/Plugin/Models.swift +35 -4
- package/ios/Plugin/Plugin.swift +4 -2
- package/package.json +31 -30
- package/android/src/main/java/com/aoneahsan/capacitor_auth_manager/FacebookAuthProvider.java +0 -389
- package/android/src/main/java/com/aoneahsan/capacitor_auth_manager/MicrosoftAuthProvider.java +0 -455
- package/dist/angular.cjs.js.map +0 -1
- package/dist/core.cjs.js.map +0 -1
- package/dist/esm/angular/auth.guard.js.map +0 -1
- package/dist/esm/angular/auth.module.js.map +0 -1
- package/dist/esm/angular/auth.service.js.map +0 -1
- package/dist/esm/angular/index.js.map +0 -1
- package/dist/esm/capacitor-plugin.js.map +0 -1
- package/dist/esm/core/auth-manager.js.map +0 -1
- package/dist/esm/core/index.js.map +0 -1
- package/dist/esm/core/platform.js.map +0 -1
- package/dist/esm/core/provider-manifests.js.map +0 -1
- package/dist/esm/core/provider-registry.js.map +0 -1
- package/dist/esm/core/types.js.map +0 -1
- package/dist/esm/definitions.js.map +0 -1
- package/dist/esm/index.js.map +0 -1
- package/dist/esm/providers/base-provider.js.map +0 -1
- package/dist/esm/providers/oauth-provider.js.map +0 -1
- package/dist/esm/providers/provider-factory.js.map +0 -1
- package/dist/esm/providers/web/apple-provider.d.ts +0 -61
- package/dist/esm/providers/web/apple-provider.js +0 -293
- package/dist/esm/providers/web/apple-provider.js.map +0 -1
- package/dist/esm/providers/web/biometric-provider.d.ts +0 -60
- package/dist/esm/providers/web/biometric-provider.js +0 -374
- package/dist/esm/providers/web/biometric-provider.js.map +0 -1
- package/dist/esm/providers/web/email-code-provider.d.ts +0 -46
- package/dist/esm/providers/web/email-code-provider.js +0 -294
- package/dist/esm/providers/web/email-code-provider.js.map +0 -1
- package/dist/esm/providers/web/email-password-provider.d.ts +0 -52
- package/dist/esm/providers/web/email-password-provider.js +0 -430
- package/dist/esm/providers/web/email-password-provider.js.map +0 -1
- package/dist/esm/providers/web/facebook-provider.d.ts +0 -80
- package/dist/esm/providers/web/facebook-provider.js +0 -249
- package/dist/esm/providers/web/facebook-provider.js.map +0 -1
- package/dist/esm/providers/web/firebase-provider.d.ts +0 -22
- package/dist/esm/providers/web/firebase-provider.js +0 -338
- package/dist/esm/providers/web/firebase-provider.js.map +0 -1
- package/dist/esm/providers/web/github-provider.d.ts +0 -34
- package/dist/esm/providers/web/github-provider.js +0 -325
- package/dist/esm/providers/web/github-provider.js.map +0 -1
- package/dist/esm/providers/web/google-provider.js.map +0 -1
- package/dist/esm/providers/web/index.js.map +0 -1
- package/dist/esm/providers/web/linkedin-provider.d.ts +0 -37
- package/dist/esm/providers/web/linkedin-provider.js +0 -178
- package/dist/esm/providers/web/linkedin-provider.js.map +0 -1
- package/dist/esm/providers/web/magic-link-provider.d.ts +0 -44
- package/dist/esm/providers/web/magic-link-provider.js +0 -311
- package/dist/esm/providers/web/magic-link-provider.js.map +0 -1
- package/dist/esm/providers/web/microsoft-provider.d.ts +0 -23
- package/dist/esm/providers/web/microsoft-provider.js +0 -236
- package/dist/esm/providers/web/microsoft-provider.js.map +0 -1
- package/dist/esm/providers/web/phone-password-provider.d.ts +0 -63
- package/dist/esm/providers/web/phone-password-provider.js +0 -442
- package/dist/esm/providers/web/phone-password-provider.js.map +0 -1
- package/dist/esm/providers/web/slack-provider.d.ts +0 -39
- package/dist/esm/providers/web/slack-provider.js +0 -175
- package/dist/esm/providers/web/slack-provider.js.map +0 -1
- package/dist/esm/providers/web/sms-provider.d.ts +0 -46
- package/dist/esm/providers/web/sms-provider.js +0 -306
- package/dist/esm/providers/web/sms-provider.js.map +0 -1
- package/dist/esm/providers/web/username-password-provider.d.ts +0 -59
- package/dist/esm/providers/web/username-password-provider.js +0 -435
- package/dist/esm/providers/web/username-password-provider.js.map +0 -1
- package/dist/esm/react/hooks.js.map +0 -1
- package/dist/esm/react/index.js.map +0 -1
- package/dist/esm/react/types.js.map +0 -1
- package/dist/esm/utils/auth-error.js.map +0 -1
- package/dist/esm/utils/error-message.js.map +0 -1
- package/dist/esm/utils/event-emitter.js.map +0 -1
- package/dist/esm/utils/logger.js.map +0 -1
- package/dist/esm/utils/pending-verification-store.js.map +0 -1
- package/dist/esm/utils/storage.js.map +0 -1
- package/dist/esm/vue/composables.js.map +0 -1
- package/dist/esm/vue/index.js.map +0 -1
- package/dist/esm/web.js.map +0 -1
- package/dist/plugin.cjs.js.map +0 -1
- package/dist/plugin.js.map +0 -1
- package/dist/react.cjs.js.map +0 -1
- package/dist/vue.cjs.js.map +0 -1
- package/ios/Plugin/AppleAuthProvider.swift +0 -288
- package/ios/Plugin/FacebookAuthProvider.swift +0 -297
- package/ios/Plugin/GitHubAuthProvider.swift +0 -54
- package/ios/Plugin/LinkedInAuthProvider.swift +0 -63
- package/ios/Plugin/MicrosoftAuthProvider.swift +0 -315
- package/ios/Plugin/OAuthWebProvider.swift +0 -415
- package/ios/Plugin/SlackAuthProvider.swift +0 -108
|
@@ -2,37 +2,68 @@ package com.aoneahsan.capacitor_auth_manager;
|
|
|
2
2
|
|
|
3
3
|
import android.app.Activity;
|
|
4
4
|
import android.content.Context;
|
|
5
|
-
import android.
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
import androidx.
|
|
9
|
-
|
|
10
|
-
import androidx.
|
|
5
|
+
import android.net.Uri;
|
|
6
|
+
import android.util.Base64;
|
|
7
|
+
|
|
8
|
+
import androidx.core.content.ContextCompat;
|
|
9
|
+
|
|
10
|
+
import androidx.credentials.ClearCredentialStateRequest;
|
|
11
|
+
import androidx.credentials.Credential;
|
|
12
|
+
import androidx.credentials.CredentialManager;
|
|
13
|
+
import androidx.credentials.CredentialManagerCallback;
|
|
14
|
+
import androidx.credentials.CustomCredential;
|
|
15
|
+
import androidx.credentials.GetCredentialRequest;
|
|
16
|
+
import androidx.credentials.GetCredentialResponse;
|
|
17
|
+
import androidx.credentials.exceptions.ClearCredentialException;
|
|
18
|
+
import androidx.credentials.exceptions.GetCredentialCancellationException;
|
|
19
|
+
import androidx.credentials.exceptions.GetCredentialException;
|
|
20
|
+
import androidx.credentials.exceptions.NoCredentialException;
|
|
11
21
|
|
|
12
22
|
import com.getcapacitor.JSObject;
|
|
13
|
-
import com.google.android.
|
|
14
|
-
import com.google.android.
|
|
15
|
-
import com.google.android.gms.auth.api.identity.SignInClient;
|
|
16
|
-
import com.google.android.gms.auth.api.identity.SignInCredential;
|
|
17
|
-
import com.google.android.gms.auth.api.signin.GoogleSignIn;
|
|
18
|
-
import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
|
|
19
|
-
import com.google.android.gms.auth.api.signin.GoogleSignInClient;
|
|
20
|
-
import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
|
|
21
|
-
import com.google.android.gms.common.api.ApiException;
|
|
22
|
-
import com.google.android.gms.tasks.Task;
|
|
23
|
+
import com.google.android.libraries.identity.googleid.GetGoogleIdOption;
|
|
24
|
+
import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential;
|
|
23
25
|
|
|
24
26
|
import org.json.JSONArray;
|
|
27
|
+
import org.json.JSONObject;
|
|
25
28
|
|
|
29
|
+
import java.nio.charset.StandardCharsets;
|
|
26
30
|
import java.text.SimpleDateFormat;
|
|
27
31
|
import java.util.ArrayList;
|
|
28
32
|
import java.util.Date;
|
|
29
33
|
import java.util.List;
|
|
30
34
|
import java.util.Locale;
|
|
31
35
|
import java.util.TimeZone;
|
|
32
|
-
|
|
36
|
+
import java.util.concurrent.Executor;
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* Android native Google sign-in built on the modern <b>Credential Manager</b> API
|
|
40
|
+
* ({@code androidx.credentials}) + the Google Identity {@code GetGoogleIdOption}.
|
|
41
|
+
*
|
|
42
|
+
* <p>This replaces the deprecated {@code com.google.android.gms.auth.api.signin.GoogleSignIn} +
|
|
43
|
+
* {@code startActivityForResult(...)} flow, which relied on an {@code onActivityResult} callback the
|
|
44
|
+
* plugin never forwarded (so interactive sign-in hung forever). Credential Manager uses an async
|
|
45
|
+
* callback ({@link CredentialManagerCallback}) — no {@code onActivityResult} — so that bug class is gone.</p>
|
|
46
|
+
*
|
|
47
|
+
* <p>The package is Firebase-agnostic: this provider returns a credential
|
|
48
|
+
* {@code { idToken, ... }} to JS and the app performs its own Firebase
|
|
49
|
+
* {@code signInWithCredential(GoogleAuthProvider.credential(idToken))} (or anything else) later.</p>
|
|
50
|
+
*
|
|
51
|
+
* <p><b>Limitations of Credential Manager Google sign-in (intentional):</b></p>
|
|
52
|
+
* <ul>
|
|
53
|
+
* <li>Only an <b>idToken</b> is returned. There is no OAuth access token and no serverAuthCode,
|
|
54
|
+
* so {@code credential.accessToken} / {@code credential.serverAuthCode} are intentionally absent.
|
|
55
|
+
* Use the Google Authorization API if you need an access token / extra scopes.</li>
|
|
56
|
+
* <li>{@code GetGoogleIdOption} does not request additional OAuth scopes, nor honor
|
|
57
|
+
* {@code hostedDomain} / {@code loginHint}. Those config values are accepted for API parity but
|
|
58
|
+
* are not enforced here.</li>
|
|
59
|
+
* <li>There is no server-side revoke; {@code revokeAccess} clears local + Credential Manager state only.</li>
|
|
60
|
+
* </ul>
|
|
61
|
+
*/
|
|
33
62
|
public class GoogleAuthProvider implements BaseAuthProvider {
|
|
34
63
|
private static final String TAG = "GoogleAuthProvider";
|
|
35
|
-
private static final
|
|
64
|
+
private static final String PROVIDER_ID = "google.com";
|
|
65
|
+
private static final String STORAGE_CREDENTIAL_KEY = "google";
|
|
66
|
+
private static final String STORAGE_USER_KEY = "google_user";
|
|
36
67
|
|
|
37
68
|
private final Context context;
|
|
38
69
|
private final Activity activity;
|
|
@@ -40,12 +71,17 @@ public class GoogleAuthProvider implements BaseAuthProvider {
|
|
|
40
71
|
private final AuthLogger logger;
|
|
41
72
|
|
|
42
73
|
private String clientId;
|
|
74
|
+
private String serverClientId;
|
|
75
|
+
// Retained for API parity. Credential Manager's GetGoogleIdOption only returns an ID token and
|
|
76
|
+
// cannot request additional OAuth scopes, so non-default scopes are surfaced as a warning only.
|
|
43
77
|
private List<String> scopes;
|
|
44
|
-
private
|
|
45
|
-
private
|
|
46
|
-
private
|
|
78
|
+
private boolean filterByAuthorizedAccounts = false;
|
|
79
|
+
private boolean autoSelectEnabled = false;
|
|
80
|
+
private String nonce;
|
|
81
|
+
private String hostedDomain;
|
|
82
|
+
private String loginHint;
|
|
47
83
|
|
|
48
|
-
private
|
|
84
|
+
private JSObject currentUser;
|
|
49
85
|
|
|
50
86
|
public GoogleAuthProvider(Context context, Activity activity, AuthStorage storage, AuthLogger logger) {
|
|
51
87
|
this.context = context;
|
|
@@ -57,174 +93,98 @@ public class GoogleAuthProvider implements BaseAuthProvider {
|
|
|
57
93
|
this.scopes.add("profile");
|
|
58
94
|
}
|
|
59
95
|
|
|
96
|
+
// ---- Configuration (populated by ProviderFactory from the google provider options) ----
|
|
97
|
+
|
|
60
98
|
public void setClientId(String clientId) {
|
|
61
99
|
this.clientId = clientId;
|
|
62
100
|
}
|
|
63
101
|
|
|
102
|
+
public void setServerClientId(String serverClientId) {
|
|
103
|
+
this.serverClientId = serverClientId;
|
|
104
|
+
}
|
|
105
|
+
|
|
64
106
|
public void setScopes(List<String> scopes) {
|
|
65
107
|
if (scopes != null && !scopes.isEmpty()) {
|
|
66
108
|
this.scopes = scopes;
|
|
67
109
|
}
|
|
68
110
|
}
|
|
69
111
|
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
112
|
+
public void setFilterByAuthorizedAccounts(boolean filterByAuthorizedAccounts) {
|
|
113
|
+
this.filterByAuthorizedAccounts = filterByAuthorizedAccounts;
|
|
114
|
+
}
|
|
73
115
|
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
.requestProfile();
|
|
116
|
+
public void setAutoSelectEnabled(boolean autoSelectEnabled) {
|
|
117
|
+
this.autoSelectEnabled = autoSelectEnabled;
|
|
118
|
+
}
|
|
78
119
|
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
120
|
+
public void setNonce(String nonce) {
|
|
121
|
+
this.nonce = nonce;
|
|
122
|
+
}
|
|
82
123
|
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
}
|
|
87
|
-
}
|
|
124
|
+
public void setHostedDomain(String hostedDomain) {
|
|
125
|
+
this.hostedDomain = hostedDomain;
|
|
126
|
+
}
|
|
88
127
|
|
|
89
|
-
|
|
90
|
-
|
|
128
|
+
public void setLoginHint(String loginHint) {
|
|
129
|
+
this.loginHint = loginHint;
|
|
130
|
+
}
|
|
91
131
|
|
|
92
|
-
|
|
93
|
-
oneTapClient = Identity.getSignInClient(context);
|
|
132
|
+
// ---- BaseAuthProvider ----
|
|
94
133
|
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
134
|
+
@Override
|
|
135
|
+
public void initialize(CapacitorAuthManager.AuthCallback<Void> callback) {
|
|
136
|
+
logger.info("Initializing Google auth provider (Credential Manager)");
|
|
137
|
+
try {
|
|
138
|
+
// Credential Manager has no "last signed-in account" concept, so restore any persisted
|
|
139
|
+
// user from secure storage to keep getCurrentUser() working after a cold start.
|
|
140
|
+
JSObject storedUser = storage.getCredential(STORAGE_USER_KEY);
|
|
141
|
+
if (storedUser != null) {
|
|
142
|
+
currentUser = storedUser;
|
|
143
|
+
logger.info("Restored previous Google session from storage");
|
|
100
144
|
}
|
|
101
|
-
|
|
102
145
|
callback.onResult(CapacitorAuthManager.AuthResult.success(null));
|
|
103
146
|
} catch (Exception e) {
|
|
104
|
-
logger.error("Failed to initialize Google auth", e);
|
|
147
|
+
logger.error("Failed to initialize Google auth provider", e);
|
|
105
148
|
callback.onResult(CapacitorAuthManager.AuthResult.error(e));
|
|
106
149
|
}
|
|
107
150
|
}
|
|
108
151
|
|
|
109
152
|
@Override
|
|
110
153
|
public void signIn(JSObject credentials, JSObject options, CapacitorAuthManager.AuthCallback<JSObject> callback) {
|
|
111
|
-
logger.info("Starting Google sign-in");
|
|
112
|
-
|
|
113
|
-
if (googleSignInClient == null) {
|
|
114
|
-
callback.onResult(CapacitorAuthManager.AuthResult.error(
|
|
115
|
-
new Exception("Google Sign-In not initialized. Call initialize first.")));
|
|
116
|
-
return;
|
|
117
|
-
}
|
|
118
|
-
|
|
119
|
-
// Store callback for activity result
|
|
120
|
-
pendingCallback = callback;
|
|
121
|
-
|
|
122
|
-
Intent signInIntent = googleSignInClient.getSignInIntent();
|
|
123
|
-
activity.startActivityForResult(signInIntent, RC_SIGN_IN);
|
|
124
|
-
}
|
|
125
|
-
|
|
126
|
-
public void handleActivityResult(int requestCode, int resultCode, Intent data) {
|
|
127
|
-
if (requestCode == RC_SIGN_IN) {
|
|
128
|
-
Task<GoogleSignInAccount> task = GoogleSignIn.getSignedInAccountFromIntent(data);
|
|
129
|
-
handleSignInResult(task);
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
|
|
133
|
-
private void handleSignInResult(Task<GoogleSignInAccount> completedTask) {
|
|
134
|
-
try {
|
|
135
|
-
GoogleSignInAccount account = completedTask.getResult(ApiException.class);
|
|
136
|
-
currentUser = createUserObject(account);
|
|
137
|
-
|
|
138
|
-
JSObject credential = createCredentialObject(account);
|
|
139
|
-
storage.saveCredential("google", credential);
|
|
140
|
-
|
|
141
|
-
JSObject result = createAuthResult(account);
|
|
142
|
-
logger.info("Google sign-in successful");
|
|
143
|
-
|
|
144
|
-
if (pendingCallback != null) {
|
|
145
|
-
pendingCallback.onResult(CapacitorAuthManager.AuthResult.success(result));
|
|
146
|
-
pendingCallback = null;
|
|
147
|
-
}
|
|
148
|
-
} catch (ApiException e) {
|
|
149
|
-
logger.error("Google sign-in failed", e);
|
|
150
|
-
String errorMessage;
|
|
151
|
-
switch (e.getStatusCode()) {
|
|
152
|
-
case 12501:
|
|
153
|
-
errorMessage = "User cancelled sign-in";
|
|
154
|
-
break;
|
|
155
|
-
case 12502:
|
|
156
|
-
errorMessage = "Sign-in already in progress";
|
|
157
|
-
break;
|
|
158
|
-
case 10:
|
|
159
|
-
errorMessage = "Developer error: Check your configuration";
|
|
160
|
-
break;
|
|
161
|
-
default:
|
|
162
|
-
errorMessage = "Google sign-in failed: " + e.getMessage();
|
|
163
|
-
}
|
|
164
|
-
|
|
165
|
-
if (pendingCallback != null) {
|
|
166
|
-
pendingCallback.onResult(CapacitorAuthManager.AuthResult.error(new Exception(errorMessage)));
|
|
167
|
-
pendingCallback = null;
|
|
168
|
-
}
|
|
169
|
-
}
|
|
154
|
+
logger.info("Starting Google sign-in (Credential Manager)");
|
|
155
|
+
requestGoogleCredential(filterByAuthorizedAccounts, autoSelectEnabled, callback);
|
|
170
156
|
}
|
|
171
157
|
|
|
172
158
|
@Override
|
|
173
159
|
public void signOut(JSObject options, CapacitorAuthManager.AuthCallback<Void> callback) {
|
|
174
|
-
logger.info("Signing out from Google");
|
|
175
|
-
|
|
176
|
-
if (googleSignInClient == null) {
|
|
177
|
-
callback.onResult(CapacitorAuthManager.AuthResult.success(null));
|
|
178
|
-
return;
|
|
179
|
-
}
|
|
180
|
-
|
|
181
|
-
googleSignInClient.signOut()
|
|
182
|
-
.addOnCompleteListener(task -> {
|
|
183
|
-
currentUser = null;
|
|
184
|
-
storage.deleteCredential("google");
|
|
185
|
-
callback.onResult(CapacitorAuthManager.AuthResult.success(null));
|
|
186
|
-
});
|
|
160
|
+
logger.info("Signing out from Google (clearing Credential Manager state)");
|
|
161
|
+
clearCredentialState(callback);
|
|
187
162
|
}
|
|
188
163
|
|
|
189
164
|
@Override
|
|
190
165
|
public void getCurrentUser(CapacitorAuthManager.AuthCallback<JSObject> callback) {
|
|
191
|
-
if (currentUser
|
|
192
|
-
|
|
193
|
-
} else {
|
|
194
|
-
GoogleSignInAccount account = GoogleSignIn.getLastSignedInAccount(context);
|
|
195
|
-
if (account != null) {
|
|
196
|
-
currentUser = createUserObject(account);
|
|
197
|
-
callback.onResult(CapacitorAuthManager.AuthResult.success(currentUser));
|
|
198
|
-
} else {
|
|
199
|
-
callback.onResult(CapacitorAuthManager.AuthResult.success(null));
|
|
200
|
-
}
|
|
166
|
+
if (currentUser == null) {
|
|
167
|
+
currentUser = storage.getCredential(STORAGE_USER_KEY);
|
|
201
168
|
}
|
|
169
|
+
callback.onResult(CapacitorAuthManager.AuthResult.success(currentUser));
|
|
202
170
|
}
|
|
203
171
|
|
|
204
172
|
@Override
|
|
205
|
-
public void refreshToken(JSObject options, CapacitorAuthManager.AuthCallback<JSObject> callback) {
|
|
206
|
-
logger.info("Refreshing Google token");
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
JSObject result = createAuthResult(account);
|
|
221
|
-
result.put("operationType", "refresh");
|
|
222
|
-
callback.onResult(CapacitorAuthManager.AuthResult.success(result));
|
|
223
|
-
})
|
|
224
|
-
.addOnFailureListener(e -> {
|
|
225
|
-
logger.error("Failed to refresh Google token", e);
|
|
226
|
-
callback.onResult(CapacitorAuthManager.AuthResult.error(e));
|
|
227
|
-
});
|
|
173
|
+
public void refreshToken(JSObject options, final CapacitorAuthManager.AuthCallback<JSObject> callback) {
|
|
174
|
+
logger.info("Refreshing Google ID token (silent Credential Manager attempt)");
|
|
175
|
+
// A silent attempt only succeeds when exactly one previously-authorized account exists.
|
|
176
|
+
requestGoogleCredential(true, true, new CapacitorAuthManager.AuthCallback<JSObject>() {
|
|
177
|
+
@Override
|
|
178
|
+
public void onResult(CapacitorAuthManager.AuthResult<JSObject> result) {
|
|
179
|
+
if (result.isSuccess()) {
|
|
180
|
+
callback.onResult(result);
|
|
181
|
+
} else {
|
|
182
|
+
callback.onResult(CapacitorAuthManager.AuthResult.error(new Exception(
|
|
183
|
+
"Re-authentication required: could not silently refresh the Google ID token. "
|
|
184
|
+
+ "Prompt the user to sign in again.")));
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
});
|
|
228
188
|
}
|
|
229
189
|
|
|
230
190
|
@Override
|
|
@@ -243,69 +203,275 @@ public class GoogleAuthProvider implements BaseAuthProvider {
|
|
|
243
203
|
}
|
|
244
204
|
|
|
245
205
|
@Override
|
|
246
|
-
public void getIdToken(boolean forceRefresh, CapacitorAuthManager.AuthCallback<JSObject> callback) {
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
.
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
})
|
|
259
|
-
.addOnFailureListener(e -> {
|
|
260
|
-
callback.onResult(CapacitorAuthManager.AuthResult.error(e));
|
|
261
|
-
});
|
|
262
|
-
} else {
|
|
263
|
-
callback.onResult(CapacitorAuthManager.AuthResult.error(
|
|
264
|
-
new Exception("No Google ID token available")));
|
|
206
|
+
public void getIdToken(boolean forceRefresh, final CapacitorAuthManager.AuthCallback<JSObject> callback) {
|
|
207
|
+
if (!forceRefresh) {
|
|
208
|
+
JSObject storedCredential = storage.getCredential(STORAGE_CREDENTIAL_KEY);
|
|
209
|
+
if (storedCredential != null) {
|
|
210
|
+
String idToken = storedCredential.getString("idToken");
|
|
211
|
+
if (idToken != null && !idToken.isEmpty()) {
|
|
212
|
+
JSObject result = new JSObject();
|
|
213
|
+
result.put("token", idToken);
|
|
214
|
+
callback.onResult(CapacitorAuthManager.AuthResult.success(result));
|
|
215
|
+
return;
|
|
216
|
+
}
|
|
217
|
+
}
|
|
265
218
|
}
|
|
219
|
+
|
|
220
|
+
// No cached token (or forced refresh) → silent Credential Manager attempt.
|
|
221
|
+
requestGoogleCredential(true, true, new CapacitorAuthManager.AuthCallback<JSObject>() {
|
|
222
|
+
@Override
|
|
223
|
+
public void onResult(CapacitorAuthManager.AuthResult<JSObject> result) {
|
|
224
|
+
if (result.isSuccess() && result.getData() != null) {
|
|
225
|
+
JSObject credential = result.getData().getJSObject("credential");
|
|
226
|
+
String idToken = credential != null ? credential.getString("idToken") : null;
|
|
227
|
+
if (idToken != null && !idToken.isEmpty()) {
|
|
228
|
+
JSObject out = new JSObject();
|
|
229
|
+
out.put("token", idToken);
|
|
230
|
+
callback.onResult(CapacitorAuthManager.AuthResult.success(out));
|
|
231
|
+
return;
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
callback.onResult(CapacitorAuthManager.AuthResult.error(new Exception(
|
|
235
|
+
"No Google ID token available. Re-authentication required.")));
|
|
236
|
+
}
|
|
237
|
+
});
|
|
266
238
|
}
|
|
267
239
|
|
|
268
240
|
@Override
|
|
269
241
|
public void revokeAccess(String token, CapacitorAuthManager.AuthCallback<Void> callback) {
|
|
270
|
-
|
|
242
|
+
// Credential Manager has no server-side revoke. Clear the locally-selected account state +
|
|
243
|
+
// the persisted session so the next sign-in re-prompts.
|
|
244
|
+
logger.info("Revoking Google access (clears local + Credential Manager state only; no server-side revoke)");
|
|
245
|
+
clearCredentialState(callback);
|
|
246
|
+
}
|
|
271
247
|
|
|
272
|
-
|
|
273
|
-
|
|
248
|
+
// ---- Credential Manager flow ----
|
|
249
|
+
|
|
250
|
+
private void requestGoogleCredential(
|
|
251
|
+
boolean filterByAuthorized,
|
|
252
|
+
boolean autoSelect,
|
|
253
|
+
final CapacitorAuthManager.AuthCallback<JSObject> callback
|
|
254
|
+
) {
|
|
255
|
+
String resolvedServerClientId = (serverClientId != null && !serverClientId.isEmpty())
|
|
256
|
+
? serverClientId
|
|
257
|
+
: clientId;
|
|
258
|
+
|
|
259
|
+
if (resolvedServerClientId == null || resolvedServerClientId.isEmpty()) {
|
|
260
|
+
callback.onResult(CapacitorAuthManager.AuthResult.error(new IllegalStateException(
|
|
261
|
+
"Google sign-in requires a serverClientId (your Web OAuth client id). "
|
|
262
|
+
+ "Provide 'serverClientId' (or 'clientId') in the google provider options.")));
|
|
263
|
+
return;
|
|
264
|
+
}
|
|
265
|
+
|
|
266
|
+
if (activity == null) {
|
|
267
|
+
callback.onResult(CapacitorAuthManager.AuthResult.error(new IllegalStateException(
|
|
268
|
+
"Google sign-in requires a foreground Activity.")));
|
|
274
269
|
return;
|
|
275
270
|
}
|
|
276
271
|
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
272
|
+
warnIfUnsupportedOptions();
|
|
273
|
+
|
|
274
|
+
try {
|
|
275
|
+
GetGoogleIdOption.Builder optionBuilder = new GetGoogleIdOption.Builder()
|
|
276
|
+
.setServerClientId(resolvedServerClientId)
|
|
277
|
+
.setFilterByAuthorizedAccounts(filterByAuthorized)
|
|
278
|
+
.setAutoSelectEnabled(autoSelect);
|
|
279
|
+
|
|
280
|
+
if (nonce != null && !nonce.isEmpty()) {
|
|
281
|
+
optionBuilder.setNonce(nonce);
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
GetGoogleIdOption googleIdOption = optionBuilder.build();
|
|
285
|
+
|
|
286
|
+
GetCredentialRequest request = new GetCredentialRequest.Builder()
|
|
287
|
+
.addCredentialOption(googleIdOption)
|
|
288
|
+
.build();
|
|
289
|
+
|
|
290
|
+
CredentialManager credentialManager = CredentialManager.create(context);
|
|
291
|
+
Executor executor = ContextCompat.getMainExecutor(context);
|
|
292
|
+
|
|
293
|
+
credentialManager.getCredentialAsync(
|
|
294
|
+
activity,
|
|
295
|
+
request,
|
|
296
|
+
null,
|
|
297
|
+
executor,
|
|
298
|
+
new CredentialManagerCallback<GetCredentialResponse, GetCredentialException>() {
|
|
299
|
+
@Override
|
|
300
|
+
public void onResult(GetCredentialResponse response) {
|
|
301
|
+
handleSignInResponse(response, callback);
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
@Override
|
|
305
|
+
public void onError(GetCredentialException e) {
|
|
306
|
+
handleSignInError(e, callback);
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
);
|
|
310
|
+
} catch (Exception e) {
|
|
311
|
+
logger.error("Failed to start Google Credential Manager request", e);
|
|
312
|
+
callback.onResult(CapacitorAuthManager.AuthResult.error(e));
|
|
313
|
+
}
|
|
283
314
|
}
|
|
284
315
|
|
|
285
|
-
private
|
|
316
|
+
private void handleSignInResponse(
|
|
317
|
+
GetCredentialResponse response,
|
|
318
|
+
CapacitorAuthManager.AuthCallback<JSObject> callback
|
|
319
|
+
) {
|
|
320
|
+
try {
|
|
321
|
+
Credential credential = response.getCredential();
|
|
322
|
+
if (credential instanceof CustomCredential
|
|
323
|
+
&& GoogleIdTokenCredential.TYPE_GOOGLE_ID_TOKEN_CREDENTIAL.equals(credential.getType())) {
|
|
324
|
+
|
|
325
|
+
GoogleIdTokenCredential googleCredential =
|
|
326
|
+
GoogleIdTokenCredential.createFrom(((CustomCredential) credential).getData());
|
|
327
|
+
|
|
328
|
+
JSONObject claims = parseIdTokenClaims(googleCredential.getIdToken());
|
|
329
|
+
|
|
330
|
+
JSObject user = createUserObject(googleCredential, claims);
|
|
331
|
+
JSObject credentialObj = createCredentialObject(googleCredential);
|
|
332
|
+
|
|
333
|
+
currentUser = user;
|
|
334
|
+
persistSession(user, credentialObj);
|
|
335
|
+
|
|
336
|
+
JSObject result = new JSObject();
|
|
337
|
+
result.put("user", user);
|
|
338
|
+
result.put("credential", credentialObj);
|
|
339
|
+
|
|
340
|
+
JSObject additionalUserInfo = new JSObject();
|
|
341
|
+
additionalUserInfo.put("isNewUser", false);
|
|
342
|
+
additionalUserInfo.put("providerId", PROVIDER_ID);
|
|
343
|
+
if (googleCredential.getId() != null) {
|
|
344
|
+
additionalUserInfo.put("username", googleCredential.getId());
|
|
345
|
+
}
|
|
346
|
+
result.put("additionalUserInfo", additionalUserInfo);
|
|
347
|
+
result.put("operationType", "signIn");
|
|
348
|
+
|
|
349
|
+
logger.info("Google sign-in successful (Credential Manager)");
|
|
350
|
+
callback.onResult(CapacitorAuthManager.AuthResult.success(result));
|
|
351
|
+
} else {
|
|
352
|
+
String type = credential != null ? credential.getType() : "null";
|
|
353
|
+
logger.error("Unexpected credential type from Credential Manager: " + type, null);
|
|
354
|
+
callback.onResult(CapacitorAuthManager.AuthResult.error(new IllegalStateException(
|
|
355
|
+
"Unexpected credential type returned from Google sign-in: " + type)));
|
|
356
|
+
}
|
|
357
|
+
} catch (Exception e) {
|
|
358
|
+
// Covers a malformed credential / ID-token parse failure. (googleid 1.1.1's
|
|
359
|
+
// GoogleIdTokenCredential.createFrom does not declare a checked exception.)
|
|
360
|
+
logger.error("Unexpected error handling Google credential", e);
|
|
361
|
+
callback.onResult(CapacitorAuthManager.AuthResult.error(e));
|
|
362
|
+
}
|
|
363
|
+
}
|
|
364
|
+
|
|
365
|
+
private void handleSignInError(
|
|
366
|
+
GetCredentialException e,
|
|
367
|
+
CapacitorAuthManager.AuthCallback<JSObject> callback
|
|
368
|
+
) {
|
|
369
|
+
if (e instanceof GetCredentialCancellationException) {
|
|
370
|
+
logger.info("Google sign-in cancelled by user");
|
|
371
|
+
callback.onResult(CapacitorAuthManager.AuthResult.error(new Exception("User cancelled Google sign-in")));
|
|
372
|
+
return;
|
|
373
|
+
}
|
|
374
|
+
if (e instanceof NoCredentialException) {
|
|
375
|
+
logger.warn("No Google credentials available for sign-in");
|
|
376
|
+
callback.onResult(CapacitorAuthManager.AuthResult.error(new Exception(
|
|
377
|
+
"No Google account available. Add a Google account to the device, or ensure "
|
|
378
|
+
+ "Google Play services is up to date and the SHA-1 fingerprint is registered.")));
|
|
379
|
+
return;
|
|
380
|
+
}
|
|
381
|
+
logger.error("Google sign-in failed: " + e.getClass().getSimpleName(), e);
|
|
382
|
+
callback.onResult(CapacitorAuthManager.AuthResult.error(new Exception(
|
|
383
|
+
"Google sign-in failed: " + e.getMessage())));
|
|
384
|
+
}
|
|
385
|
+
|
|
386
|
+
private void clearCredentialState(final CapacitorAuthManager.AuthCallback<Void> callback) {
|
|
387
|
+
try {
|
|
388
|
+
CredentialManager credentialManager = CredentialManager.create(context);
|
|
389
|
+
Executor executor = ContextCompat.getMainExecutor(context);
|
|
390
|
+
credentialManager.clearCredentialStateAsync(
|
|
391
|
+
new ClearCredentialStateRequest(),
|
|
392
|
+
null,
|
|
393
|
+
executor,
|
|
394
|
+
new CredentialManagerCallback<Void, ClearCredentialException>() {
|
|
395
|
+
@Override
|
|
396
|
+
public void onResult(Void unused) {
|
|
397
|
+
clearSession();
|
|
398
|
+
callback.onResult(CapacitorAuthManager.AuthResult.success(null));
|
|
399
|
+
}
|
|
400
|
+
|
|
401
|
+
@Override
|
|
402
|
+
public void onError(ClearCredentialException e) {
|
|
403
|
+
logger.error("Failed to clear Credential Manager state", e);
|
|
404
|
+
// Still clear local session so the app reflects a signed-out state.
|
|
405
|
+
clearSession();
|
|
406
|
+
callback.onResult(CapacitorAuthManager.AuthResult.success(null));
|
|
407
|
+
}
|
|
408
|
+
}
|
|
409
|
+
);
|
|
410
|
+
} catch (Exception e) {
|
|
411
|
+
logger.error("Error clearing Credential Manager state", e);
|
|
412
|
+
clearSession();
|
|
413
|
+
callback.onResult(CapacitorAuthManager.AuthResult.success(null));
|
|
414
|
+
}
|
|
415
|
+
}
|
|
416
|
+
|
|
417
|
+
// ---- Result building ----
|
|
418
|
+
|
|
419
|
+
private JSObject createUserObject(GoogleIdTokenCredential cred, JSONObject claims) {
|
|
420
|
+
String email = cred.getId();
|
|
421
|
+
String displayName = cred.getDisplayName();
|
|
422
|
+
Uri photoUri = cred.getProfilePictureUri();
|
|
423
|
+
String photoURL = photoUri != null ? photoUri.toString() : null;
|
|
424
|
+
String phoneNumber = cred.getPhoneNumber();
|
|
425
|
+
|
|
426
|
+
String uid = null;
|
|
427
|
+
boolean emailVerified = true;
|
|
428
|
+
if (claims != null) {
|
|
429
|
+
String sub = claims.optString("sub", null);
|
|
430
|
+
if (sub != null && !sub.isEmpty()) {
|
|
431
|
+
uid = sub;
|
|
432
|
+
}
|
|
433
|
+
if (claims.has("email_verified")) {
|
|
434
|
+
emailVerified = claims.optBoolean("email_verified", true);
|
|
435
|
+
}
|
|
436
|
+
if (email == null) {
|
|
437
|
+
email = claims.optString("email", null);
|
|
438
|
+
}
|
|
439
|
+
if (displayName == null) {
|
|
440
|
+
displayName = claims.optString("name", null);
|
|
441
|
+
}
|
|
442
|
+
if (photoURL == null) {
|
|
443
|
+
String picture = claims.optString("picture", null);
|
|
444
|
+
if (picture != null && !picture.isEmpty()) {
|
|
445
|
+
photoURL = picture;
|
|
446
|
+
}
|
|
447
|
+
}
|
|
448
|
+
}
|
|
449
|
+
if (uid == null || uid.isEmpty()) {
|
|
450
|
+
// Credential Manager doesn't expose the Google `sub` directly; fall back to the email id.
|
|
451
|
+
uid = email;
|
|
452
|
+
}
|
|
453
|
+
|
|
286
454
|
JSObject user = new JSObject();
|
|
287
|
-
user.put("uid",
|
|
288
|
-
user.put("email",
|
|
289
|
-
user.put("emailVerified",
|
|
290
|
-
user.put("displayName",
|
|
291
|
-
user.put("photoURL",
|
|
292
|
-
user.put("phoneNumber",
|
|
455
|
+
user.put("uid", uid);
|
|
456
|
+
user.put("email", email);
|
|
457
|
+
user.put("emailVerified", emailVerified);
|
|
458
|
+
user.put("displayName", displayName);
|
|
459
|
+
user.put("photoURL", photoURL);
|
|
460
|
+
user.put("phoneNumber", phoneNumber);
|
|
293
461
|
user.put("isAnonymous", false);
|
|
294
|
-
|
|
462
|
+
// tenantId / refreshToken intentionally omitted (not available from Credential Manager).
|
|
295
463
|
|
|
296
|
-
// Provider data
|
|
297
464
|
JSONArray providerData = new JSONArray();
|
|
298
|
-
JSObject
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
providerData.put(
|
|
465
|
+
JSObject providerEntry = new JSObject();
|
|
466
|
+
providerEntry.put("providerId", PROVIDER_ID);
|
|
467
|
+
providerEntry.put("uid", uid);
|
|
468
|
+
providerEntry.put("displayName", displayName);
|
|
469
|
+
providerEntry.put("email", email);
|
|
470
|
+
providerEntry.put("phoneNumber", phoneNumber);
|
|
471
|
+
providerEntry.put("photoURL", photoURL);
|
|
472
|
+
providerData.put(providerEntry);
|
|
306
473
|
user.put("providerData", providerData);
|
|
307
474
|
|
|
308
|
-
// Metadata
|
|
309
475
|
JSObject metadata = new JSObject();
|
|
310
476
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);
|
|
311
477
|
sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
|
|
@@ -315,39 +481,71 @@ public class GoogleAuthProvider implements BaseAuthProvider {
|
|
|
315
481
|
return user;
|
|
316
482
|
}
|
|
317
483
|
|
|
318
|
-
private JSObject createCredentialObject(
|
|
484
|
+
private JSObject createCredentialObject(GoogleIdTokenCredential cred) {
|
|
319
485
|
JSObject credential = new JSObject();
|
|
320
|
-
credential.put("providerId",
|
|
321
|
-
credential.put("signInMethod",
|
|
322
|
-
credential.put("
|
|
323
|
-
|
|
324
|
-
credential.
|
|
325
|
-
|
|
326
|
-
if (account.getGrantedScopes() != null) {
|
|
327
|
-
StringBuilder scopeStr = new StringBuilder();
|
|
328
|
-
for (com.google.android.gms.common.api.Scope scope : account.getGrantedScopes()) {
|
|
329
|
-
if (scopeStr.length() > 0) scopeStr.append(" ");
|
|
330
|
-
scopeStr.append(scope.getScopeUri());
|
|
331
|
-
}
|
|
332
|
-
credential.put("scope", scopeStr.toString());
|
|
333
|
-
}
|
|
334
|
-
|
|
486
|
+
credential.put("providerId", PROVIDER_ID);
|
|
487
|
+
credential.put("signInMethod", PROVIDER_ID);
|
|
488
|
+
credential.put("idToken", cred.getIdToken());
|
|
489
|
+
// accessToken and serverAuthCode are NOT provided by Credential Manager sign-in (ID token only) —
|
|
490
|
+
// intentionally absent. Consumers feed credential.idToken into their own signInWithCredential(...).
|
|
335
491
|
return credential;
|
|
336
492
|
}
|
|
337
493
|
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
494
|
+
// ---- Helpers ----
|
|
495
|
+
|
|
496
|
+
private void persistSession(JSObject user, JSObject credential) {
|
|
497
|
+
try {
|
|
498
|
+
storage.saveCredential(STORAGE_CREDENTIAL_KEY, credential);
|
|
499
|
+
storage.saveCredential(STORAGE_USER_KEY, user);
|
|
500
|
+
} catch (Exception e) {
|
|
501
|
+
logger.warn("Failed to persist Google session");
|
|
502
|
+
}
|
|
503
|
+
}
|
|
342
504
|
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
505
|
+
private void clearSession() {
|
|
506
|
+
currentUser = null;
|
|
507
|
+
storage.deleteCredential(STORAGE_CREDENTIAL_KEY);
|
|
508
|
+
storage.deleteCredential(STORAGE_USER_KEY);
|
|
509
|
+
}
|
|
348
510
|
|
|
349
|
-
|
|
511
|
+
private void warnIfUnsupportedOptions() {
|
|
512
|
+
if (hostedDomain != null || loginHint != null) {
|
|
513
|
+
logger.warn("hostedDomain/loginHint are not enforced by Android Credential Manager "
|
|
514
|
+
+ "(GetGoogleIdOption) and will be ignored");
|
|
515
|
+
}
|
|
516
|
+
if (scopes != null && !scopes.isEmpty()) {
|
|
517
|
+
for (String scope : scopes) {
|
|
518
|
+
if (scope != null
|
|
519
|
+
&& !scope.equals("email")
|
|
520
|
+
&& !scope.equals("profile")
|
|
521
|
+
&& !scope.equals("openid")) {
|
|
522
|
+
logger.warn("Additional OAuth scopes are ignored by Android Credential Manager Google "
|
|
523
|
+
+ "sign-in (ID token only). Use the Google Authorization API for extra scopes.");
|
|
524
|
+
break;
|
|
525
|
+
}
|
|
526
|
+
}
|
|
527
|
+
}
|
|
528
|
+
}
|
|
350
529
|
|
|
351
|
-
|
|
530
|
+
/**
|
|
531
|
+
* Best-effort decode of the (unverified) ID-token JWT payload to read claims such as {@code sub}
|
|
532
|
+
* and {@code email_verified}. The token's signature is verified server-side by the consumer's
|
|
533
|
+
* own {@code signInWithCredential}; this is only used to enrich the user object.
|
|
534
|
+
*/
|
|
535
|
+
private JSONObject parseIdTokenClaims(String idToken) {
|
|
536
|
+
if (idToken == null || idToken.isEmpty()) {
|
|
537
|
+
return null;
|
|
538
|
+
}
|
|
539
|
+
try {
|
|
540
|
+
String[] parts = idToken.split("\\.");
|
|
541
|
+
if (parts.length < 2) {
|
|
542
|
+
return null;
|
|
543
|
+
}
|
|
544
|
+
byte[] decoded = Base64.decode(parts[1], Base64.URL_SAFE | Base64.NO_PADDING | Base64.NO_WRAP);
|
|
545
|
+
return new JSONObject(new String(decoded, StandardCharsets.UTF_8));
|
|
546
|
+
} catch (Exception e) {
|
|
547
|
+
logger.warn("Failed to parse Google ID token claims");
|
|
548
|
+
return null;
|
|
549
|
+
}
|
|
352
550
|
}
|
|
353
551
|
}
|