@amityco/ts-sdk 7.5.4-3506dd3.0 → 7.5.4-6dc7299.0

package/dist/index.esm.js

@@ -6,6 +6,7 @@ import HttpAgent, { HttpsAgent } from 'agentkeepalive';
 import io from 'socket.io-client';
 import uuid$1 from 'react-native-uuid';
 import hash from 'object-hash';
+import jwtDecode from 'jwt-decode';
 import Hls from 'hls.js';
 
 var MembershipAcceptanceTypeEnum;
@@ -23386,9 +23387,35 @@ const markAsRead = async (channelId) => {
     return true;
 };
 
+const channelMemberLinkedObject = (channelMember) => {
+    const getUser = () => {
+        var _a;
+        const cacheKey = ['user', 'get', channelMember.userId];
+        const internalUser = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
+        return internalUser ? userLinkedObject(internalUser) : undefined;
+    };
+    return Object.assign(Object.assign({}, channelMember), { get user() {
+            return getUser();
+        } });
+};
+
 const channelLinkedObject = (channel) => {
+    var _a;
+    let previewMembers = [];
+    if (channel.type === 'conversation') {
+        const channelUsers = queryCache(['channelUsers', 'get']);
+        if (channelUsers && (channelUsers === null || channelUsers === void 0 ? void 0 : channelUsers.length) > 0) {
+            previewMembers = ((_a = channelUsers === null || channelUsers === void 0 ? void 0 : channelUsers.filter(({ data }) => data.channelId === channel.channelId)) !== null && _a !== void 0 ? _a : [])
+                // sort in ascending order by userInternalId
+                .sort((a, b) => a.data.userInternalId.localeCompare(b.data.userInternalId))
+                // Select only first 4 members
+                .slice(0, 4)
+                .map(({ data }) => channelMemberLinkedObject(data));
+        }
+    }
     return shallowClone(channel, {
         markAsRead: () => markAsRead(channel.channelInternalId),
+        previewMembers,
     });
 };
 
@@ -23817,7 +23844,7 @@ class PaginationController {
  */
 class JoinRequestsPaginationController extends PaginationController {
     async getRequest(queryParams, token) {
-        const { limit = COLLECTION_DEFAULT_PAGINATION_LIMIT, communityId } = queryParams, params = __rest(queryParams, ["limit", "communityId"]);
+        const { limit = 20, communityId } = queryParams, params = __rest(queryParams, ["limit", "communityId"]);
         const options = token ? { token } : { limit };
         const { data: queryResponse } = await this.http.get(`/api/v4/communities/${communityId}/join`, {
             params: Object.assign(Object.assign({}, params), { options }),
@@ -24711,6 +24738,7 @@ const LinkedObject = {
     community: communityLinkedObject,
     invitation: invitationLinkedObject,
     joinRequest: joinRequestLinkedObject,
+    channelMember: channelMemberLinkedObject,
 };
 
 const constructChannelObject = (channel) => {
@@ -25993,8 +26021,8 @@ const removeChannelMarkerCache = (channel) => {
  * than the one already connected, in which case the existing subscriptions need
  * to be cleared
  */
-let subscriptions = [];
-async function runMqtt() {
+let subscriptions$1 = [];
+async function runMqtt$1() {
     await modifyMqttConnection();
 }
 /* begin_public_function
@@ -26029,8 +26057,8 @@ const login = async (params, sessionHandler, config) => {
     if (client.userId && client.userId !== params.userId) {
         await logout();
         // Remove subscription to ban and delete
-        subscriptions.forEach(fn => fn());
-        subscriptions = [];
+        subscriptions$1.forEach(fn => fn());
+        subscriptions$1 = [];
     }
     // default values
     const defaultDeviceId = await getDeviceId();
@@ -26076,40 +26104,40 @@ const login = async (params, sessionHandler, config) => {
         throw error;
     }
     if ((config === null || config === void 0 ? void 0 : config.disableRTE) !== true) {
-        runMqtt();
+        runMqtt$1();
     }
     await initializeMessagePreviewSetting();
-    if (subscriptions.length === 0) {
-        subscriptions.push(
+    if (subscriptions$1.length === 0) {
+        subscriptions$1.push(
         // GLOBAL_BAN
         onClientBanned((_) => {
             terminateClient("globalBan" /* Amity.TokenTerminationReason.GLOBAL_BAN */);
-            subscriptions.forEach(fn => fn());
+            subscriptions$1.forEach(fn => fn());
             unsubWatcher();
         }), onTokenTerminated(_ => {
             terminateClient();
-            subscriptions.forEach(fn => fn());
+            subscriptions$1.forEach(fn => fn());
             unsubWatcher();
         }), onUserDeleted$2((user) => {
             if (user.userId === client.userId) {
                 terminateClient("userDeleted" /* Amity.TokenTerminationReason.USER_DELETED */);
-                subscriptions.forEach(fn => fn());
+                subscriptions$1.forEach(fn => fn());
                 unsubWatcher();
             }
         }), onTokenExpired(state => {
             SessionWatcher$1.getInstance().setSessionState(state);
             logout();
-            subscriptions.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());
         if (client.useLegacyUnreadCount) {
-            subscriptions.push(readReceiptSyncEngineOnLoginHandler());
+            subscriptions$1.push(readReceiptSyncEngineOnLoginHandler());
         }
         else
-            subscriptions.push(legacyReadReceiptSyncEngineOnLoginHandler());
+            subscriptions$1.push(legacyReadReceiptSyncEngineOnLoginHandler());
     }
     return true;
 };
@@ -27034,6 +27062,176 @@ const secureLogout = async () => {
 };
 /* end_public_function */
 
+/*
+ * 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 = [];
+async function runMqtt() {
+    await modifyMqttConnection();
+}
+const isSameUserId = (token) => {
+    var _a;
+    const client = getActiveClient();
+    const decoded = jwtDecode(token);
+    return ((_a = decoded === null || decoded === void 0 ? void 0 : decoded.user) === null || _a === void 0 ? void 0 : _a.publicUserId) === client.userId;
+};
+const validateAccessToken = async ({ token, userId }) => {
+    const client = getActiveClient();
+    // begin establishing session
+    setSessionState("establishing" /* Amity.SessionStates.ESTABLISHING */);
+    const { data: { users }, } = await client.http.get(`/api/v3/users/${userId}`, {
+        headers: {
+            Authorization: `Bearer ${token.accessToken}`,
+        },
+    });
+    const user = users.find((u) => u.userId === userId);
+    client.http.defaults.headers.common.Authorization = `Bearer ${token.accessToken}`;
+    client.http.defaults.metadata = {
+        tokenExpiry: token.expiresAt,
+        isGlobalBanned: false,
+        isUserDeleted: false,
+    };
+    client.upload.defaults.headers.common.Authorization = `Bearer ${token.accessToken}`;
+    client.upload.defaults.metadata = {
+        tokenExpiry: token.expiresAt,
+        isGlobalBanned: false,
+        isUserDeleted: false,
+    };
+    // manually setup the token for ws transport
+    if (client.ws)
+        client.ws.io.opts.query = { token: token.accessToken };
+    client.token = token;
+    setSessionState("established" /* Amity.SessionStates.ESTABLISHED */);
+    return user;
+};
+/* begin_public_function
+  id: client.resumeSession
+*/
+/**
+ * ```js
+ * import { resumeSession } from '@amityco/ts-sdk/client/api'
+ * const success = await resumeSession({
+ *   userId: 'XYZ123456789',
+ *   token: { accessToken: 'abc123', issuedAt: '2023-01-01T00:00:00Z', expiresAt: '2023-01-02T00:00:00Z' }
+ * })
+ * ```
+ *
+ * Connects an {@link Amity.Client} instance to ASC servers using an existing access token
+ *
+ * @param params the connect parameters
+ * @param params.userId the user ID for the current session
+ * @param params.token the existing access token with its metadata
+ * @param sessionHandler the session handler for token renewal
+ * @param config optional configuration
+ * @returns a success boolean if connected
+ *
+ * @category Client API
+ * @async
+ */
+const resumeSession = async (params, sessionHandler, config) => {
+    var _a;
+    const client = getActiveClient();
+    let unsubWatcher;
+    client.log('client/api/resumeSession', Object.assign({ apiKey: client.apiKey, sessionState: client.sessionState }, params));
+    // Handle existing connected user
+    if (client.userId) {
+        if (client.userId === params.userId && isSameUserId(params.token.accessToken)) {
+            // Clear connections and listeners but preserve cache
+            if (client.mqtt && client.mqtt.connected) {
+                client.mqtt.disconnect();
+            }
+            if (client.ws && client.ws.connected) {
+                client.ws.disconnect();
+            }
+            // Clear existing subscriptions
+            subscriptions.forEach(fn => fn());
+            subscriptions = [];
+        }
+        else {
+            // Different user - do full logout
+            await logout();
+            // Remove subscription to ban and delete
+            subscriptions.forEach(fn => fn());
+            subscriptions = [];
+        }
+    }
+    try {
+        const user = await validateAccessToken(params);
+        if (user == null) {
+            throw new ASCError(`${params.userId} has not been found`, 800000 /* Amity.ClientError.UNKNOWN_ERROR */, "error" /* Amity.ErrorLevel.ERROR */);
+        }
+        if (user.isDeleted) {
+            terminateClient("userDeleted" /* Amity.TokenTerminationReason.USER_DELETED */);
+            return false;
+        }
+        if (user.isGlobalBanned) {
+            terminateClient("globalBan" /* Amity.TokenTerminationReason.GLOBAL_BAN */);
+            return false;
+        }
+        // FIXME: events are duplicated if connectClient is called few times without disconnectClient
+        // wire websocket events to our event emitter
+        proxyWebsocketEvents(client.ws, client.emitter);
+        (_a = client.ws) === null || _a === void 0 ? void 0 : _a.open();
+        client.userId = user.userId;
+        client.sessionHandler = sessionHandler;
+        /*
+         * Cannot push to subscriptions as watcher needs to continue working even if
+         * token expires
+         */
+        unsubWatcher = client.accessTokenExpiryWatcher(sessionHandler);
+        setActiveUser(user);
+    }
+    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;
+    }
+    if ((config === null || config === void 0 ? void 0 : config.disableRTE) !== true) {
+        runMqtt();
+    }
+    await initializeMessagePreviewSetting();
+    if (subscriptions.length === 0) {
+        subscriptions.push(
+        // GLOBAL_BAN
+        onClientBanned((_) => {
+            terminateClient("globalBan" /* Amity.TokenTerminationReason.GLOBAL_BAN */);
+            subscriptions.forEach(fn => fn());
+            unsubWatcher();
+        }), onTokenTerminated(_ => {
+            terminateClient();
+            subscriptions.forEach(fn => fn());
+            unsubWatcher();
+        }), onUserDeleted$2((user) => {
+            if (user.userId === client.userId) {
+                terminateClient("userDeleted" /* Amity.TokenTerminationReason.USER_DELETED */);
+                subscriptions.forEach(fn => fn());
+                unsubWatcher();
+            }
+        }), onTokenExpired(state => {
+            SessionWatcher$1.getInstance().setSessionState(state);
+            logout();
+            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.push(readReceiptSyncEngineOnLoginHandler());
+        }
+        else
+            subscriptions.push(legacyReadReceiptSyncEngineOnLoginHandler());
+    }
+    return true;
+};
+/* end_public_function */
+
 /**
  * ```js
  * import { isConnected } from '@amityco/ts-sdk'
@@ -27439,6 +27637,7 @@ var index$n = /*#__PURE__*/Object.freeze({
   login: login,
   logout: logout,
   secureLogout: secureLogout,
+  resumeSession: resumeSession,
   isConnected: isConnected,
   getFeedSettings: getFeedSettings,
   renewal: renewal,
@@ -35133,7 +35332,8 @@ class ChannelMemberLiveCollectionController extends LiveCollectionController {
         const data = this.applyFilter((_b = collection.data
             .map(id => pullFromCache(['channelUsers', 'get', id]))
             .filter(Boolean)
-            .map(({ data }) => data)) !== null && _b !== void 0 ? _b : []);
+            .map(({ data }) => data)
+            .map(LinkedObject.channelMember)) !== null && _b !== void 0 ? _b : []);
         if (!this.shouldNotify(data) && origin === 'event')
             return;
         this.callback({
@@ -35700,7 +35900,7 @@ const getCommunity$1 = async (communityId, type, includeDiscoverablePrivateCommu
     }
     const { communities } = data;
     return {
-        data: LinkedObject.community(communities.find(community => community.communityId === communityId)),
+        data: communities.find(community => community.communityId === communityId),
         cachedAt,
     };
 };
@@ -35726,7 +35926,7 @@ getCommunity$1.locally = (communityId) => {
     if (!cached)
         return;
     return {
-        data: LinkedObject.community(cached.data),
+        data: cached.data,
         cachedAt: cached.cachedAt,
     };
 };
@@ -35762,7 +35962,7 @@ const deleteCommunity = async (communityId) => {
         files: [],
         users: [],
     });
-    return deleted.data;
+    return LinkedObject.community(deleted.data);
 };
 /* end_public_function */
 
@@ -37272,7 +37472,11 @@ const getCommunity = (communityId, callback) => {
         onCommunityUserUnbanned,
         onCommunityUserChanged,
         convertEventPayload(onLocalCommunityJoin, 'targetId', 'community'),
-    ]);
+    ], {
+        callbackDataSelector: (data) => {
+            return LinkedObject.community(data);
+        },
+    });
 };
 /* end_public_function */