capacitor-auth-manager 2.4.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.
- package/CHANGELOG.md +149 -0
- package/CapacitorAuthManager.podspec +1 -1
- package/LICENSE +1 -1
- package/Readme.md +136 -595
- package/android/build.gradle +8 -2
- package/android/src/main/java/com/aoneahsan/capacitor_auth_manager/CapacitorAuthManager.java +43 -15
- 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 +427 -226
- package/android/src/main/java/com/aoneahsan/capacitor_auth_manager/ProviderFactory.java +28 -0
- 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 +6 -6
- package/ios/Plugin/GoogleAuthProvider.swift +213 -105
- package/ios/Plugin/Models.swift +35 -4
- package/package.json +31 -30
- 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
|
@@ -73,7 +73,7 @@ import Capacitor
|
|
|
73
73
|
return
|
|
74
74
|
}
|
|
75
75
|
|
|
76
|
-
provider.signIn(options: options) { result, error in
|
|
76
|
+
provider.signIn(credentials: options.credentials, options: options.options) { result, error in
|
|
77
77
|
if let result = result {
|
|
78
78
|
self.currentProvider = options.provider
|
|
79
79
|
self.storage.setLastAuthProvider(options.provider)
|
|
@@ -98,7 +98,7 @@ import Capacitor
|
|
|
98
98
|
return
|
|
99
99
|
}
|
|
100
100
|
|
|
101
|
-
authProvider.signOut(options:
|
|
101
|
+
authProvider.signOut(options: nil) { error in
|
|
102
102
|
if error == nil {
|
|
103
103
|
self.notifyAuthStateChange(nil)
|
|
104
104
|
}
|
|
@@ -111,7 +111,7 @@ import Capacitor
|
|
|
111
111
|
return
|
|
112
112
|
}
|
|
113
113
|
|
|
114
|
-
authProvider.signOut(options:
|
|
114
|
+
authProvider.signOut(options: nil) { error in
|
|
115
115
|
if error == nil {
|
|
116
116
|
self.currentProvider = nil
|
|
117
117
|
self.storage.removeLastAuthProvider()
|
|
@@ -126,7 +126,7 @@ import Capacitor
|
|
|
126
126
|
|
|
127
127
|
for (_, provider) in providers {
|
|
128
128
|
group.enter()
|
|
129
|
-
provider.signOut(options:
|
|
129
|
+
provider.signOut(options: nil) { error in
|
|
130
130
|
if let error = error {
|
|
131
131
|
signOutError = error
|
|
132
132
|
}
|
|
@@ -178,7 +178,7 @@ import Capacitor
|
|
|
178
178
|
return
|
|
179
179
|
}
|
|
180
180
|
|
|
181
|
-
providerImpl.refreshToken(options:
|
|
181
|
+
providerImpl.refreshToken(options: nil, completion: completion)
|
|
182
182
|
}
|
|
183
183
|
|
|
184
184
|
func addAuthStateListener(_ callback: @escaping AuthStateChangeCallback) -> String {
|
|
@@ -253,7 +253,7 @@ import Capacitor
|
|
|
253
253
|
return
|
|
254
254
|
}
|
|
255
255
|
|
|
256
|
-
provider.linkAccount(options: options, completion: completion)
|
|
256
|
+
provider.linkAccount(credentials: options.credentials, options: options.options, completion: completion)
|
|
257
257
|
}
|
|
258
258
|
|
|
259
259
|
func unlinkAccount(provider: AuthProvider, completion: @escaping (Error?) -> Void) {
|
|
@@ -1,14 +1,31 @@
|
|
|
1
1
|
import Foundation
|
|
2
|
+
import UIKit
|
|
2
3
|
import Capacitor
|
|
3
4
|
import GoogleSignIn
|
|
4
5
|
|
|
6
|
+
/// Native Google sign-in provider.
|
|
7
|
+
///
|
|
8
|
+
/// Google-first / Firebase-agnostic: this returns a credential
|
|
9
|
+
/// `{ idToken, accessToken, serverAuthCode?, ... }` to JS. The app is responsible
|
|
10
|
+
/// for any downstream Firebase `signInWithCredential` — this plugin never touches Firebase.
|
|
5
11
|
class GoogleAuthProvider: BaseAuthProvider {
|
|
6
12
|
let provider: AuthProvider = .google
|
|
7
13
|
let storage: AuthStorage
|
|
8
14
|
let logger: AuthLogger
|
|
9
15
|
|
|
16
|
+
/// The literal provider id JS expects for Google credentials / provider data.
|
|
17
|
+
/// (The internal `AuthProvider.google.rawValue` is `"google"`, used only for storage keys.)
|
|
18
|
+
private let providerIdString = "google.com"
|
|
19
|
+
|
|
20
|
+
// Configuration (from `initialize` providers[].options — GoogleAuthOptions)
|
|
10
21
|
private var clientId: String?
|
|
22
|
+
private var iosClientId: String?
|
|
23
|
+
private var serverClientId: String?
|
|
24
|
+
private var hostedDomain: String?
|
|
25
|
+
private var loginHint: String?
|
|
26
|
+
private var offlineAccess: Bool = false
|
|
11
27
|
private var scopes: [String] = []
|
|
28
|
+
|
|
12
29
|
private var currentUser: AuthUser?
|
|
13
30
|
|
|
14
31
|
init(config: AuthProviderConfig, storage: AuthStorage, logger: AuthLogger) {
|
|
@@ -16,23 +33,28 @@ class GoogleAuthProvider: BaseAuthProvider {
|
|
|
16
33
|
self.logger = logger
|
|
17
34
|
|
|
18
35
|
// Extract configuration
|
|
19
|
-
if let
|
|
20
|
-
|
|
21
|
-
}
|
|
22
|
-
if let
|
|
23
|
-
|
|
24
|
-
}
|
|
36
|
+
if let value = config.options["clientId"] as? String { self.clientId = value }
|
|
37
|
+
if let value = config.options["iosClientId"] as? String { self.iosClientId = value }
|
|
38
|
+
if let value = config.options["serverClientId"] as? String { self.serverClientId = value }
|
|
39
|
+
if let value = config.options["hostedDomain"] as? String { self.hostedDomain = value }
|
|
40
|
+
if let value = config.options["loginHint"] as? String { self.loginHint = value }
|
|
41
|
+
if let value = config.options["offlineAccess"] as? Bool { self.offlineAccess = value }
|
|
42
|
+
if let value = config.options["scopes"] as? [String] { self.scopes = value }
|
|
25
43
|
}
|
|
26
44
|
|
|
27
45
|
func initialize(completion: @escaping (Error?) -> Void) {
|
|
28
46
|
logger.info("Initializing Google auth provider")
|
|
29
47
|
|
|
30
|
-
|
|
31
|
-
|
|
48
|
+
// A client id must be resolvable from options or the app's Info.plist (`GIDClientID`).
|
|
49
|
+
guard resolveClientId() != nil else {
|
|
50
|
+
completion(createAuthError(
|
|
51
|
+
code: .missingConfiguration,
|
|
52
|
+
message: "Google client ID is required. Provide `clientId`/`iosClientId` in the provider options, or set `GIDClientID` in Info.plist."
|
|
53
|
+
))
|
|
32
54
|
return
|
|
33
55
|
}
|
|
34
56
|
|
|
35
|
-
//
|
|
57
|
+
// Restore any existing session so getCurrentUser works after a cold start.
|
|
36
58
|
if GIDSignIn.sharedInstance.hasPreviousSignIn() {
|
|
37
59
|
GIDSignIn.sharedInstance.restorePreviousSignIn { [weak self] user, error in
|
|
38
60
|
if let user = user {
|
|
@@ -49,68 +71,77 @@ class GoogleAuthProvider: BaseAuthProvider {
|
|
|
49
71
|
func signIn(credentials: JSObject?, options: JSObject?, completion: @escaping (AuthResult?, Error?) -> Void) {
|
|
50
72
|
logger.info("Starting Google sign-in")
|
|
51
73
|
|
|
52
|
-
guard let
|
|
53
|
-
completion(nil, createAuthError(
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
guard let presentingVC = UIApplication.shared.windows.first?.rootViewController else {
|
|
58
|
-
completion(nil, createAuthError(code: .internalError, message: "No presenting view controller available"))
|
|
74
|
+
guard let configuration = makeConfiguration() else {
|
|
75
|
+
completion(nil, createAuthError(
|
|
76
|
+
code: .missingConfiguration,
|
|
77
|
+
message: "Google client ID is required. Provide `clientId`/`iosClientId` in the provider options, or set `GIDClientID` in Info.plist."
|
|
78
|
+
))
|
|
59
79
|
return
|
|
60
80
|
}
|
|
61
81
|
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
GIDSignIn.sharedInstance.signIn(withPresenting: presentingVC, hint: nil, additionalScopes: scopes) { [weak self] result, error in
|
|
82
|
+
// Presentation + GoogleSignIn must run on the main thread.
|
|
83
|
+
DispatchQueue.main.async { [weak self] in
|
|
65
84
|
guard let self = self else { return }
|
|
66
85
|
|
|
67
|
-
|
|
68
|
-
self.
|
|
69
|
-
if (error as NSError).code == GIDSignInError.canceled.rawValue {
|
|
70
|
-
completion(nil, self.createAuthError(code: .userCancelled, message: "User cancelled sign-in"))
|
|
71
|
-
} else {
|
|
72
|
-
completion(nil, self.createAuthError(code: .internalError, message: error.localizedDescription))
|
|
73
|
-
}
|
|
86
|
+
guard let presentingVC = self.topPresentingViewController() else {
|
|
87
|
+
completion(nil, self.createAuthError(code: .internalError, message: "No presenting view controller available"))
|
|
74
88
|
return
|
|
75
89
|
}
|
|
76
90
|
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
}
|
|
91
|
+
// Setting `serverClientID` on the configuration is what makes `serverAuthCode`
|
|
92
|
+
// available in the result (offline access).
|
|
93
|
+
GIDSignIn.sharedInstance.configuration = configuration
|
|
81
94
|
|
|
82
|
-
let
|
|
83
|
-
self.currentUser = authUser
|
|
95
|
+
let additionalScopes = self.scopes.isEmpty ? nil : self.scopes
|
|
84
96
|
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
expiresAt: Int(user.accessToken.expirationDate?.timeIntervalSince1970 ?? 0) * 1000,
|
|
92
|
-
tokenType: "Bearer",
|
|
93
|
-
scope: self.scopes.joined(separator: " "),
|
|
94
|
-
rawNonce: nil
|
|
95
|
-
)
|
|
97
|
+
GIDSignIn.sharedInstance.signIn(
|
|
98
|
+
withPresenting: presentingVC,
|
|
99
|
+
hint: self.loginHint,
|
|
100
|
+
additionalScopes: additionalScopes
|
|
101
|
+
) { [weak self] result, error in
|
|
102
|
+
guard let self = self else { return }
|
|
96
103
|
|
|
97
|
-
|
|
98
|
-
|
|
104
|
+
if let error = error {
|
|
105
|
+
self.logger.error("Google sign-in failed: \(error.localizedDescription)")
|
|
106
|
+
if (error as NSError).code == GIDSignInError.canceled.rawValue {
|
|
107
|
+
completion(nil, self.createAuthError(code: .userCancelled, message: "User cancelled sign-in"))
|
|
108
|
+
} else {
|
|
109
|
+
completion(nil, self.createAuthError(code: .internalError, message: error.localizedDescription))
|
|
110
|
+
}
|
|
111
|
+
return
|
|
112
|
+
}
|
|
99
113
|
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
isNewUser: false,
|
|
105
|
-
providerId: self.provider.rawValue,
|
|
106
|
-
profile: nil,
|
|
107
|
-
username: nil
|
|
108
|
-
),
|
|
109
|
-
operationType: "signIn"
|
|
110
|
-
)
|
|
114
|
+
guard let result = result else {
|
|
115
|
+
completion(nil, self.createAuthError(code: .internalError, message: "No user data returned"))
|
|
116
|
+
return
|
|
117
|
+
}
|
|
111
118
|
|
|
112
|
-
|
|
113
|
-
|
|
119
|
+
let gidUser = result.user
|
|
120
|
+
let authUser = self.createAuthUser(from: gidUser)
|
|
121
|
+
self.currentUser = authUser
|
|
122
|
+
|
|
123
|
+
// serverAuthCode lives on the GIDSignInResult (not on the user) and is only
|
|
124
|
+
// present when a serverClientID is configured.
|
|
125
|
+
let credential = self.makeCredential(from: gidUser, serverAuthCode: result.serverAuthCode)
|
|
126
|
+
|
|
127
|
+
// Persist credential for later restore (serverAuthCode is single-use and not persisted).
|
|
128
|
+
self.storage.saveCredential(credential, for: self.provider)
|
|
129
|
+
|
|
130
|
+
let authResult = AuthResult(
|
|
131
|
+
user: authUser,
|
|
132
|
+
credential: credential,
|
|
133
|
+
additionalUserInfo: AdditionalUserInfo(
|
|
134
|
+
isNewUser: false,
|
|
135
|
+
providerId: self.providerIdString,
|
|
136
|
+
profile: nil,
|
|
137
|
+
username: nil
|
|
138
|
+
),
|
|
139
|
+
operationType: "signIn"
|
|
140
|
+
)
|
|
141
|
+
|
|
142
|
+
self.logger.info("Google sign-in successful")
|
|
143
|
+
completion(authResult, nil)
|
|
144
|
+
}
|
|
114
145
|
}
|
|
115
146
|
}
|
|
116
147
|
|
|
@@ -138,59 +169,34 @@ class GoogleAuthProvider: BaseAuthProvider {
|
|
|
138
169
|
func refreshToken(options: JSObject?, completion: @escaping (AuthResult?, Error?) -> Void) {
|
|
139
170
|
logger.info("Refreshing Google token")
|
|
140
171
|
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
return
|
|
172
|
+
if let user = GIDSignIn.sharedInstance.currentUser {
|
|
173
|
+
refreshAndBuildResult(user: user, completion: completion)
|
|
174
|
+
} else if GIDSignIn.sharedInstance.hasPreviousSignIn() {
|
|
175
|
+
// No in-memory user yet (e.g. cold start) — restore first, then refresh.
|
|
176
|
+
GIDSignIn.sharedInstance.restorePreviousSignIn { [weak self] user, error in
|
|
177
|
+
guard let self = self else { return }
|
|
178
|
+
if let error = error {
|
|
179
|
+
completion(nil, self.createAuthError(code: .tokenExpired, message: error.localizedDescription))
|
|
180
|
+
return
|
|
181
|
+
}
|
|
182
|
+
guard let user = user else {
|
|
183
|
+
completion(nil, self.createAuthError(code: .invalidUserToken, message: "No current user"))
|
|
184
|
+
return
|
|
185
|
+
}
|
|
186
|
+
self.refreshAndBuildResult(user: user, completion: completion)
|
|
157
187
|
}
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
self.currentUser = authUser
|
|
161
|
-
|
|
162
|
-
let credential = AuthCredential(
|
|
163
|
-
providerId: self.provider.rawValue,
|
|
164
|
-
signInMethod: "oauth",
|
|
165
|
-
accessToken: user.accessToken.tokenString,
|
|
166
|
-
idToken: user.idToken?.tokenString,
|
|
167
|
-
refreshToken: user.refreshToken.tokenString,
|
|
168
|
-
expiresAt: Int(user.accessToken.expirationDate?.timeIntervalSince1970 ?? 0) * 1000,
|
|
169
|
-
tokenType: "Bearer",
|
|
170
|
-
scope: self.scopes.joined(separator: " "),
|
|
171
|
-
rawNonce: nil
|
|
172
|
-
)
|
|
173
|
-
|
|
174
|
-
self.storage.saveCredential(credential, for: self.provider)
|
|
175
|
-
|
|
176
|
-
let authResult = AuthResult(
|
|
177
|
-
user: authUser,
|
|
178
|
-
credential: credential,
|
|
179
|
-
additionalUserInfo: nil,
|
|
180
|
-
operationType: "refresh"
|
|
181
|
-
)
|
|
182
|
-
|
|
183
|
-
completion(authResult, nil)
|
|
188
|
+
} else {
|
|
189
|
+
completion(nil, createAuthError(code: .invalidUserToken, message: "No current user"))
|
|
184
190
|
}
|
|
185
191
|
}
|
|
186
192
|
|
|
187
193
|
func isSupported(completion: @escaping (Bool, Error?) -> Void) {
|
|
188
|
-
// Google Sign-In is available on all iOS versions we support
|
|
194
|
+
// Google Sign-In is available on all iOS versions we support.
|
|
189
195
|
completion(true, nil)
|
|
190
196
|
}
|
|
191
197
|
|
|
192
198
|
func linkAccount(credentials: JSObject?, options: JSObject?, completion: @escaping (AuthResult?, Error?) -> Void) {
|
|
193
|
-
// For Google, linking is
|
|
199
|
+
// For Google, linking is the same interactive flow as sign-in.
|
|
194
200
|
signIn(credentials: credentials, options: options, completion: completion)
|
|
195
201
|
}
|
|
196
202
|
|
|
@@ -220,7 +226,8 @@ class GoogleAuthProvider: BaseAuthProvider {
|
|
|
220
226
|
func revokeAccess(token: String?, completion: @escaping (Error?) -> Void) {
|
|
221
227
|
logger.info("Revoking Google access")
|
|
222
228
|
|
|
223
|
-
GIDSignIn.sharedInstance.disconnect { error in
|
|
229
|
+
GIDSignIn.sharedInstance.disconnect { [weak self] error in
|
|
230
|
+
guard let self = self else { return }
|
|
224
231
|
if let error = error {
|
|
225
232
|
completion(error)
|
|
226
233
|
} else {
|
|
@@ -231,13 +238,94 @@ class GoogleAuthProvider: BaseAuthProvider {
|
|
|
231
238
|
}
|
|
232
239
|
}
|
|
233
240
|
|
|
241
|
+
// MARK: - Private helpers
|
|
242
|
+
|
|
243
|
+
/// Resolve the iOS OAuth client id: explicit `iosClientId`, else `clientId`, else the
|
|
244
|
+
/// app's `GIDClientID` from Info.plist. Returns nil when none is available.
|
|
245
|
+
private func resolveClientId() -> String? {
|
|
246
|
+
if let iosClientId = iosClientId { return iosClientId }
|
|
247
|
+
if let clientId = clientId { return clientId }
|
|
248
|
+
if let plistClientId = Bundle.main.object(forInfoDictionaryKey: "GIDClientID") as? String,
|
|
249
|
+
!plistClientId.isEmpty {
|
|
250
|
+
return plistClientId
|
|
251
|
+
}
|
|
252
|
+
return nil
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
/// Build a GIDConfiguration from the resolved client id + optional serverClientID / hostedDomain.
|
|
256
|
+
private func makeConfiguration() -> GIDConfiguration? {
|
|
257
|
+
guard let clientID = resolveClientId() else { return nil }
|
|
258
|
+
return GIDConfiguration(
|
|
259
|
+
clientID: clientID,
|
|
260
|
+
serverClientID: serverClientId,
|
|
261
|
+
hostedDomain: hostedDomain,
|
|
262
|
+
openIDRealm: nil
|
|
263
|
+
)
|
|
264
|
+
}
|
|
265
|
+
|
|
266
|
+
private func refreshAndBuildResult(user: GIDGoogleUser, completion: @escaping (AuthResult?, Error?) -> Void) {
|
|
267
|
+
user.refreshTokensIfNeeded { [weak self] refreshedUser, error in
|
|
268
|
+
guard let self = self else { return }
|
|
269
|
+
|
|
270
|
+
if let error = error {
|
|
271
|
+
completion(nil, self.createAuthError(code: .tokenExpired, message: error.localizedDescription))
|
|
272
|
+
return
|
|
273
|
+
}
|
|
274
|
+
|
|
275
|
+
guard let refreshedUser = refreshedUser else {
|
|
276
|
+
completion(nil, self.createAuthError(code: .internalError, message: "No user data after refresh"))
|
|
277
|
+
return
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
let authUser = self.createAuthUser(from: refreshedUser)
|
|
281
|
+
self.currentUser = authUser
|
|
282
|
+
|
|
283
|
+
// serverAuthCode is only returned by the interactive sign-in, not on refresh.
|
|
284
|
+
let credential = self.makeCredential(from: refreshedUser, serverAuthCode: nil)
|
|
285
|
+
self.storage.saveCredential(credential, for: self.provider)
|
|
286
|
+
|
|
287
|
+
let authResult = AuthResult(
|
|
288
|
+
user: authUser,
|
|
289
|
+
credential: credential,
|
|
290
|
+
additionalUserInfo: nil,
|
|
291
|
+
operationType: "refresh"
|
|
292
|
+
)
|
|
293
|
+
|
|
294
|
+
completion(authResult, nil)
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
|
|
298
|
+
private func makeCredential(from gidUser: GIDGoogleUser, serverAuthCode: String?) -> AuthCredential {
|
|
299
|
+
let grantedScopes = gidUser.grantedScopes ?? scopes
|
|
300
|
+
let expiresAt: Int? = gidUser.accessToken.expirationDate
|
|
301
|
+
.map { Int($0.timeIntervalSince1970 * 1000) }
|
|
302
|
+
|
|
303
|
+
return AuthCredential(
|
|
304
|
+
providerId: providerIdString,
|
|
305
|
+
signInMethod: providerIdString,
|
|
306
|
+
accessToken: gidUser.accessToken.tokenString,
|
|
307
|
+
idToken: gidUser.idToken?.tokenString,
|
|
308
|
+
refreshToken: gidUser.refreshToken.tokenString,
|
|
309
|
+
expiresAt: expiresAt,
|
|
310
|
+
tokenType: "Bearer",
|
|
311
|
+
scope: grantedScopes.joined(separator: " "),
|
|
312
|
+
rawNonce: nil,
|
|
313
|
+
serverAuthCode: serverAuthCode
|
|
314
|
+
)
|
|
315
|
+
}
|
|
316
|
+
|
|
234
317
|
private func createAuthUser(from gidUser: GIDGoogleUser) -> AuthUser {
|
|
235
318
|
let profile = gidUser.profile
|
|
236
319
|
|
|
320
|
+
// BUGFIX: Google profiles from GoogleSignIn do not expose verification state.
|
|
321
|
+
// Google account emails are themselves verified, so treat presence of an email as verified
|
|
322
|
+
// (previously this incorrectly used `profile?.hasImage`).
|
|
323
|
+
let emailVerified = profile?.email != nil
|
|
324
|
+
|
|
237
325
|
return AuthUser(
|
|
238
326
|
uid: gidUser.userID ?? "",
|
|
239
327
|
email: profile?.email,
|
|
240
|
-
emailVerified:
|
|
328
|
+
emailVerified: emailVerified,
|
|
241
329
|
displayName: profile?.name,
|
|
242
330
|
photoURL: profile?.imageURL(withDimension: 200)?.absoluteString,
|
|
243
331
|
phoneNumber: nil,
|
|
@@ -245,7 +333,7 @@ class GoogleAuthProvider: BaseAuthProvider {
|
|
|
245
333
|
tenantId: nil,
|
|
246
334
|
providerData: [
|
|
247
335
|
UserInfo(
|
|
248
|
-
providerId:
|
|
336
|
+
providerId: providerIdString,
|
|
249
337
|
uid: gidUser.userID ?? "",
|
|
250
338
|
displayName: profile?.name,
|
|
251
339
|
email: profile?.email,
|
|
@@ -262,4 +350,24 @@ class GoogleAuthProvider: BaseAuthProvider {
|
|
|
262
350
|
customClaims: nil
|
|
263
351
|
)
|
|
264
352
|
}
|
|
353
|
+
|
|
354
|
+
/// BUGFIX: modern top-most presenting view controller lookup.
|
|
355
|
+
/// Replaces the deprecated `UIApplication.shared.windows.first` API with a
|
|
356
|
+
/// `connectedScenes`-based key-window lookup, then walks to the top presented controller.
|
|
357
|
+
/// Must be called on the main thread.
|
|
358
|
+
private func topPresentingViewController() -> UIViewController? {
|
|
359
|
+
let windows = UIApplication.shared.connectedScenes
|
|
360
|
+
.compactMap { $0 as? UIWindowScene }
|
|
361
|
+
.flatMap { $0.windows }
|
|
362
|
+
|
|
363
|
+
let keyWindow = windows.first { $0.isKeyWindow }
|
|
364
|
+
?? windows.first { $0.windowScene?.activationState == .foregroundActive }
|
|
365
|
+
?? windows.first
|
|
366
|
+
|
|
367
|
+
guard var top = keyWindow?.rootViewController else { return nil }
|
|
368
|
+
while let presented = top.presentedViewController {
|
|
369
|
+
top = presented
|
|
370
|
+
}
|
|
371
|
+
return top
|
|
372
|
+
}
|
|
265
373
|
}
|
package/ios/Plugin/Models.swift
CHANGED
|
@@ -219,21 +219,52 @@ struct AuthCredential {
|
|
|
219
219
|
let tokenType: String?
|
|
220
220
|
let scope: String?
|
|
221
221
|
let rawNonce: String?
|
|
222
|
-
|
|
222
|
+
// Server auth (offline-access) code — only populated by providers that support it
|
|
223
|
+
// (e.g. Google native sign-in when a server client id is configured).
|
|
224
|
+
let serverAuthCode: String?
|
|
225
|
+
|
|
226
|
+
// Explicit memberwise-style initializer. Every optional defaults to nil so that
|
|
227
|
+
// `serverAuthCode` can be added without changing any existing call site that passes
|
|
228
|
+
// the original nine arguments in order.
|
|
229
|
+
init(
|
|
230
|
+
providerId: String,
|
|
231
|
+
signInMethod: String,
|
|
232
|
+
accessToken: String? = nil,
|
|
233
|
+
idToken: String? = nil,
|
|
234
|
+
refreshToken: String? = nil,
|
|
235
|
+
expiresAt: Int? = nil,
|
|
236
|
+
tokenType: String? = nil,
|
|
237
|
+
scope: String? = nil,
|
|
238
|
+
rawNonce: String? = nil,
|
|
239
|
+
serverAuthCode: String? = nil
|
|
240
|
+
) {
|
|
241
|
+
self.providerId = providerId
|
|
242
|
+
self.signInMethod = signInMethod
|
|
243
|
+
self.accessToken = accessToken
|
|
244
|
+
self.idToken = idToken
|
|
245
|
+
self.refreshToken = refreshToken
|
|
246
|
+
self.expiresAt = expiresAt
|
|
247
|
+
self.tokenType = tokenType
|
|
248
|
+
self.scope = scope
|
|
249
|
+
self.rawNonce = rawNonce
|
|
250
|
+
self.serverAuthCode = serverAuthCode
|
|
251
|
+
}
|
|
252
|
+
|
|
223
253
|
func toJSObject() -> JSObject {
|
|
224
254
|
var result: JSObject = [
|
|
225
255
|
"providerId": providerId,
|
|
226
256
|
"signInMethod": signInMethod
|
|
227
257
|
]
|
|
228
|
-
|
|
229
|
-
if let accessToken = accessToken { result["accessToken"] = accessToken }
|
|
258
|
+
|
|
230
259
|
if let idToken = idToken { result["idToken"] = idToken }
|
|
260
|
+
if let accessToken = accessToken { result["accessToken"] = accessToken }
|
|
261
|
+
if let serverAuthCode = serverAuthCode { result["serverAuthCode"] = serverAuthCode }
|
|
231
262
|
if let refreshToken = refreshToken { result["refreshToken"] = refreshToken }
|
|
232
263
|
if let expiresAt = expiresAt { result["expiresAt"] = expiresAt }
|
|
233
264
|
if let tokenType = tokenType { result["tokenType"] = tokenType }
|
|
234
265
|
if let scope = scope { result["scope"] = scope }
|
|
235
266
|
if let rawNonce = rawNonce { result["rawNonce"] = rawNonce }
|
|
236
|
-
|
|
267
|
+
|
|
237
268
|
return result
|
|
238
269
|
}
|
|
239
270
|
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "capacitor-auth-manager",
|
|
3
|
-
"version": "2.4.
|
|
4
|
-
"description": "
|
|
3
|
+
"version": "2.4.1",
|
|
4
|
+
"description": "Capacitor + web authentication. Firebase-agnostic native & web Google sign-in (idToken/accessToken) for React, Vue, Angular and vanilla JS — a drop-in alternative to @codetrix-studio/capacitor-google-auth. More providers shipping one at a time.",
|
|
5
5
|
"main": "dist/plugin.cjs.js",
|
|
6
6
|
"module": "dist/esm/index.js",
|
|
7
7
|
"types": "dist/esm/index.d.ts",
|
|
@@ -36,7 +36,8 @@
|
|
|
36
36
|
"types": "./dist/esm/providers/web/index.d.ts",
|
|
37
37
|
"import": "./dist/esm/providers/web/index.js",
|
|
38
38
|
"require": "./dist/plugin.cjs.js"
|
|
39
|
-
}
|
|
39
|
+
},
|
|
40
|
+
"./package.json": "./package.json"
|
|
40
41
|
},
|
|
41
42
|
"sideEffects": false,
|
|
42
43
|
"files": [
|
|
@@ -47,7 +48,10 @@
|
|
|
47
48
|
"android/proguard-rules.pro",
|
|
48
49
|
"dist/",
|
|
49
50
|
"ios/Plugin/",
|
|
50
|
-
"CapacitorAuthManager.podspec"
|
|
51
|
+
"CapacitorAuthManager.podspec",
|
|
52
|
+
"CHANGELOG.md",
|
|
53
|
+
"!**/CLAUDE.md",
|
|
54
|
+
"!**/AGENTS.md"
|
|
51
55
|
],
|
|
52
56
|
"author": {
|
|
53
57
|
"email": "aoneahsan@gmail.com",
|
|
@@ -62,6 +66,7 @@
|
|
|
62
66
|
"bugs": {
|
|
63
67
|
"url": "https://github.com/aoneahsan/capacitor-auth-manager/issues"
|
|
64
68
|
},
|
|
69
|
+
"homepage": "https://npmjs.com/package/capacitor-auth-manager",
|
|
65
70
|
"keywords": [
|
|
66
71
|
"auth",
|
|
67
72
|
"authentication",
|
|
@@ -93,15 +98,15 @@
|
|
|
93
98
|
"clean": "rimraf ./dist",
|
|
94
99
|
"tsc": "tsc -p tsconfig.build.json",
|
|
95
100
|
"watch": "tsc --watch",
|
|
96
|
-
"lint": "eslint .
|
|
101
|
+
"lint": "eslint .",
|
|
97
102
|
"prettier": "prettier --write .",
|
|
98
|
-
"
|
|
103
|
+
"prepack": "npm run build",
|
|
104
|
+
"prepublishOnly": "npm run build && npm run lint",
|
|
99
105
|
"swiftlint": "cd ios && swiftlint lint --fix --format --path Plugin --verbose",
|
|
100
|
-
"configure": "node scripts/configure.js"
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
"
|
|
104
|
-
"test:ci": "vitest run --reporter=junit --outputFile=reports/junit.xml"
|
|
106
|
+
"configure": "node scripts/configure.js"
|
|
107
|
+
},
|
|
108
|
+
"engines": {
|
|
109
|
+
"node": ">=18.0.0"
|
|
105
110
|
},
|
|
106
111
|
"bin": {
|
|
107
112
|
"capacitor-auth-configure": "./scripts/configure.js"
|
|
@@ -110,31 +115,28 @@
|
|
|
110
115
|
"tslib": "^2.8.1"
|
|
111
116
|
},
|
|
112
117
|
"devDependencies": {
|
|
113
|
-
"@angular/common": "^
|
|
114
|
-
"@angular/core": "^
|
|
115
|
-
"@angular/router": "^
|
|
116
|
-
"@capacitor/android": "^8.
|
|
117
|
-
"@capacitor/cli": "^8.
|
|
118
|
-
"@capacitor/core": "^8.
|
|
119
|
-
"@capacitor/ios": "^8.
|
|
118
|
+
"@angular/common": "^22.0.0",
|
|
119
|
+
"@angular/core": "^22.0.0",
|
|
120
|
+
"@angular/router": "^22.0.0",
|
|
121
|
+
"@capacitor/android": "^8.4.0",
|
|
122
|
+
"@capacitor/cli": "^8.4.0",
|
|
123
|
+
"@capacitor/core": "^8.4.0",
|
|
124
|
+
"@capacitor/ios": "^8.4.0",
|
|
120
125
|
"@rollup/plugin-json": "^6.1.0",
|
|
121
126
|
"@rollup/plugin-node-resolve": "^16.0.3",
|
|
122
127
|
"@types/node": "^25.9.1",
|
|
123
|
-
"@types/react": "^19.2.
|
|
124
|
-
"
|
|
125
|
-
"eslint": "^10.4.0",
|
|
126
|
-
"happy-dom": "^20.9.0",
|
|
128
|
+
"@types/react": "^19.2.17",
|
|
129
|
+
"eslint": "^10.4.1",
|
|
127
130
|
"prettier": "^3.8.3",
|
|
128
131
|
"rimraf": "^6.1.3",
|
|
129
|
-
"rollup": "^4.
|
|
132
|
+
"rollup": "^4.61.1",
|
|
130
133
|
"rxjs": "^7.8.2",
|
|
131
134
|
"typescript": "^6.0.3",
|
|
132
|
-
"typescript-eslint": "^8.60.
|
|
133
|
-
"
|
|
134
|
-
"vue": "^3.5.34"
|
|
135
|
+
"typescript-eslint": "^8.60.1",
|
|
136
|
+
"vue": "^3.5.35"
|
|
135
137
|
},
|
|
136
138
|
"peerDependencies": {
|
|
137
|
-
"@angular/core": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0",
|
|
139
|
+
"@angular/core": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0",
|
|
138
140
|
"@capacitor/core": "^7.4.2 || ^8.0.0",
|
|
139
141
|
"@capacitor/preferences": "^6.0.0 || ^7.0.0 || ^8.0.0",
|
|
140
142
|
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
|
|
@@ -158,7 +160,7 @@
|
|
|
158
160
|
}
|
|
159
161
|
},
|
|
160
162
|
"optionalDependencies": {
|
|
161
|
-
"capacitor-biometric-authentication": "^2.
|
|
163
|
+
"capacitor-biometric-authentication": "^2.3.1"
|
|
162
164
|
},
|
|
163
165
|
"capacitor": {
|
|
164
166
|
"ios": {
|
|
@@ -167,6 +169,5 @@
|
|
|
167
169
|
"android": {
|
|
168
170
|
"src": "android"
|
|
169
171
|
}
|
|
170
|
-
}
|
|
171
|
-
"packageManager": "yarn@4.14.1"
|
|
172
|
+
}
|
|
172
173
|
}
|