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

package/dist/index.cjs.js

@@ -29,13 +29,6 @@ exports.MembershipAcceptanceTypeEnum = void 0;
     MembershipAcceptanceTypeEnum["INVITATION"] = "invitation";
 })(exports.MembershipAcceptanceTypeEnum || (exports.MembershipAcceptanceTypeEnum = {}));
 
-exports.UserTypeEnum = void 0;
-(function (UserTypeEnum) {
-    UserTypeEnum["SIGNED_IN"] = "signed-in";
-    UserTypeEnum["VISITOR"] = "visitor";
-    UserTypeEnum["BOT"] = "bot";
-})(exports.UserTypeEnum || (exports.UserTypeEnum = {}));
-
 const FileType = Object.freeze({
     FILE: 'file',
     IMAGE: 'image',
@@ -1355,7 +1348,6 @@ let activeUser = null;
 */
 /**
  * for internal use
- * @deprecated please use getCurrentUser api instead.
  */
 const getActiveUser = () => {
     if (!activeUser) {
@@ -1789,6 +1781,12 @@ const createHttpTransport = (endpoint) => {
                 controller.abort();
                 handleRequestCancelation(RequestCancelation.UserDeleted);
             }
+            if (tokenExpiry) {
+                if (Date.now() >= Date.parse(tokenExpiry)) {
+                    controller.abort(RequestCancelation.UserDeleted);
+                    handleRequestCancelation(RequestCancelation.TokenExpired);
+                }
+            }
         }
         return config;
     });
@@ -7242,7 +7240,7 @@ const setClientToken = async (params) => {
     const client = getActiveClient();
     // begin establishing session
     setSessionState("establishing" /* 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}`;
     client.http.defaults.metadata = {
@@ -7258,66 +7256,7 @@ const setClientToken = async (params) => {
     };
     client.token = { accessToken, issuedAt, expiresAt };
     setSessionState("established" /* Amity.SessionStates.ESTABLISHED */);
-    return { accessToken, users, userType };
-};
-
-/**
- * Retrieves a pair of {@link Amity.Tokens} necessary for connection
- *
- * @param params get visitor token param
- * @param params.deviceId The user's device Id (can be manually set for native users)
- * @param params.authSignature The authenitcation signature - necessary when network option is set to secure
- * @param params.authSignatureExpiresAt Expire time of the authenitcation signature
- * @param options get bot token options
- * @param options.setAccessTokenCookie The authentication token - necessary when network option is set to secure
- * @return The accessToken for the given userId
- *
- *
- * @category Client API
- * @hidden
- */
-const getVisitorToken = async ({ params, options, }) => {
-    const client = getActiveClient();
-    client.log('client/api/getVisitorToken', params);
-    const deviceInfo = getDeviceInfo();
-    const { data } = await client.http.post('/api/v5/sessions/visitor', Object.assign(Object.assign({}, params), { deviceInfo }), {
-        headers: {
-            'X-API-Key': client.apiKey,
-            'set-access-token-cookie': (options === null || options === void 0 ? void 0 : options.setAccessTokenCookie) || false,
-        },
-    });
-    return data;
-};
-
-/**
- * A util to set or refresh client token
- *
- * @param params.userId the user ID for the current session
- * @param params.displayName the user's displayName for the current session
- * @param params.deviceId Manual override of the user's device id (for device management)
- * @param params.authToken The authentication token - necessary when network option is set to secure
- * @param options get bot token options
- * @param options.setAccessTokenCookie The authentication token - necessary when network option is set to secure
- * @returns token & user info
- *
- * @category private
- * @async
- */
-const setVisitorClientToken = async (params) => {
-    const client = getActiveClient();
-    // begin establishing session
-    setSessionState("establishing" /* Amity.SessionStates.ESTABLISHING */);
-    const { accessToken, users, expiresAt, issuedAt, userType } = await getVisitorToken(params);
-    // manually setup the token for http transport
-    client.http.defaults.headers.common.Authorization = `Bearer ${accessToken}`;
-    client.http.defaults.metadata = {
-        tokenExpiry: expiresAt,
-        isGlobalBanned: false,
-        isUserDeleted: false,
-    };
-    client.token = { accessToken, issuedAt, expiresAt };
-    setSessionState("established" /* Amity.SessionStates.ESTABLISHED */);
-    return { accessToken, users, userType };
+    return { accessToken, users };
 };
 
 function prepareUserPayload(response) {
@@ -8777,34 +8716,13 @@ const removeChannelMarkerCache = (channel) => {
     dropFromCache(['channelMarker', 'get', id], true);
 };
 
-let currentUserType = null;
-/* begin_public_function
-  id: client.get_current_user_type
-*/
-const getCurrentUserType = () => {
-    if (!currentUserType) {
-        throw new ASCError('Connect client first', 800000 /* Amity.ClientError.UNKNOWN_ERROR */, "fatal" /* Amity.ErrorLevel.FATAL */);
-    }
-    return currentUserType;
-};
-/* end_public_function */
-const setCurrentUserType = (userType) => {
-    currentUserType = userType;
-};
-
-const setCurrentUser = ({ user, userType, }) => {
-    setActiveUser(user);
-    setCurrentUserType(userType);
-    pushToCache(['user', 'get', user.userId], user);
-};
-
 /* eslint-disable no-param-reassign */
 /*
  * declared earlier to accomodate case when logging in with a different user
  * than the one already connected, in which case the existing subscriptions need
  * to be cleared
  */
-let subscriptions$3 = [];
+let subscriptions$1 = [];
 async function runMqtt$1() {
     await modifyMqttConnection();
 }
@@ -8839,13 +8757,13 @@ const login = async (params, sessionHandler, config) => {
     if (client.userId && client.userId !== params.userId) {
         await logout();
         // Remove subscription to ban and delete
-        subscriptions$3.forEach(fn => fn());
-        subscriptions$3 = [];
+        subscriptions$1.forEach(fn => fn());
+        subscriptions$1 = [];
     }
     // default values
     const defaultDeviceId = await getDeviceId();
     try {
-        const { users, userType } = await setClientToken({
+        const { users } = await setClientToken({
             params: Object.assign(Object.assign({}, params), { displayName: params === null || params === void 0 ? void 0 : params.displayName, deviceId: (params === null || params === void 0 ? void 0 : params.deviceId) || defaultDeviceId }),
             options: {
                 setAccessTokenCookie: true,
@@ -8859,7 +8777,7 @@ const login = async (params, sessionHandler, config) => {
             terminateClient("userDeleted" /* Amity.TokenTerminationReason.USER_DELETED */);
             return false;
         }
-        if (user.isGlobalBan) {
+        if (user.isGlobalBanned) {
             terminateClient("globalBan" /* Amity.TokenTerminationReason.GLOBAL_BAN */);
             return false;
         }
@@ -8870,7 +8788,7 @@ const login = async (params, sessionHandler, config) => {
          * token expires
          */
         unsubWatcher = client.accessTokenExpiryWatcher(sessionHandler);
-        setCurrentUser({ user, userType });
+        setActiveUser(user);
     }
     catch (error) {
         /*
@@ -8885,141 +8803,42 @@ const login = async (params, sessionHandler, config) => {
         runMqtt$1();
     }
     await initializeMessagePreviewSetting();
-    if (subscriptions$3.length === 0) {
-        subscriptions$3.push(
+    if (subscriptions$1.length === 0) {
+        subscriptions$1.push(
         // GLOBAL_BAN
         onClientBanned((_) => {
             terminateClient("globalBan" /* Amity.TokenTerminationReason.GLOBAL_BAN */);
-            subscriptions$3.forEach(fn => fn());
+            subscriptions$1.forEach(fn => fn());
             unsubWatcher();
         }), onTokenTerminated(_ => {
             terminateClient();
-            subscriptions$3.forEach(fn => fn());
+            subscriptions$1.forEach(fn => fn());
             unsubWatcher();
         }), onUserDeleted$2((user) => {
             if (user.userId === client.userId) {
                 terminateClient("userDeleted" /* Amity.TokenTerminationReason.USER_DELETED */);
-                subscriptions$3.forEach(fn => fn());
+                subscriptions$1.forEach(fn => fn());
                 unsubWatcher();
             }
         }), onTokenExpired(state => {
             SessionWatcher$1.getInstance().setSessionState(state);
             logout();
-            subscriptions$3.forEach(fn => fn());
+            subscriptions$1.forEach(fn => fn());
         }), 
         // NOTE: This is a temporary solution to handle the channel marker when the user is forced to leave
         // the channel because currently backend can't handle this, so every time a user is banned from
         // a channel or the channel is deleted the channel's unread count will not be reset to zero
         onChannelDeleted(removeChannelMarkerCache), onChannelMemberBanned(removeChannelMarkerCache), markReadEngineOnLoginHandler(), analyticsEngineOnLoginHandler(), objectResolverEngineOnLoginHandler(), reactionSyncEngineOnLoginHandler());
         if (client.useLegacyUnreadCount) {
-            subscriptions$3.push(readReceiptSyncEngineOnLoginHandler());
+            subscriptions$1.push(readReceiptSyncEngineOnLoginHandler());
         }
         else
-            subscriptions$3.push(legacyReadReceiptSyncEngineOnLoginHandler());
-    }
-    return true;
-};
-/* end_public_function */
-
-/* eslint-disable require-atomic-updates */
-/*
- * declared earlier to accomodate case when logging in with a different user
- * than the one already connected, in which case the existing subscriptions need
- * to be cleared
- */
-const subscriptions$2 = [];
-/* begin_public_function
-  id: client.loginAsVisitor
-*/
-/**
- * ```js
- * import { loginAsVisitor } from '@amityco/ts-sdk/client/api'
- * const success = await loginAsVisitor({
-    sessionHandler: {
-      sessionWillRenewAccessToken(renewal: Amity.AccessTokenRenewal) {
-       ...
-    }
- * })
- * ```
- *
- * Connects an {@link Amity.Client} instance to ASC servers
- *
- * @param params. the connect parameters
- * @param params.authSignature The authenitcation signature - necessary when network option is set to secure
- * @param params.authSignatureExpiresAt Expire time of the authenitcation signature
- * @param params.sessionHandler
- * @returns a success boolean if connected
- *
- * @category Client API
- * @async
- */
-const loginAsVisitor = async (params) => {
-    const client = getActiveClient();
-    let unsubWatcher;
-    client.log('client/api/connectClient', Object.assign({ apiKey: client.apiKey, sessionState: client.sessionState }, params));
-    // generate deviceId
-    const deviceId = await getDeviceId();
-    let user;
-    try {
-        const { users, userType } = await setVisitorClientToken({
-            params: Object.assign(Object.assign({}, params), { deviceId }),
-            options: {
-                setAccessTokenCookie: true,
-            },
-        });
-        [user] = users;
-        client.userId = user.userId;
-        client.sessionHandler = params.sessionHandler;
-        /*
-         * Cannot push to subscriptions as watcher needs to continue working even if
-         * token expires
-         */
-        unsubWatcher = client.accessTokenExpiryWatcher(params.sessionHandler);
-        setCurrentUser({ user, userType });
-    }
-    catch (error) {
-        /*
-         * if getting token failed session state reverts to initial state when app
-         * is first launched
-         */
-        SessionWatcher$1.getInstance().setSessionState("notLoggedIn" /* Amity.SessionStates.NOT_LOGGED_IN */);
-        // pass error down tree so the calling function handle it
-        throw error;
-    }
-    await initializeMessagePreviewSetting();
-    if (subscriptions$2.length === 0) {
-        // handling internal SDK events
-        subscriptions$2.push(onTokenTerminated(_ => {
-            terminateClient();
-            subscriptions$2.forEach(fn => fn());
-            unsubWatcher();
-        }), onTokenExpired(state => {
-            SessionWatcher$1.getInstance().setSessionState(state);
-            logout();
-            subscriptions$2.forEach(fn => fn());
-        }));
+            subscriptions$1.push(legacyReadReceiptSyncEngineOnLoginHandler());
     }
     return true;
 };
 /* end_public_function */
 
-/* begin_public_function
-  id: client.get_current_user
-*/
-const getCurrentUser = () => {
-    var _a;
-    const client = getActiveClient();
-    if (!client) {
-        throw new ASCError('Connect client first', 800000 /* Amity.ClientError.UNKNOWN_ERROR */, "fatal" /* Amity.ErrorLevel.FATAL */);
-    }
-    const cache = (_a = pullFromCache(['user', 'get', client.userId])) === null || _a === void 0 ? void 0 : _a.data;
-    if (!cache) {
-        throw new ASCError('Connect client first', 800000 /* Amity.ClientError.UNKNOWN_ERROR */, "fatal" /* Amity.ErrorLevel.FATAL */);
-    }
-    return userLinkedObject(cache);
-};
-/* end_public_function */
-
 /* begin_public_function
   id: client.renew_access_token
 */
@@ -9042,7 +8861,7 @@ const renewal = () => {
      * Per instance of Renewal, only one renewal is allowed
      */
     const renewToken = async (authToken) => {
-        const { userId, displayName } = getCurrentUser();
+        const { userId, displayName } = getActiveUser();
         const deviceId = await getDeviceId();
         const params = { userId, displayName, authToken, deviceId };
         if (client.sessionState === "tokenExpired" /* Amity.SessionStates.TOKEN_EXPIRED */ && client.sessionHandler) {
@@ -9061,24 +8880,6 @@ const renewal = () => {
         if (renewTimeoutId)
             clearTimeout(renewTimeoutId);
     };
-    const renewVisitorToken = async ({ authSignature, authSignatureExpiresAt, }) => {
-        const deviceId = await getDeviceId();
-        if (client.sessionState === "tokenExpired" /* Amity.SessionStates.TOKEN_EXPIRED */ && client.sessionHandler) {
-            await loginAsVisitor({ sessionHandler: client.sessionHandler });
-        }
-        else {
-            // about to expire
-            await setVisitorClientToken({
-                params: { authSignature, authSignatureExpiresAt, deviceId },
-                options: {
-                    setAccessTokenCookie: true,
-                },
-            });
-        }
-        tokenRenewed = true;
-        if (renewTimeoutId)
-            clearTimeout(renewTimeoutId);
-    };
     return {
         renew: () => {
             if (tokenRenewed) {
@@ -9100,19 +8901,6 @@ const renewal = () => {
                 (_a = client.sessionHandler) === null || _a === void 0 ? void 0 : _a.sessionWillRenewAccessToken(renewal());
             }, ACCESS_TOKEN_WATCHER_INTERVAL);
         },
-        renewWithAuthSignature: (params) => {
-            if (tokenRenewed) {
-                console.log("'renew' method can be called only once per renewal instance");
-                return;
-            }
-            renewVisitorToken(params);
-        },
-        unableToRetrieveAuthSignature: () => {
-            renewTimeoutId = setTimeout(() => {
-                var _a;
-                (_a = client.sessionHandler) === null || _a === void 0 ? void 0 : _a.sessionWillRenewAccessToken(renewal());
-            }, ACCESS_TOKEN_WATCHER_INTERVAL);
-        },
     };
 };
 /* end_public_function */
@@ -9714,7 +9502,7 @@ const secureLogout = async () => {
  * than the one already connected, in which case the existing subscriptions need
  * to be cleared
  */
-let subscriptions$1 = [];
+let subscriptions = [];
 async function runMqtt() {
     await modifyMqttConnection();
 }
@@ -9786,15 +9574,15 @@ const resumeSession = async (params, sessionHandler, config) => {
                 client.mqtt.disconnect();
             }
             // Clear existing subscriptions
-            subscriptions$1.forEach(fn => fn());
-            subscriptions$1 = [];
+            subscriptions.forEach(fn => fn());
+            subscriptions = [];
         }
         else {
             // Different user - do full logout
             await logout();
             // Remove subscription to ban and delete
-            subscriptions$1.forEach(fn => fn());
-            subscriptions$1 = [];
+            subscriptions.forEach(fn => fn());
+            subscriptions = [];
         }
     }
     try {
@@ -9832,37 +9620,37 @@ const resumeSession = async (params, sessionHandler, config) => {
         runMqtt();
     }
     await initializeMessagePreviewSetting();
-    if (subscriptions$1.length === 0) {
-        subscriptions$1.push(
+    if (subscriptions.length === 0) {
+        subscriptions.push(
         // GLOBAL_BAN
         onClientBanned((_) => {
             terminateClient("globalBan" /* Amity.TokenTerminationReason.GLOBAL_BAN */);
-            subscriptions$1.forEach(fn => fn());
+            subscriptions.forEach(fn => fn());
             unsubWatcher();
         }), onTokenTerminated(_ => {
             terminateClient();
-            subscriptions$1.forEach(fn => fn());
+            subscriptions.forEach(fn => fn());
             unsubWatcher();
         }), onUserDeleted$2((user) => {
             if (user.userId === client.userId) {
                 terminateClient("userDeleted" /* Amity.TokenTerminationReason.USER_DELETED */);
-                subscriptions$1.forEach(fn => fn());
+                subscriptions.forEach(fn => fn());
                 unsubWatcher();
             }
         }), onTokenExpired(state => {
             SessionWatcher$1.getInstance().setSessionState(state);
             logout();
-            subscriptions$1.forEach(fn => fn());
+            subscriptions.forEach(fn => fn());
         }), 
         // NOTE: This is a temporary solution to handle the channel marker when the user is forced to leave
         // the channel because currently backend can't handle this, so every time a user is banned from
         // a channel or the channel is deleted the channel's unread count will not be reset to zero
         onChannelDeleted(removeChannelMarkerCache), onChannelMemberBanned(removeChannelMarkerCache), markReadEngineOnLoginHandler(), analyticsEngineOnLoginHandler(), objectResolverEngineOnLoginHandler());
         if (client.useLegacyUnreadCount) {
-            subscriptions$1.push(readReceiptSyncEngineOnLoginHandler());
+            subscriptions.push(readReceiptSyncEngineOnLoginHandler());
         }
         else
-            subscriptions$1.push(legacyReadReceiptSyncEngineOnLoginHandler());
+            subscriptions.push(legacyReadReceiptSyncEngineOnLoginHandler());
     }
     return true;
 };
@@ -9960,142 +9748,6 @@ const getShareableLinkConfiguration = async () => {
     return data;
 };
 
-/**
- * Retrieves a pair of {@link Amity.Tokens} necessary for connection
- *
- * @param param get bot token param
- * @param params.deviceId The user's device Id (can be manually set for native users)
- * @param options get bot token options
- * @param options.setAccessTokenCookie The authentication token - necessary when network option is set to secure
- * @return The accessToken for the given userId
- *
- * @category Client API
- * @hidden
- */
-const getBotToken = async ({ params, options, }) => {
-    const client = getActiveClient();
-    client.log('client/api/getBotToken');
-    const deviceInfo = getDeviceInfo();
-    const { data } = await client.http.post('/api/v5/sessions/bot', Object.assign(Object.assign({}, params), { deviceInfo }), {
-        headers: {
-            'X-API-Key': client.apiKey,
-            'set-access-token-cookie': (options === null || options === void 0 ? void 0 : options.setAccessTokenCookie) || false,
-        },
-    });
-    return data;
-};
-
-/**
- * A util to set or refresh client token
- * @param options get bot token options
- * @param options.setAccessTokenCookie The authentication token - necessary when network option is set to secure
- * @returns token & user info
- *
- * @category private
- * @async
- */
-const setBotClientToken = async (params) => {
-    const client = getActiveClient();
-    // begin establishing session
-    setSessionState("establishing" /* Amity.SessionStates.ESTABLISHING */);
-    const { accessToken, users, expiresAt, issuedAt, userType } = await getBotToken(params);
-    // manually setup the token for http transport
-    client.http.defaults.headers.common.Authorization = `Bearer ${accessToken}`;
-    client.http.defaults.metadata = {
-        tokenExpiry: expiresAt,
-        isGlobalBanned: false,
-        isUserDeleted: false,
-    };
-    client.token = { accessToken, issuedAt, expiresAt };
-    setSessionState("established" /* Amity.SessionStates.ESTABLISHED */);
-    return { accessToken, users, userType };
-};
-
-/* eslint-disable require-atomic-updates */
-/*
- * declared earlier to accomodate case when logging in with a different user
- * than the one already connected, in which case the existing subscriptions need
- * to be cleared
- */
-const subscriptions = [];
-/* begin_public_function
-  id: client.loginAsBot
-*/
-/**
- * ```js
- * import { loginAsBot } from '@amityco/ts-sdk/client/api'
- * const success = await loginAsBot({
-    sessionHandler: {
-      sessionWillRenewAccessToken(renewal: Amity.AccessTokenRenewal) {
-       ...
-    }
- * })
- * ```
- *
- * Connects an {@link Amity.Client} instance to ASC servers
- *
- * @param params. the connect parameters
- * @param params.sessionHandler
- * @returns a success boolean if connected
- *
- * @category Client API
- * @async
- */
-const loginAsBot = async (params) => {
-    const client = getActiveClient();
-    let unsubWatcher;
-    client.log('client/api/connectClient', {
-        apiKey: client.apiKey,
-        sessionState: client.sessionState,
-    });
-    // generate deviceId
-    const deviceId = await getDeviceId();
-    let user;
-    try {
-        const { users, userType } = await setBotClientToken({
-            params: {
-                deviceId,
-            },
-            options: {
-                setAccessTokenCookie: true,
-            },
-        });
-        [user] = users;
-        client.userId = user.userId;
-        client.sessionHandler = params.sessionHandler;
-        /*
-         * Cannot push to subscriptions as watcher needs to continue working even if
-         * token expires
-         */
-        unsubWatcher = client.accessTokenExpiryWatcher(params.sessionHandler);
-        setCurrentUser({ user, userType });
-    }
-    catch (error) {
-        /*
-         * if getting token failed session state reverts to initial state when app
-         * is first launched
-         */
-        SessionWatcher$1.getInstance().setSessionState("notLoggedIn" /* Amity.SessionStates.NOT_LOGGED_IN */);
-        // pass error down tree so the calling function handle it
-        throw error;
-    }
-    await initializeMessagePreviewSetting();
-    if (subscriptions.length === 0) {
-        // handling internal SDK events
-        subscriptions.push(onTokenTerminated(_ => {
-            terminateClient();
-            subscriptions.forEach(fn => fn());
-            unsubWatcher();
-        }), onTokenExpired(state => {
-            SessionWatcher$1.getInstance().setSessionState(state);
-            logout();
-            subscriptions.forEach(fn => fn());
-        }));
-    }
-    return true;
-};
-/* end_public_function */
-
 /**
  * ```js
  * import { onChannelMarkerFetched } from '@amityco/ts-sdk'
@@ -10467,11 +10119,6 @@ var index$o = /*#__PURE__*/Object.freeze({
     fetchLinkPreview: fetchLinkPreview,
     getSocialSettings: getSocialSettings,
     getShareableLinkConfiguration: getShareableLinkConfiguration,
-    loginAsVisitor: loginAsVisitor,
-    loginAsBot: loginAsBot,
-    getCurrentUser: getCurrentUser,
-    getCurrentUserType: getCurrentUserType,
-    setCurrentUserType: setCurrentUserType,
     onConnectionError: onConnectionError,
     onClientDisconnected: onClientDisconnected,
     onClientBanned: onClientBanned,