@amityco/ts-sdk 7.9.3-26ea573.0 → 7.9.3-8cb8198.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "7.9.3-26ea573.0",
+  "version": "7.9.3-8cb8198.0",
   "license": "CC-BY-ND-4.0",
   "author": "amity.co <developers@amity.co> (https://amity.co)",
   "description": "Amity Social Cloud Typescript SDK",

package/src/@types/core/errors.ts

@@ -23,8 +23,6 @@ declare global {
       BAN_WORD_FOUND = 400308,
       LINK_NOT_ALLOWED = 400309,
       BUSINESS_ERROR = 500000,
-      VISITOR_PERMISSION_DENIED = 403999,
-      BOT_PERMISSION_DENIED = 403998,
     }
 
     const enum ClientError {

package/src/@types/domains/client.ts

@@ -94,20 +94,10 @@ declare global {
       expiresAt: string;
     };
 
-    type SessionResponse = Tokens & {
-      users: Amity.RawUser[];
-      userType: Amity.UserType;
-    };
-
     type AccessTokenRenewal = {
       renew: () => void;
       renewWithAuthToken: (authToken: string) => void;
       unableToRetrieveAuthToken: () => void;
-      renewWithAuthSignature: ({
-        authSignature,
-        authSignatureExpiresAt,
-      }: Amity.ConnectClientAsVisitorParams) => void;
-      unableToRetrieveAuthSignature: () => void;
     };
 
     interface SessionHandler {
@@ -160,11 +150,6 @@ declare global {
       deviceId?: Amity.Device['deviceId'];
     };
 
-    type ConnectClientAsVisitorParams = {
-      authSignature?: string;
-      authSignatureExpiresAt?: string;
-    };
-
     type ConnectClientConfig = {
       disableRTE: boolean;
     };

package/src/@types/domains/user.ts

@@ -1,11 +1,5 @@
 import { AmityUserSearchMatchType } from '~/userRepository';
 
-export const enum UserTypeEnum {
-  SIGNED_IN = 'signed-in',
-  VISITOR = 'visitor',
-  BOT = 'bot',
-}
-
 export {};
 
 declare global {
@@ -35,8 +29,6 @@ declare global {
       | 'onUnflagged'
       | 'onFlagCleared';
 
-    type UserType = `${UserTypeEnum}`;
-
     type RawUser = {
       _id: string;
       userId: string;

package/src/@types/index.ts

@@ -46,4 +46,3 @@ export * from './domains/pinnedPost';
 export * from './domains/liveReaction';
 export * from './domains/feed';
 export * from './domains/hashtag';
-export * from './domains/user';

package/src/client/api/activeUser.ts

@@ -7,7 +7,6 @@ let activeUser: Amity.ActiveUser | null = null;
 */
 /**
  * for internal use
- * @deprecated please use getCurrentUser api instead.
  */
 export const getActiveUser = () => {
   if (!activeUser) {

package/src/client/api/getToken.ts

@@ -31,7 +31,7 @@ export const getToken = async ({
 
   const deviceInfo = getDeviceInfo();
 
-  const { data } = await client.http.post<Amity.SessionResponse>(
+  const { data } = await client.http.post<Amity.Tokens & { users: Amity.InternalUser[] }>(
     '/api/v5/sessions',
     {
       ...params,

package/src/client/api/index.ts

@@ -25,9 +25,3 @@ export * from './fetchLinkPreview';
 export * from './getSocialSettings';
 
 export * from './getShareableLinkConfiguration';
-
-export * from './loginAsVisitor';
-export * from './loginAsBot';
-
-export * from './getCurrentUser';
-export * from './getCurrentUserType';

package/src/client/api/login.ts

@@ -2,6 +2,7 @@
 import { modifyMqttConnection } from '~/client/utils/modifyMqttConnection';
 /* eslint-disable require-atomic-updates */
 import { getDeviceId } from '~/core/device';
+import { proxyWebsocketEvents } from '~/core/events';
 import { onChannelDeleted } from '~/channelRepository/events/onChannelDeleted';
 import { onChannelMemberBanned } from '~/channelRepository/events/onChannelMemberBanned';
 
@@ -28,8 +29,6 @@ import { removeChannelMarkerCache } from '../utils/removeChannelMarkerCache';
 import { initializeMessagePreviewSetting } from '../utils/messagePreviewEngine';
 import { ASCError } from '~/core/errors';
 import SessionWatcher from '../utils/SessionWatcher';
-import { setCurrentUserType } from './getCurrentUserType';
-import { setCurrentUser } from '../utils/setCurrentUser';
 
 /*
  * declared earlier to accomodate case when logging in with a different user
@@ -92,7 +91,7 @@ export const login = async (
   const defaultDeviceId = await getDeviceId();
 
   try {
-    const { users, userType } = await setClientToken({
+    const { users } = await setClientToken({
       params: {
         ...params,
         displayName: params?.displayName,
@@ -118,7 +117,7 @@ export const login = async (
       return false;
     }
 
-    if (user.isGlobalBan) {
+    if (user.isGlobalBanned) {
       terminateClient(Amity.TokenTerminationReason.GLOBAL_BAN);
       return false;
     }
@@ -133,7 +132,7 @@ export const login = async (
      */
     unsubWatcher = client.accessTokenExpiryWatcher(sessionHandler);
 
-    setCurrentUser({ user, userType });
+    setActiveUser(user);
   } catch (error) {
     /*
      * if getting token failed session state reverts to initial state when app

package/src/client/api/renewal.ts

@@ -1,12 +1,10 @@
 import { getDeviceId } from '~/core/device';
 import { ACCESS_TOKEN_WATCHER_INTERVAL } from '~/utils/constants';
 
+import { getActiveUser } from './activeUser';
 import { setClientToken as refreshToken } from '../utils/setClientToken';
-import { setVisitorClientToken as refreshVisitorToken } from '../utils/setVisitorClientToken';
 import { getActiveClient } from './activeClient';
 import { login } from './login';
-import { loginAsVisitor } from './loginAsVisitor';
-import { getCurrentUser } from './getCurrentUser';
 
 /* begin_public_function
   id: client.renew_access_token
@@ -32,7 +30,7 @@ export const renewal = (): Amity.AccessTokenRenewal => {
    * Per instance of Renewal, only one renewal is allowed
    */
   const renewToken = async (authToken?: Amity.ConnectClientParams['authToken']): Promise<void> => {
-    const { userId, displayName } = getCurrentUser();
+    const { userId, displayName } = getActiveUser();
     const deviceId = await getDeviceId();
 
     const params = { userId, displayName, authToken, deviceId };
@@ -55,30 +53,6 @@ export const renewal = (): Amity.AccessTokenRenewal => {
     if (renewTimeoutId) clearTimeout(renewTimeoutId);
   };
 
-  const renewVisitorToken = async ({
-    authSignature,
-    authSignatureExpiresAt,
-  }: Amity.ConnectClientAsVisitorParams): Promise<void> => {
-    const deviceId = await getDeviceId();
-
-    if (client.sessionState === Amity.SessionStates.TOKEN_EXPIRED && client.sessionHandler) {
-      await loginAsVisitor({ sessionHandler: client.sessionHandler });
-    } else {
-      // about to expire
-
-      await refreshVisitorToken({
-        params: { authSignature, authSignatureExpiresAt, deviceId },
-        options: {
-          setAccessTokenCookie: true,
-        },
-      });
-    }
-
-    tokenRenewed = true;
-
-    if (renewTimeoutId) clearTimeout(renewTimeoutId);
-  };
-
   return {
     renew: () => {
       if (tokenRenewed) {
@@ -101,20 +75,6 @@ export const renewal = (): Amity.AccessTokenRenewal => {
         client.sessionHandler?.sessionWillRenewAccessToken(renewal());
       }, ACCESS_TOKEN_WATCHER_INTERVAL);
     },
-
-    renewWithAuthSignature: (params: Amity.ConnectClientAsVisitorParams) => {
-      if (tokenRenewed) {
-        console.log("'renew' method can be called only once per renewal instance");
-        return;
-      }
-      renewVisitorToken(params);
-    },
-
-    unableToRetrieveAuthSignature: () => {
-      renewTimeoutId = setTimeout(() => {
-        client.sessionHandler?.sessionWillRenewAccessToken(renewal());
-      }, ACCESS_TOKEN_WATCHER_INTERVAL);
-    },
   };
 };
 /* end_public_function */

package/src/client/utils/setClientToken.ts

@@ -19,7 +19,7 @@ export const setClientToken = async (params: Parameters<typeof getToken>[0]) =>
   // begin establishing session
   setSessionState(Amity.SessionStates.ESTABLISHING);
 
-  const { accessToken, users, expiresAt, issuedAt, userType } = await getToken(params);
+  const { accessToken, users, expiresAt, issuedAt } = await getToken(params);
 
   // manually setup the token for http transport
   client.http.defaults.headers.common.Authorization = `Bearer ${accessToken}`;
@@ -42,5 +42,5 @@ export const setClientToken = async (params: Parameters<typeof getToken>[0]) =>
 
   setSessionState(Amity.SessionStates.ESTABLISHED);
 
-  return { accessToken, users, userType };
+  return { accessToken, users };
 };

package/src/core/transports/http.ts

@@ -104,7 +104,6 @@ export const createHttpTransport = (endpoint: string) => {
 
   instance.interceptors.request.use(config => {
     // do not check expiration for token creation url
-
     if (config.url === '/api/v5/sessions') {
       return config;
     }
@@ -124,10 +123,10 @@ export const createHttpTransport = (endpoint: string) => {
       }
 
       if (tokenExpiry) {
-        // if (Date.now() >= Date.parse(tokenExpiry)) {
-        //   controller.abort(RequestCancelation.UserDeleted);
-        //   handleRequestCancelation(RequestCancelation.TokenExpired);
-        // }
+        if (Date.now() >= Date.parse(tokenExpiry)) {
+          controller.abort(RequestCancelation.UserDeleted);
+          handleRequestCancelation(RequestCancelation.TokenExpired);
+        }
       }
     }