feat: update @logto/client (#31)

* feat: update @logto/client update @logto/client * fix: fix lint fix lint
logto-io · Oct 8, 2024 · 6776880 · 6776880
1 parent 7687c31
commit 6776880
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 46 deletions.
diff --git a/packages/rn-sample/metro.config.js b/packages/rn-sample/metro.config.js
@@ -21,6 +21,4 @@ config.resolver.nodeModulesPaths = [
   path.resolve(monorepoRoot, 'node_modules'),
 ];
 
-config.resolver.unstable_enablePackageExports = true;
-
 module.exports = config;
diff --git a/packages/rn/package.json b/packages/rn/package.json
@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.3.0",
+  "version": "0.4.0",
   "type": "module",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -49,8 +49,8 @@
   },
   "prettier": "@silverhand/eslint-config/.prettierrc",
   "dependencies": {
-    "@logto/client": "2.4.0",
-    "@logto/js": "4.0.0",
+    "@logto/client": "2.8.1",
+    "@logto/js": "4.2.0",
     "crypto-es": "^2.1.0",
     "js-base64": "^3.7.7"
   },

diff --git a/packages/rn/src/client.ts b/packages/rn/src/client.ts
@@ -3,9 +3,10 @@ import {
   Prompt,
   StandardLogtoClient,
   createRequester,
+  type SignInOptions,
   type InteractionMode,
   type LogtoConfig,
-} from '@logto/client/shim';
+} from '@logto/client';
 import { decodeIdToken } from '@logto/js';
 import * as WebBrowser from 'expo-web-browser';
 import { Platform } from 'react-native';
@@ -66,7 +67,6 @@ export class LogtoClient extends StandardLogtoClient {
             case 'sign-out': {
               break;
             }
-            // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- just in case
             default: {
               throw new LogtoNativeClientError('navigation_purpose_not_supported');
             }
@@ -103,6 +103,19 @@ export class LogtoClient extends StandardLogtoClient {
     this.storage = storage;
   }
 
+  /**
+   * Start the sign-in flow with the specified redirect URI. The URI must be registered in the
+   * Logto Console. It uses `WebBrowser.openAuthSessionAsync` to open the browser and start the
+   * sign-in flow.
+   *
+   * The user will be redirected to that URI after the sign-in flow is completed, and the client
+   * will handle the callback to exchange the authorization code for the tokens.
+   *
+   * @param options The options for the sign-in flow.
+   *
+   * @see {@link SignInOptions}
+   */
+  override async signIn(options: SignInOptions): Promise<void>;
   /**
    * Start the sign-in flow with the specified redirect URI. The URI must be registered in the
    * Logto Console. It uses `WebBrowser.openAuthSessionAsync` to open the browser and start the
@@ -117,8 +130,14 @@ export class LogtoClient extends StandardLogtoClient {
    *
    * @see {@link InteractionMode}
    */
-  override async signIn(redirectUri: string, interactionMode?: InteractionMode): Promise<void> {
-    await super.signIn(redirectUri, interactionMode);
+  override async signIn(redirectUri: string, interactionMode?: InteractionMode): Promise<void>;
+  override async signIn(
+    options: SignInOptions | string,
+    interactionMode?: InteractionMode
+  ): Promise<void> {
+    await (typeof options === 'string'
+      ? super.signIn(options, interactionMode)
+      : super.signIn(options));
 
     if (this.authSessionResult?.type !== 'success') {
       throw new LogtoNativeClientError('auth_session_failed');

diff --git a/packages/rn/src/hooks.ts b/packages/rn/src/hooks.ts
@@ -1,3 +1,4 @@
+import { type InteractionMode, type SignInOptions } from '@logto/client';
 import { maybeCompleteAuthSession } from 'expo-web-browser';
 import { useCallback, useContext, useEffect, useMemo } from 'react';
 
@@ -19,9 +20,15 @@ export const useLogto = () => {
     maybeCompleteAuthSession();
   }, []);
 
-  const signIn = useCallback(
-    async (redirectUri: string) => {
-      await client.signIn(redirectUri);
+  const signIn: {
+    (options: string, interactionMode?: InteractionMode): Promise<void>;
+    (options: SignInOptions): Promise<void>;
+  } = useCallback(
+    async (options: SignInOptions | string, interactionMode?: InteractionMode) => {
+      await (typeof options === 'string'
+        ? client.signIn(options, interactionMode)
+        : client.signIn(options));
+
       setIsAuthenticated(true);
     },
     [client, setIsAuthenticated]

diff --git a/packages/rn/src/index.ts b/packages/rn/src/index.ts
@@ -6,7 +6,7 @@ export type {
   UserInfoResponse,
   InteractionMode,
   ClientAdapter,
-} from '@logto/client/shim';
+} from '@logto/client';
 
 export {
   createRequester,
@@ -22,7 +22,7 @@ export {
   buildOrganizationUrn,
   getOrganizationIdFromUrn,
   PersistKey,
-} from '@logto/client/shim';
+} from '@logto/client';
 
 export * from './client';
 export * from './context';

diff --git a/packages/rn/src/storage.ts b/packages/rn/src/storage.ts
@@ -1,4 +1,4 @@
-import { type Storage, type StorageKey } from '@logto/client/shim';
+import { type Storage, type StorageKey } from '@logto/client';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import type { Nullable } from '@silverhand/essentials';
 import CryptoES from 'crypto-es';