Merge remote-tracking branch 'upstream/release/v3.2.3' into release/v…

…3.2.3
AmityCo · Mar 1, 2024 · f795ae7 · f795ae7
2 parents e62a5f5 + 85d0194
commit f795ae7
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 15 deletions.
diff --git a/.github/workflows/production.yaml b/.github/workflows/production.yaml
@@ -6,6 +6,9 @@ on:
       release_as:
         description: 'release as'
         required: true
+      custom_version:
+        description: 'custom version'
+        required: false
 
 jobs:
   publish:
@@ -53,6 +56,10 @@ jobs:
         run: pnpm standard-version --yes --release-as major
         if: github.event.inputs.release_as == 'major'
 
+      - name: increase version (custom)
+        run: pnpm standard-version --yes --release-as ${{ github.event.inputs.custom_version }}
+        if: github.event.inputs.release_as == 'custom'
+
       - name: build
         run: pnpm run build
 

diff --git a/src/core/providers/UiKitProvider/index.tsx b/src/core/providers/UiKitProvider/index.tsx
@@ -26,7 +26,6 @@ interface UiKitProviderProps {
     http?: string;
     mqtt?: string;
   };
-  authToken?: string;
   userId: string;
   displayName: string;
   customComponents?: CustomComponentType;
@@ -47,13 +46,13 @@ interface UiKitProviderProps {
   onConnectionStatusChange?: (state: Amity.SessionStates) => void;
   onConnected?: () => void;
   onDisconnected?: () => void;
+  getAuthToken?: () => Promise<string>;
 }
 
 const UiKitProvider = ({
   apiKey,
   apiRegion,
   apiEndpoint,
-  authToken,
   userId,
   displayName,
   customComponents = {},
@@ -64,6 +63,7 @@ const UiKitProvider = ({
   actionHandlers,
   onConnectionStatusChange,
   onDisconnected,
+  getAuthToken,
 }: UiKitProviderProps) => {
   const [isConnected, setIsConnected] = useState(false);
   const [client, setClient] = useState<Amity.Client | null>(null);
@@ -95,20 +95,25 @@ const UiKitProvider = ({
     const currentIsConnected = ASCClient.isConnected();
 
     if (!currentIsConnected) {
-      await ASCClient.login(
-        { userId, displayName, authToken },
-        {
-          sessionWillRenewAccessToken(renewal) {
-            // secure mode
-            if (authToken) {
-              renewal.renewWithAuthToken(authToken);
-              return;
-            }
-
-            renewal.renew();
-          },
+      let params: Amity.ConnectClientParams = { userId, displayName };
+
+      if (getAuthToken) {
+        const authToken = await getAuthToken();
+        params = { ...params, authToken };
+      }
+
+      await ASCClient.login(params, {
+        async sessionWillRenewAccessToken(renewal: Amity.AccessTokenRenewal) {
+          // secure mode
+          if (getAuthToken) {
+            const authToken = await getAuthToken();
+            renewal.renewWithAuthToken(authToken);
+            return;
+          }
+
+          renewal.renew();
         },
-      );
+      });
     }
 
     setIsConnected(true);