capacitor-auth-manager 2.3.0 → 2.4.1

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