react-native-nitro-auth 0.5.12 → 0.6.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 +42 -0
- package/README.md +132 -32
- package/android/build.gradle +4 -4
- package/android/gradle.properties +2 -2
- package/android/src/main/cpp/PlatformAuth+Android.cpp +87 -4
- package/android/src/main/java/com/auth/AuthAdapter.kt +85 -48
- package/android/src/main/java/com/auth/GoogleSignInActivity.kt +12 -2
- package/cpp/HybridAuth.cpp +168 -18
- package/cpp/HybridAuth.hpp +7 -0
- package/cpp/PlatformAuth.hpp +1 -0
- package/ios/AuthAdapter.swift +101 -24
- package/ios/PlatformAuth+iOS.mm +37 -1
- package/lib/commonjs/Auth.web.js +74 -21
- package/lib/commonjs/Auth.web.js.map +1 -1
- package/lib/commonjs/create-auth-service.js +10 -0
- package/lib/commonjs/create-auth-service.js.map +1 -1
- package/lib/commonjs/index.js +12 -0
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/index.web.js +12 -0
- package/lib/commonjs/index.web.js.map +1 -1
- package/lib/commonjs/provider-options.js +6 -0
- package/lib/commonjs/provider-options.js.map +1 -0
- package/lib/commonjs/service.js.map +1 -1
- package/lib/commonjs/service.web.js.map +1 -1
- package/lib/commonjs/use-auth.js +21 -1
- package/lib/commonjs/use-auth.js.map +1 -1
- package/lib/module/Auth.web.js +74 -21
- package/lib/module/Auth.web.js.map +1 -1
- package/lib/module/create-auth-service.js +10 -0
- package/lib/module/create-auth-service.js.map +1 -1
- package/lib/module/global.d.js.map +1 -1
- package/lib/module/index.js +1 -0
- package/lib/module/index.js.map +1 -1
- package/lib/module/index.web.js +1 -0
- package/lib/module/index.web.js.map +1 -1
- package/lib/module/provider-options.js +4 -0
- package/lib/module/provider-options.js.map +1 -0
- package/lib/module/service.js.map +1 -1
- package/lib/module/service.web.js.map +1 -1
- package/lib/module/use-auth.js +21 -1
- package/lib/module/use-auth.js.map +1 -1
- package/lib/typescript/commonjs/Auth.nitro.d.ts +11 -0
- package/lib/typescript/commonjs/Auth.nitro.d.ts.map +1 -1
- package/lib/typescript/commonjs/Auth.web.d.ts +4 -0
- package/lib/typescript/commonjs/Auth.web.d.ts.map +1 -1
- package/lib/typescript/commonjs/create-auth-service.d.ts +2 -1
- package/lib/typescript/commonjs/create-auth-service.d.ts.map +1 -1
- package/lib/typescript/commonjs/index.d.ts +1 -0
- package/lib/typescript/commonjs/index.d.ts.map +1 -1
- package/lib/typescript/commonjs/index.web.d.ts +1 -0
- package/lib/typescript/commonjs/index.web.d.ts.map +1 -1
- package/lib/typescript/commonjs/provider-options.d.ts +23 -0
- package/lib/typescript/commonjs/provider-options.d.ts.map +1 -0
- package/lib/typescript/commonjs/service.d.ts +2 -2
- package/lib/typescript/commonjs/service.d.ts.map +1 -1
- package/lib/typescript/commonjs/service.web.d.ts +2 -2
- package/lib/typescript/commonjs/service.web.d.ts.map +1 -1
- package/lib/typescript/commonjs/use-auth.d.ts +4 -2
- package/lib/typescript/commonjs/use-auth.d.ts.map +1 -1
- package/lib/typescript/module/Auth.nitro.d.ts +11 -0
- package/lib/typescript/module/Auth.nitro.d.ts.map +1 -1
- package/lib/typescript/module/Auth.web.d.ts +4 -0
- package/lib/typescript/module/Auth.web.d.ts.map +1 -1
- package/lib/typescript/module/create-auth-service.d.ts +2 -1
- package/lib/typescript/module/create-auth-service.d.ts.map +1 -1
- package/lib/typescript/module/index.d.ts +1 -0
- package/lib/typescript/module/index.d.ts.map +1 -1
- package/lib/typescript/module/index.web.d.ts +1 -0
- package/lib/typescript/module/index.web.d.ts.map +1 -1
- package/lib/typescript/module/provider-options.d.ts +23 -0
- package/lib/typescript/module/provider-options.d.ts.map +1 -0
- package/lib/typescript/module/service.d.ts +2 -2
- package/lib/typescript/module/service.d.ts.map +1 -1
- package/lib/typescript/module/service.web.d.ts +2 -2
- package/lib/typescript/module/service.web.d.ts.map +1 -1
- package/lib/typescript/module/use-auth.d.ts +4 -2
- package/lib/typescript/module/use-auth.d.ts.map +1 -1
- package/nitrogen/generated/shared/c++/AuthUser.hpp +17 -1
- package/nitrogen/generated/shared/c++/HybridAuthSpec.cpp +1 -0
- package/nitrogen/generated/shared/c++/HybridAuthSpec.hpp +1 -0
- package/nitrogen/generated/shared/c++/LoginOptions.hpp +25 -1
- package/package.json +7 -7
- package/react-native-nitro-auth.podspec +1 -1
- package/src/Auth.nitro.ts +11 -0
- package/src/Auth.web.ts +99 -16
- package/src/create-auth-service.ts +19 -9
- package/src/global.d.ts +2 -1
- package/src/index.ts +1 -0
- package/src/index.web.ts +1 -0
- package/src/provider-options.ts +62 -0
- package/src/service.ts +2 -1
- package/src/service.web.ts +2 -2
- package/src/use-auth.ts +22 -8
|
@@ -5,13 +5,19 @@ export type MicrosoftPrompt = "login" | "consent" | "select_account" | "none";
|
|
|
5
5
|
export interface LoginOptions {
|
|
6
6
|
scopes?: string[];
|
|
7
7
|
loginHint?: string;
|
|
8
|
+
nonce?: string;
|
|
8
9
|
useOneTap?: boolean;
|
|
9
10
|
/** (iOS only) Use native sign-in sheet */
|
|
10
11
|
useSheet?: boolean;
|
|
11
12
|
/** Force account picker to show, ignoring any cached session or loginHint. On Android Google, this uses the legacy chooser path. */
|
|
12
13
|
forceAccountPicker?: boolean;
|
|
14
|
+
filterByAuthorizedAccounts?: boolean;
|
|
13
15
|
/** (Android only) Use legacy Google Sign-In flow (e.g. for serverAuthCode) */
|
|
14
16
|
useLegacyGoogleSignIn?: boolean;
|
|
17
|
+
forceCodeForRefreshToken?: boolean;
|
|
18
|
+
hostedDomain?: string;
|
|
19
|
+
openIDRealm?: string;
|
|
20
|
+
requestVerifiedPhoneNumber?: boolean;
|
|
15
21
|
/** (Microsoft only) Azure AD tenant - "common", "organizations", "consumers", or tenant ID */
|
|
16
22
|
tenant?: string;
|
|
17
23
|
/** (Microsoft only) Prompt behavior for login */
|
|
@@ -32,6 +38,10 @@ export interface AuthUser {
|
|
|
32
38
|
accessToken?: string;
|
|
33
39
|
refreshToken?: string;
|
|
34
40
|
serverAuthCode?: string;
|
|
41
|
+
authorizationCode?: string;
|
|
42
|
+
userId?: string;
|
|
43
|
+
phoneNumber?: string;
|
|
44
|
+
hostedDomain?: string;
|
|
35
45
|
scopes?: string[];
|
|
36
46
|
expirationTime?: number;
|
|
37
47
|
/** Raw native error message */
|
|
@@ -47,6 +57,7 @@ export interface Auth extends HybridObject<{
|
|
|
47
57
|
login(provider: AuthProvider, options?: LoginOptions): Promise<void>;
|
|
48
58
|
requestScopes(scopes: string[]): Promise<void>;
|
|
49
59
|
revokeScopes(scopes: string[]): Promise<void>;
|
|
60
|
+
revokeAccess(): Promise<void>;
|
|
50
61
|
getAccessToken(): Promise<string | undefined>;
|
|
51
62
|
refreshToken(): Promise<AuthTokens>;
|
|
52
63
|
logout(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.nitro.d.ts","sourceRoot":"","sources":["../../../src/Auth.nitro.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Auth.nitro.d.ts","sourceRoot":"","sources":["../../../src/Auth.nitro.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,8 @@ declare class AuthWeb implements Auth {
|
|
|
12
12
|
private _refreshPromise;
|
|
13
13
|
private _pendingGoogleNonce;
|
|
14
14
|
private _loginInFlight;
|
|
15
|
+
private _sessionGeneration;
|
|
16
|
+
private _disposed;
|
|
15
17
|
constructor();
|
|
16
18
|
private isPromiseLike;
|
|
17
19
|
private createWebStorageDriver;
|
|
@@ -35,9 +37,11 @@ declare class AuthWeb implements Auth {
|
|
|
35
37
|
private notify;
|
|
36
38
|
private notifyTokenListeners;
|
|
37
39
|
private runLoginOperation;
|
|
40
|
+
private assertActiveGeneration;
|
|
38
41
|
login(provider: AuthProvider, options?: LoginOptions): Promise<void>;
|
|
39
42
|
requestScopes(scopes: string[]): Promise<void>;
|
|
40
43
|
revokeScopes(scopes: string[]): Promise<void>;
|
|
44
|
+
revokeAccess(): Promise<void>;
|
|
41
45
|
getAccessToken(): Promise<string | undefined>;
|
|
42
46
|
refreshToken(): Promise<AuthTokens>;
|
|
43
47
|
private performRefreshToken;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.web.d.ts","sourceRoot":"","sources":["../../../src/Auth.web.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACJ,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,UAAU,EAEX,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"Auth.web.d.ts","sourceRoot":"","sources":["../../../src/Auth.web.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Auth } from "./Auth.nitro";
|
|
2
|
+
import type { TypedAuth } from "./provider-options";
|
|
2
3
|
type AuthSource = () => Auth;
|
|
3
|
-
export declare function createAuthService(getAuth: AuthSource):
|
|
4
|
+
export declare function createAuthService(getAuth: AuthSource): TypedAuth;
|
|
4
5
|
export {};
|
|
5
6
|
//# sourceMappingURL=create-auth-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-auth-service.d.ts","sourceRoot":"","sources":["../../../src/create-auth-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"create-auth-service.d.ts","sourceRoot":"","sources":["../../../src/create-auth-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAsC,MAAM,cAAc,CAAC;AAC7E,OAAO,KAAK,EAAwB,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG1E,KAAK,UAAU,GAAG,MAAM,IAAI,CAAC;AA0B7B,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,UAAU,GAAG,SAAS,CAgGhE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EACL,SAAS,EACT,eAAe,EACf,eAAe,GAChB,MAAM,oBAAoB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EACL,SAAS,EACT,eAAe,EACf,eAAe,GAChB,MAAM,oBAAoB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.web.d.ts","sourceRoot":"","sources":["../../../src/index.web.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EACL,SAAS,EACT,eAAe,EACf,eAAe,GAChB,MAAM,oBAAoB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.web.d.ts","sourceRoot":"","sources":["../../../src/index.web.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EACL,SAAS,EACT,eAAe,EACf,eAAe,GAChB,MAAM,oBAAoB,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { Auth, AuthProvider, LoginOptions } from "./Auth.nitro";
|
|
2
|
+
type StrictLoginOptions<AllowedKeys extends keyof LoginOptions> = Pick<LoginOptions, AllowedKeys> & Partial<Record<Exclude<keyof LoginOptions, AllowedKeys>, never>>;
|
|
3
|
+
type GoogleCommonKeys = "scopes" | "loginHint" | "nonce" | "forceAccountPicker" | "hostedDomain";
|
|
4
|
+
export type GoogleIOSLoginOptions = StrictLoginOptions<GoogleCommonKeys | "useSheet" | "openIDRealm">;
|
|
5
|
+
export type GoogleAndroidLoginOptions = StrictLoginOptions<GoogleCommonKeys | "useOneTap" | "filterByAuthorizedAccounts" | "useLegacyGoogleSignIn" | "forceCodeForRefreshToken" | "requestVerifiedPhoneNumber">;
|
|
6
|
+
export type GoogleWebLoginOptions = StrictLoginOptions<GoogleCommonKeys | "openIDRealm">;
|
|
7
|
+
export type GoogleLoginOptions = GoogleIOSLoginOptions | GoogleAndroidLoginOptions | GoogleWebLoginOptions;
|
|
8
|
+
export type AppleIOSLoginOptions = StrictLoginOptions<"scopes" | "nonce">;
|
|
9
|
+
export type AppleWebLoginOptions = AppleIOSLoginOptions;
|
|
10
|
+
export type AppleLoginOptions = AppleIOSLoginOptions | AppleWebLoginOptions;
|
|
11
|
+
export type MicrosoftLoginOptions = StrictLoginOptions<"scopes" | "loginHint" | "tenant" | "prompt">;
|
|
12
|
+
export type LoginOptionsByProvider = {
|
|
13
|
+
google: GoogleLoginOptions;
|
|
14
|
+
apple: AppleLoginOptions;
|
|
15
|
+
microsoft: MicrosoftLoginOptions;
|
|
16
|
+
};
|
|
17
|
+
export type ProviderLoginOptions<Provider extends AuthProvider> = LoginOptionsByProvider[Provider];
|
|
18
|
+
export type AuthLogin = <Provider extends AuthProvider>(provider: Provider, options?: ProviderLoginOptions<Provider>) => Promise<void>;
|
|
19
|
+
export type TypedAuth = Omit<Auth, "login"> & {
|
|
20
|
+
login: AuthLogin;
|
|
21
|
+
};
|
|
22
|
+
export {};
|
|
23
|
+
//# sourceMappingURL=provider-options.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-options.d.ts","sourceRoot":"","sources":["../../../src/provider-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAErE,KAAK,kBAAkB,CAAC,WAAW,SAAS,MAAM,YAAY,IAAI,IAAI,CACpE,YAAY,EACZ,WAAW,CACZ,GACC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,YAAY,EAAE,WAAW,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;AAEnE,KAAK,gBAAgB,GACjB,QAAQ,GACR,WAAW,GACX,OAAO,GACP,oBAAoB,GACpB,cAAc,CAAC;AAEnB,MAAM,MAAM,qBAAqB,GAAG,kBAAkB,CACpD,gBAAgB,GAAG,UAAU,GAAG,aAAa,CAC9C,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG,kBAAkB,CACtD,gBAAgB,GAChB,WAAW,GACX,4BAA4B,GAC5B,uBAAuB,GACvB,0BAA0B,GAC1B,4BAA4B,CAC/B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,kBAAkB,CACpD,gBAAgB,GAAG,aAAa,CACjC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAC1B,qBAAqB,GACrB,yBAAyB,GACzB,qBAAqB,CAAC;AAE1B,MAAM,MAAM,oBAAoB,GAAG,kBAAkB,CAAC,QAAQ,GAAG,OAAO,CAAC,CAAC;AAC1E,MAAM,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AACxD,MAAM,MAAM,iBAAiB,GAAG,oBAAoB,GAAG,oBAAoB,CAAC;AAE5E,MAAM,MAAM,qBAAqB,GAAG,kBAAkB,CACpD,QAAQ,GAAG,WAAW,GAAG,QAAQ,GAAG,QAAQ,CAC7C,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,KAAK,EAAE,iBAAiB,CAAC;IACzB,SAAS,EAAE,qBAAqB,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,QAAQ,SAAS,YAAY,IAC5D,sBAAsB,CAAC,QAAQ,CAAC,CAAC;AAEnC,MAAM,MAAM,SAAS,GAAG,CAAC,QAAQ,SAAS,YAAY,EACpD,QAAQ,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,oBAAoB,CAAC,QAAQ,CAAC,KACrC,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG;IAC5C,KAAK,EAAE,SAAS,CAAC;CAClB,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare const AuthService:
|
|
1
|
+
import type { TypedAuth } from "./provider-options";
|
|
2
|
+
export declare const AuthService: TypedAuth;
|
|
3
3
|
//# sourceMappingURL=service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/service.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AASpD,eAAO,MAAM,WAAW,EAAE,SAA2C,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export declare const AuthService:
|
|
1
|
+
import type { TypedAuth } from "./provider-options";
|
|
2
|
+
export declare const AuthService: TypedAuth;
|
|
3
3
|
//# sourceMappingURL=service.web.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.web.d.ts","sourceRoot":"","sources":["../../../src/service.web.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"service.web.d.ts","sourceRoot":"","sources":["../../../src/service.web.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,eAAO,MAAM,WAAW,EAAE,SAA+C,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { AuthUser,
|
|
1
|
+
import type { AuthUser, AuthTokens } from "./Auth.nitro";
|
|
2
|
+
import type { AuthLogin } from "./provider-options";
|
|
2
3
|
import { AuthError } from "./utils/auth-error";
|
|
3
4
|
type AuthState = {
|
|
4
5
|
user: AuthUser | undefined;
|
|
@@ -8,10 +9,11 @@ type AuthState = {
|
|
|
8
9
|
};
|
|
9
10
|
export type UseAuthReturn = AuthState & {
|
|
10
11
|
hasPlayServices: boolean;
|
|
11
|
-
login:
|
|
12
|
+
login: AuthLogin;
|
|
12
13
|
logout: () => void;
|
|
13
14
|
requestScopes: (scopes: string[]) => Promise<void>;
|
|
14
15
|
revokeScopes: (scopes: string[]) => Promise<void>;
|
|
16
|
+
revokeAccess: () => Promise<void>;
|
|
15
17
|
getAccessToken: () => Promise<string | undefined>;
|
|
16
18
|
refreshToken: () => Promise<AuthTokens>;
|
|
17
19
|
silentRestore: () => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-auth.d.ts","sourceRoot":"","sources":["../../../src/use-auth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"use-auth.d.ts","sourceRoot":"","sources":["../../../src/use-auth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAgB,UAAU,EAAE,MAAM,cAAc,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAwB,MAAM,oBAAoB,CAAC;AAE1E,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAQ/C,KAAK,SAAS,GAAG;IACf,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC3B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,SAAS,GAAG,SAAS,CAAC;CAC9B,CAAC;AAwBF,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG;IACtC,eAAe,EAAE,OAAO,CAAC;IACzB,KAAK,EAAE,SAAS,CAAC;IACjB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAClD,YAAY,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;IACxC,aAAa,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC,CAAC;AAEF,wBAAgB,OAAO,IAAI,aAAa,CAgMvC"}
|
|
@@ -51,13 +51,17 @@ namespace margelo::nitro::NitroAuth {
|
|
|
51
51
|
std::optional<std::string> accessToken SWIFT_PRIVATE;
|
|
52
52
|
std::optional<std::string> refreshToken SWIFT_PRIVATE;
|
|
53
53
|
std::optional<std::string> serverAuthCode SWIFT_PRIVATE;
|
|
54
|
+
std::optional<std::string> authorizationCode SWIFT_PRIVATE;
|
|
55
|
+
std::optional<std::string> userId SWIFT_PRIVATE;
|
|
56
|
+
std::optional<std::string> phoneNumber SWIFT_PRIVATE;
|
|
57
|
+
std::optional<std::string> hostedDomain SWIFT_PRIVATE;
|
|
54
58
|
std::optional<std::vector<std::string>> scopes SWIFT_PRIVATE;
|
|
55
59
|
std::optional<double> expirationTime SWIFT_PRIVATE;
|
|
56
60
|
std::optional<std::string> underlyingError SWIFT_PRIVATE;
|
|
57
61
|
|
|
58
62
|
public:
|
|
59
63
|
AuthUser() = default;
|
|
60
|
-
explicit AuthUser(AuthProvider provider, std::optional<std::string> email, std::optional<std::string> name, std::optional<std::string> photo, std::optional<std::string> idToken, std::optional<std::string> accessToken, std::optional<std::string> refreshToken, std::optional<std::string> serverAuthCode, std::optional<std::vector<std::string>> scopes, std::optional<double> expirationTime, std::optional<std::string> underlyingError): provider(provider), email(email), name(name), photo(photo), idToken(idToken), accessToken(accessToken), refreshToken(refreshToken), serverAuthCode(serverAuthCode), scopes(scopes), expirationTime(expirationTime), underlyingError(underlyingError) {}
|
|
64
|
+
explicit AuthUser(AuthProvider provider, std::optional<std::string> email, std::optional<std::string> name, std::optional<std::string> photo, std::optional<std::string> idToken, std::optional<std::string> accessToken, std::optional<std::string> refreshToken, std::optional<std::string> serverAuthCode, std::optional<std::string> authorizationCode, std::optional<std::string> userId, std::optional<std::string> phoneNumber, std::optional<std::string> hostedDomain, std::optional<std::vector<std::string>> scopes, std::optional<double> expirationTime, std::optional<std::string> underlyingError): provider(provider), email(email), name(name), photo(photo), idToken(idToken), accessToken(accessToken), refreshToken(refreshToken), serverAuthCode(serverAuthCode), authorizationCode(authorizationCode), userId(userId), phoneNumber(phoneNumber), hostedDomain(hostedDomain), scopes(scopes), expirationTime(expirationTime), underlyingError(underlyingError) {}
|
|
61
65
|
|
|
62
66
|
public:
|
|
63
67
|
friend bool operator==(const AuthUser& lhs, const AuthUser& rhs) = default;
|
|
@@ -81,6 +85,10 @@ namespace margelo::nitro {
|
|
|
81
85
|
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "accessToken"))),
|
|
82
86
|
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "refreshToken"))),
|
|
83
87
|
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "serverAuthCode"))),
|
|
88
|
+
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "authorizationCode"))),
|
|
89
|
+
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "userId"))),
|
|
90
|
+
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "phoneNumber"))),
|
|
91
|
+
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "hostedDomain"))),
|
|
84
92
|
JSIConverter<std::optional<std::vector<std::string>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "scopes"))),
|
|
85
93
|
JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "expirationTime"))),
|
|
86
94
|
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "underlyingError")))
|
|
@@ -96,6 +104,10 @@ namespace margelo::nitro {
|
|
|
96
104
|
obj.setProperty(runtime, PropNameIDCache::get(runtime, "accessToken"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.accessToken));
|
|
97
105
|
obj.setProperty(runtime, PropNameIDCache::get(runtime, "refreshToken"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.refreshToken));
|
|
98
106
|
obj.setProperty(runtime, PropNameIDCache::get(runtime, "serverAuthCode"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.serverAuthCode));
|
|
107
|
+
obj.setProperty(runtime, PropNameIDCache::get(runtime, "authorizationCode"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.authorizationCode));
|
|
108
|
+
obj.setProperty(runtime, PropNameIDCache::get(runtime, "userId"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.userId));
|
|
109
|
+
obj.setProperty(runtime, PropNameIDCache::get(runtime, "phoneNumber"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.phoneNumber));
|
|
110
|
+
obj.setProperty(runtime, PropNameIDCache::get(runtime, "hostedDomain"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.hostedDomain));
|
|
99
111
|
obj.setProperty(runtime, PropNameIDCache::get(runtime, "scopes"), JSIConverter<std::optional<std::vector<std::string>>>::toJSI(runtime, arg.scopes));
|
|
100
112
|
obj.setProperty(runtime, PropNameIDCache::get(runtime, "expirationTime"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.expirationTime));
|
|
101
113
|
obj.setProperty(runtime, PropNameIDCache::get(runtime, "underlyingError"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.underlyingError));
|
|
@@ -117,6 +129,10 @@ namespace margelo::nitro {
|
|
|
117
129
|
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "accessToken")))) return false;
|
|
118
130
|
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "refreshToken")))) return false;
|
|
119
131
|
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "serverAuthCode")))) return false;
|
|
132
|
+
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "authorizationCode")))) return false;
|
|
133
|
+
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "userId")))) return false;
|
|
134
|
+
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "phoneNumber")))) return false;
|
|
135
|
+
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "hostedDomain")))) return false;
|
|
120
136
|
if (!JSIConverter<std::optional<std::vector<std::string>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "scopes")))) return false;
|
|
121
137
|
if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "expirationTime")))) return false;
|
|
122
138
|
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "underlyingError")))) return false;
|
|
@@ -20,6 +20,7 @@ namespace margelo::nitro::NitroAuth {
|
|
|
20
20
|
prototype.registerHybridMethod("login", &HybridAuthSpec::login);
|
|
21
21
|
prototype.registerHybridMethod("requestScopes", &HybridAuthSpec::requestScopes);
|
|
22
22
|
prototype.registerHybridMethod("revokeScopes", &HybridAuthSpec::revokeScopes);
|
|
23
|
+
prototype.registerHybridMethod("revokeAccess", &HybridAuthSpec::revokeAccess);
|
|
23
24
|
prototype.registerHybridMethod("getAccessToken", &HybridAuthSpec::getAccessToken);
|
|
24
25
|
prototype.registerHybridMethod("refreshToken", &HybridAuthSpec::refreshToken);
|
|
25
26
|
prototype.registerHybridMethod("logout", &HybridAuthSpec::logout);
|
|
@@ -68,6 +68,7 @@ namespace margelo::nitro::NitroAuth {
|
|
|
68
68
|
virtual std::shared_ptr<Promise<void>> login(AuthProvider provider, const std::optional<LoginOptions>& options) = 0;
|
|
69
69
|
virtual std::shared_ptr<Promise<void>> requestScopes(const std::vector<std::string>& scopes) = 0;
|
|
70
70
|
virtual std::shared_ptr<Promise<void>> revokeScopes(const std::vector<std::string>& scopes) = 0;
|
|
71
|
+
virtual std::shared_ptr<Promise<void>> revokeAccess() = 0;
|
|
71
72
|
virtual std::shared_ptr<Promise<std::optional<std::string>>> getAccessToken() = 0;
|
|
72
73
|
virtual std::shared_ptr<Promise<AuthTokens>> refreshToken() = 0;
|
|
73
74
|
virtual void logout() = 0;
|
|
@@ -45,16 +45,22 @@ namespace margelo::nitro::NitroAuth {
|
|
|
45
45
|
public:
|
|
46
46
|
std::optional<std::vector<std::string>> scopes SWIFT_PRIVATE;
|
|
47
47
|
std::optional<std::string> loginHint SWIFT_PRIVATE;
|
|
48
|
+
std::optional<std::string> nonce SWIFT_PRIVATE;
|
|
48
49
|
std::optional<bool> useOneTap SWIFT_PRIVATE;
|
|
49
50
|
std::optional<bool> useSheet SWIFT_PRIVATE;
|
|
50
51
|
std::optional<bool> forceAccountPicker SWIFT_PRIVATE;
|
|
52
|
+
std::optional<bool> filterByAuthorizedAccounts SWIFT_PRIVATE;
|
|
51
53
|
std::optional<bool> useLegacyGoogleSignIn SWIFT_PRIVATE;
|
|
54
|
+
std::optional<bool> forceCodeForRefreshToken SWIFT_PRIVATE;
|
|
55
|
+
std::optional<std::string> hostedDomain SWIFT_PRIVATE;
|
|
56
|
+
std::optional<std::string> openIDRealm SWIFT_PRIVATE;
|
|
57
|
+
std::optional<bool> requestVerifiedPhoneNumber SWIFT_PRIVATE;
|
|
52
58
|
std::optional<std::string> tenant SWIFT_PRIVATE;
|
|
53
59
|
std::optional<MicrosoftPrompt> prompt SWIFT_PRIVATE;
|
|
54
60
|
|
|
55
61
|
public:
|
|
56
62
|
LoginOptions() = default;
|
|
57
|
-
explicit LoginOptions(std::optional<std::vector<std::string>> scopes, std::optional<std::string> loginHint, std::optional<bool> useOneTap, std::optional<bool> useSheet, std::optional<bool> forceAccountPicker, std::optional<bool> useLegacyGoogleSignIn, std::optional<std::string> tenant, std::optional<MicrosoftPrompt> prompt): scopes(scopes), loginHint(loginHint), useOneTap(useOneTap), useSheet(useSheet), forceAccountPicker(forceAccountPicker), useLegacyGoogleSignIn(useLegacyGoogleSignIn), tenant(tenant), prompt(prompt) {}
|
|
63
|
+
explicit LoginOptions(std::optional<std::vector<std::string>> scopes, std::optional<std::string> loginHint, std::optional<std::string> nonce, std::optional<bool> useOneTap, std::optional<bool> useSheet, std::optional<bool> forceAccountPicker, std::optional<bool> filterByAuthorizedAccounts, std::optional<bool> useLegacyGoogleSignIn, std::optional<bool> forceCodeForRefreshToken, std::optional<std::string> hostedDomain, std::optional<std::string> openIDRealm, std::optional<bool> requestVerifiedPhoneNumber, std::optional<std::string> tenant, std::optional<MicrosoftPrompt> prompt): scopes(scopes), loginHint(loginHint), nonce(nonce), useOneTap(useOneTap), useSheet(useSheet), forceAccountPicker(forceAccountPicker), filterByAuthorizedAccounts(filterByAuthorizedAccounts), useLegacyGoogleSignIn(useLegacyGoogleSignIn), forceCodeForRefreshToken(forceCodeForRefreshToken), hostedDomain(hostedDomain), openIDRealm(openIDRealm), requestVerifiedPhoneNumber(requestVerifiedPhoneNumber), tenant(tenant), prompt(prompt) {}
|
|
58
64
|
|
|
59
65
|
public:
|
|
60
66
|
friend bool operator==(const LoginOptions& lhs, const LoginOptions& rhs) = default;
|
|
@@ -72,10 +78,16 @@ namespace margelo::nitro {
|
|
|
72
78
|
return margelo::nitro::NitroAuth::LoginOptions(
|
|
73
79
|
JSIConverter<std::optional<std::vector<std::string>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "scopes"))),
|
|
74
80
|
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "loginHint"))),
|
|
81
|
+
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "nonce"))),
|
|
75
82
|
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "useOneTap"))),
|
|
76
83
|
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "useSheet"))),
|
|
77
84
|
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "forceAccountPicker"))),
|
|
85
|
+
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "filterByAuthorizedAccounts"))),
|
|
78
86
|
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "useLegacyGoogleSignIn"))),
|
|
87
|
+
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "forceCodeForRefreshToken"))),
|
|
88
|
+
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "hostedDomain"))),
|
|
89
|
+
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "openIDRealm"))),
|
|
90
|
+
JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "requestVerifiedPhoneNumber"))),
|
|
79
91
|
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "tenant"))),
|
|
80
92
|
JSIConverter<std::optional<margelo::nitro::NitroAuth::MicrosoftPrompt>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "prompt")))
|
|
81
93
|
);
|
|
@@ -84,10 +96,16 @@ namespace margelo::nitro {
|
|
|
84
96
|
jsi::Object obj(runtime);
|
|
85
97
|
obj.setProperty(runtime, PropNameIDCache::get(runtime, "scopes"), JSIConverter<std::optional<std::vector<std::string>>>::toJSI(runtime, arg.scopes));
|
|
86
98
|
obj.setProperty(runtime, PropNameIDCache::get(runtime, "loginHint"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.loginHint));
|
|
99
|
+
obj.setProperty(runtime, PropNameIDCache::get(runtime, "nonce"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.nonce));
|
|
87
100
|
obj.setProperty(runtime, PropNameIDCache::get(runtime, "useOneTap"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.useOneTap));
|
|
88
101
|
obj.setProperty(runtime, PropNameIDCache::get(runtime, "useSheet"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.useSheet));
|
|
89
102
|
obj.setProperty(runtime, PropNameIDCache::get(runtime, "forceAccountPicker"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.forceAccountPicker));
|
|
103
|
+
obj.setProperty(runtime, PropNameIDCache::get(runtime, "filterByAuthorizedAccounts"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.filterByAuthorizedAccounts));
|
|
90
104
|
obj.setProperty(runtime, PropNameIDCache::get(runtime, "useLegacyGoogleSignIn"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.useLegacyGoogleSignIn));
|
|
105
|
+
obj.setProperty(runtime, PropNameIDCache::get(runtime, "forceCodeForRefreshToken"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.forceCodeForRefreshToken));
|
|
106
|
+
obj.setProperty(runtime, PropNameIDCache::get(runtime, "hostedDomain"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.hostedDomain));
|
|
107
|
+
obj.setProperty(runtime, PropNameIDCache::get(runtime, "openIDRealm"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.openIDRealm));
|
|
108
|
+
obj.setProperty(runtime, PropNameIDCache::get(runtime, "requestVerifiedPhoneNumber"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.requestVerifiedPhoneNumber));
|
|
91
109
|
obj.setProperty(runtime, PropNameIDCache::get(runtime, "tenant"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.tenant));
|
|
92
110
|
obj.setProperty(runtime, PropNameIDCache::get(runtime, "prompt"), JSIConverter<std::optional<margelo::nitro::NitroAuth::MicrosoftPrompt>>::toJSI(runtime, arg.prompt));
|
|
93
111
|
return obj;
|
|
@@ -102,10 +120,16 @@ namespace margelo::nitro {
|
|
|
102
120
|
}
|
|
103
121
|
if (!JSIConverter<std::optional<std::vector<std::string>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "scopes")))) return false;
|
|
104
122
|
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "loginHint")))) return false;
|
|
123
|
+
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "nonce")))) return false;
|
|
105
124
|
if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "useOneTap")))) return false;
|
|
106
125
|
if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "useSheet")))) return false;
|
|
107
126
|
if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "forceAccountPicker")))) return false;
|
|
127
|
+
if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "filterByAuthorizedAccounts")))) return false;
|
|
108
128
|
if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "useLegacyGoogleSignIn")))) return false;
|
|
129
|
+
if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "forceCodeForRefreshToken")))) return false;
|
|
130
|
+
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "hostedDomain")))) return false;
|
|
131
|
+
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "openIDRealm")))) return false;
|
|
132
|
+
if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "requestVerifiedPhoneNumber")))) return false;
|
|
109
133
|
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "tenant")))) return false;
|
|
110
134
|
if (!JSIConverter<std::optional<margelo::nitro::NitroAuth::MicrosoftPrompt>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "prompt")))) return false;
|
|
111
135
|
return true;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-native-nitro-auth",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.6.1",
|
|
4
4
|
"description": "High-performance authentication library for React Native with Google Sign-In, Apple Sign-In, and Microsoft Sign-In support, powered by Nitro Modules (JSI)",
|
|
5
5
|
"main": "lib/commonjs/index.js",
|
|
6
6
|
"module": "lib/module/index.js",
|
|
@@ -84,16 +84,16 @@
|
|
|
84
84
|
"access": "public"
|
|
85
85
|
},
|
|
86
86
|
"devDependencies": {
|
|
87
|
-
"@expo/config-plugins": "^
|
|
88
|
-
"@react-native/babel-preset": "^0.
|
|
87
|
+
"@expo/config-plugins": "^56.0.7",
|
|
88
|
+
"@react-native/babel-preset": "^0.85.3",
|
|
89
89
|
"@testing-library/react": "^16.3.2",
|
|
90
90
|
"@types/node": "^22.19.17",
|
|
91
91
|
"jest-environment-jsdom": "^29.7.0",
|
|
92
|
-
"react": "19.2.
|
|
93
|
-
"react-native": "0.
|
|
94
|
-
"react-native-nitro-modules": "^0.35.
|
|
92
|
+
"react": "19.2.3",
|
|
93
|
+
"react-native": "0.85.3",
|
|
94
|
+
"react-native-nitro-modules": "^0.35.7",
|
|
95
95
|
"react-native-web": "^0.21.2",
|
|
96
|
-
"typescript": "^
|
|
96
|
+
"typescript": "^6.0.3"
|
|
97
97
|
},
|
|
98
98
|
"peerDependencies": {
|
|
99
99
|
"react": "*",
|
|
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
|
|
|
10
10
|
s.license = package["license"]
|
|
11
11
|
s.authors = package["author"]
|
|
12
12
|
|
|
13
|
-
s.platforms = { :ios => "
|
|
13
|
+
s.platforms = { :ios => "16.4" }
|
|
14
14
|
s.source = { :git => "https://github.com/JoaoPauloCMarra/react-native-nitro-auth.git", :tag => "#{s.version}" }
|
|
15
15
|
|
|
16
16
|
s.swift_version = "5.9"
|
package/src/Auth.nitro.ts
CHANGED
|
@@ -24,13 +24,19 @@ export type MicrosoftPrompt = "login" | "consent" | "select_account" | "none";
|
|
|
24
24
|
export interface LoginOptions {
|
|
25
25
|
scopes?: string[];
|
|
26
26
|
loginHint?: string;
|
|
27
|
+
nonce?: string;
|
|
27
28
|
useOneTap?: boolean;
|
|
28
29
|
/** (iOS only) Use native sign-in sheet */
|
|
29
30
|
useSheet?: boolean;
|
|
30
31
|
/** Force account picker to show, ignoring any cached session or loginHint. On Android Google, this uses the legacy chooser path. */
|
|
31
32
|
forceAccountPicker?: boolean;
|
|
33
|
+
filterByAuthorizedAccounts?: boolean;
|
|
32
34
|
/** (Android only) Use legacy Google Sign-In flow (e.g. for serverAuthCode) */
|
|
33
35
|
useLegacyGoogleSignIn?: boolean;
|
|
36
|
+
forceCodeForRefreshToken?: boolean;
|
|
37
|
+
hostedDomain?: string;
|
|
38
|
+
openIDRealm?: string;
|
|
39
|
+
requestVerifiedPhoneNumber?: boolean;
|
|
34
40
|
/** (Microsoft only) Azure AD tenant - "common", "organizations", "consumers", or tenant ID */
|
|
35
41
|
tenant?: string;
|
|
36
42
|
/** (Microsoft only) Prompt behavior for login */
|
|
@@ -53,6 +59,10 @@ export interface AuthUser {
|
|
|
53
59
|
accessToken?: string;
|
|
54
60
|
refreshToken?: string;
|
|
55
61
|
serverAuthCode?: string;
|
|
62
|
+
authorizationCode?: string;
|
|
63
|
+
userId?: string;
|
|
64
|
+
phoneNumber?: string;
|
|
65
|
+
hostedDomain?: string;
|
|
56
66
|
scopes?: string[];
|
|
57
67
|
expirationTime?: number;
|
|
58
68
|
/** Raw native error message */
|
|
@@ -67,6 +77,7 @@ export interface Auth extends HybridObject<{ ios: "c++"; android: "c++" }> {
|
|
|
67
77
|
login(provider: AuthProvider, options?: LoginOptions): Promise<void>;
|
|
68
78
|
requestScopes(scopes: string[]): Promise<void>;
|
|
69
79
|
revokeScopes(scopes: string[]): Promise<void>;
|
|
80
|
+
revokeAccess(): Promise<void>;
|
|
70
81
|
getAccessToken(): Promise<string | undefined>;
|
|
71
82
|
refreshToken(): Promise<AuthTokens>;
|
|
72
83
|
|