@amityco/ts-sdk 0.0.1-beta.33 → 0.0.1-beta.37

package/src/channel/utils/tests/prepareChannelPayload.test.ts

@@ -1,15 +1,15 @@
 import {
   connectClient,
   disconnectClient,
-  channel11,
-  channel12,
+  channel1,
+  channel2,
   channelRaw1,
   channelRaw2,
-  channelUser1,
-  channelUser2,
+  rawChannelUser,
+  rawChannelUser2,
 } from '~/utils/tests';
 
-import { prepareChannelPayload } from '../prepareChannelPayload';
+import { prepareChannelPayload } from '..';
 
 beforeAll(async () => {
   await connectClient();
@@ -36,7 +36,7 @@ const tests = [
     },
     after: {
       ...responseSchema,
-      channels: [channel11],
+      channels: [channel1],
     },
   },
   {
@@ -45,12 +45,12 @@ const tests = [
     before: {
       ...responseSchema,
       channels: [channelRaw1],
-      channelUsers: [channelUser1],
+      channelUsers: [rawChannelUser],
     },
     after: {
       ...responseSchema,
-      channels: [channel11],
-      channelUsers: [channelUser1],
+      channels: [channel1],
+      channelUsers: [rawChannelUser],
     },
   },
   {
@@ -59,12 +59,12 @@ const tests = [
     before: {
       ...responseSchema,
       channels: [channelRaw1],
-      channelUsers: [channelUser1],
+      channelUsers: [rawChannelUser],
     },
     after: {
       ...responseSchema,
-      channels: [channel11],
-      channelUsers: [channelUser1],
+      channels: [channel1],
+      channelUsers: [rawChannelUser],
     },
   },
   {
@@ -73,12 +73,12 @@ const tests = [
     before: {
       ...responseSchema,
       channels: [channelRaw2],
-      channelUsers: [channelUser2],
+      channelUsers: [rawChannelUser2],
     },
     after: {
       ...responseSchema,
-      channels: [channel12],
-      channelUsers: [channelUser2],
+      channels: [channel2],
+      channelUsers: [rawChannelUser2],
     },
   },
   {
@@ -87,12 +87,12 @@ const tests = [
     before: {
       ...responseSchema,
       channels: [channelRaw2],
-      channelUsers: [channelUser2],
+      channelUsers: [rawChannelUser2],
     },
     after: {
       ...responseSchema,
-      channels: [channel12],
-      channelUsers: [channelUser2],
+      channels: [channel2],
+      channelUsers: [rawChannelUser2],
     },
   },
   {
@@ -101,17 +101,17 @@ const tests = [
     before: {
       ...responseSchema,
       channels: [channelRaw2],
-      channelUsers: [channelUser2],
+      channelUsers: [rawChannelUser2],
     },
     after: {
       ...responseSchema,
-      channels: [channel12],
-      channelUsers: [channelUser2],
+      channels: [channel2],
+      channelUsers: [rawChannelUser2],
     },
   },
 ];
 
-describe('channel/utils/prepareChannelPayload', () => {
+xdescribe('channel/utils/prepareChannelPayload', () => {
   tests.forEach(({ id, desc, before, after }) => {
     test(`${id} - ${desc}`, () => {
       expect(prepareChannelPayload(before)).toEqual(after);

package/src/client/api/accessTokenExpiryWatcher.ts

@@ -0,0 +1,83 @@
+import { fireEvent } from '~/core/events';
+import { scheduleTask } from '~/core/microtasks';
+import { MINUTE, ACCESS_TOKEN_WATCHER_INTERVAL } from '~/utils/constants';
+
+import { renewal } from './renewal';
+
+const ABOUT_TO_EXPIRE_THRESHOLD = 80 / 100;
+const COMPENSATED_DELAY = 5 * MINUTE;
+
+/*
+ * a helper function to check if the token has expires
+ *
+ * @param token to be checked
+ * @returns boolean indicating if token expires
+ *
+ * @category private
+ */
+export const isExpired = (expiresAt: Amity.Tokens['expiresAt']): boolean =>
+  Date.now() > Date.parse(expiresAt) - COMPENSATED_DELAY;
+
+/*
+ * a helper function to check if the token is about to expire
+ *
+ * @param token to be checked
+ * @returns boolean indicating if token is aboutToExpire
+ *
+ * @category private
+ */
+export const isAboutToExpire = (
+  expiresAt: Amity.Tokens['expiresAt'],
+  issuedAt: Amity.Tokens['issuedAt'],
+): boolean => {
+  const expires = Date.parse(expiresAt);
+  const issued = Date.parse(issuedAt);
+  const now = Date.now();
+
+  const duration = expires - issued - COMPENSATED_DELAY;
+  const aboutToExpireAt = issued + duration * ABOUT_TO_EXPIRE_THRESHOLD;
+
+  return now > aboutToExpireAt && now < expires;
+};
+
+/*
+ * Monitors time to expire of token and updates session state to aboutToExpire
+ *
+ * @returns intervalId to be cleared after trigger
+ *
+ * @category private
+ */
+export const accessTokenExpiryWatcher = (
+  expiresAt: Amity.Tokens['expiresAt'],
+  issuedAt: Amity.Tokens['issuedAt'],
+  sessionHandler: Amity.SessionHandler,
+): Amity.Unsubscriber => {
+  const interval: ReturnType<typeof setInterval> = setInterval(() => {
+    if (isExpired(expiresAt)) {
+      /*
+       * the event handler will take care of updating session state
+       * Note, this will also clear the interval id, so this event will only be
+       * fired once
+       */
+      fireEvent('tokenExpired', Amity.SessionStates.TOKEN_EXPIRED);
+
+      /*
+       * https://ekoapp.atlassian.net/wiki/spaces/UP/pages/2082537485/ASC+Core+-+Session+Management+3.0#Automatically-initiate-renewal-flow
+       *
+       * Why sechduled task?
+       * Since fireEvent is scheduled, it will be called
+       * after sessionHandler leading to an invalid state change from
+       * establishing to tokenExpired
+       */
+      scheduleTask(() => sessionHandler.sessionWillRenewAccessToken(renewal()));
+
+      return;
+    }
+
+    if (isAboutToExpire(issuedAt, expiresAt)) {
+      sessionHandler.sessionWillRenewAccessToken(renewal());
+    }
+  }, ACCESS_TOKEN_WATCHER_INTERVAL);
+
+  return (): void => clearInterval(interval);
+};

package/src/client/api/activeUser.ts

@@ -1,6 +1,6 @@
 import { ASCError } from '~/core/errors';
 
-let activeUser: Pick<Amity.User, '_id' | 'userId' | 'path'> | null = null;
+let activeUser: Pick<Amity.User, '_id' | 'userId' | 'path' | 'displayName'> | null = null;
 
 /**
  * for internal use

package/src/client/api/connectClient.ts

@@ -3,14 +3,35 @@
 import { disconnectClient } from '~/client/api/disconnectClient';
 import { getDeviceId } from '~/core/device';
 import { proxyWebsocketEvents } from '~/core/events';
-import { getNetworkTopic, subscribeTopic } from '~/core/subscription';
+import {
+  getUserTopic,
+  getNetworkTopic,
+  getSmartFeedChannelTopic,
+  getSmartFeedMessageTopic,
+  getSmartFeedSubChannelTopic,
+  subscribeTopic,
+} from '~/core/subscription';
+
 import { onUserDeleted } from '~/user/events/onUserDeleted';
 
 import { getActiveClient } from './activeClient';
-import { setActiveUser } from './activeUser';
+import { terminateClient } from './terminateClient';
+import { setActiveUser, getActiveUser } from './activeUser';
+
+import { setSessionState } from './setSessionState';
 
-import { getToken } from './getToken';
 import { onClientBanned } from '../events';
+import { onTokenExpired } from '../events/onTokenExpired';
+import { onTokenTerminated } from '../events/onTokenTerminated';
+
+import { setClientToken } from '../utils/setClientToken';
+
+/*
+ * 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: Amity.Unsubscriber[] = [];
 
 /**
  * ```js
@@ -34,51 +55,118 @@ import { onClientBanned } from '../events';
  */
 export const connectClient = async (
   params: Amity.ConnectClientParams,
+  sessionHandler: Amity.SessionHandler,
   config?: Amity.ConnectClientConfig,
 ): Promise<boolean> => {
   const client = getActiveClient();
-  client.log('client/api/connectClient', { apiKey: client.apiKey, ...params });
+  let unsubWatcher: Amity.Unsubscriber;
+
+  client.log('client/api/connectClient', {
+    apiKey: client.apiKey,
+    sessionState: client.sessionState,
+    ...params,
+  });
+
+  // if connecting to a different userId than the one that is connected currently
+  if (client.userId && client.userId !== params.userId) {
+    await disconnectClient();
+
+    // Remove subscription to ban and delete
+    subscriptions.forEach(fn => fn());
+  }
 
   // default values
   params.deviceId ??= getDeviceId();
 
-  // @ts-ignore: in that particular case, typing can be
-  // ignored since we enforce default values just before.
-  const { accessToken, users } = await getToken(params);
+  try {
+    // @ts-ignore: in that particular case, typing can be
+    // ignored since we enforce default values just before.
+    const { users } = await setClientToken(params);
 
-  // manually setup the token for http transport
-  client.http.defaults.headers.common.Authorization = `Bearer ${accessToken}`;
+    // FIXME: events are duplicated if connectClient is called few times without disconnectClient
+    // wire websocket events to our event emitter
+    proxyWebsocketEvents(client.ws, client.emitter);
 
-  // manually setup the token for ws transport
-  client.ws.io.opts.query = { token: accessToken };
+    // TODO: in phase 2, this should not be necessary. we should have WS
+    // to be connected "on demand" rather than "by default"
+    await new Promise(resolve => {
+      client.ws.once('connect', resolve);
+      client.ws.open();
+    });
 
-  // FIXME: events are duplicated if connectClient is called few times without disconnectClient
-  // wire websocket events to our event emitter
-  proxyWebsocketEvents(client.ws, client.emitter);
+    client.userId = params.userId;
 
-  // TODO: in phase 2, this should not be necessary. we should have WS
-  // to be connected "on demand" rather than "by default"
-  await new Promise(resolve => {
-    client.ws.once('connect', resolve);
-    client.ws.open();
-  });
+    client.sessionHandler = sessionHandler;
 
-  client.userId = params.userId;
-  client.accessToken = accessToken;
+    /*
+     * Cannot push to subscriptions as watcher needs to continue working even if
+     * token expires
+     */
+    unsubWatcher = client.accessTokenExpiryWatcher(
+      client.token?.issuedAt!,
+      client.token?.expiresAt!,
+      sessionHandler!,
+    );
 
-  setActiveUser(users[0]);
+    setActiveUser(users[0]);
+  } catch (error) {
+    /*
+     * if getting token failed session state reverts to initial state when app
+     * is first launched
+     */
+    setSessionState(Amity.SessionStates.NOT_LOGGED_IN);
+
+    // pass error down tree so the calling function handle it
+    throw error;
+  }
 
   if (config?.disableRTE !== true) {
     subscribeTopic(getNetworkTopic());
+    subscribeTopic(getSmartFeedChannelTopic());
+    subscribeTopic(getSmartFeedSubChannelTopic());
+    subscribeTopic(getSmartFeedMessageTopic());
+    // subscribing to user topic is necessary to handle ban event
+    subscribeTopic(getUserTopic(getActiveUser()));
   }
 
-  const subscriptions = [
-    onClientBanned(() => {
+  subscriptions.push(
+    // GLOBAL_BAN
+    onClientBanned((_: Amity.UserPayload) => {
+      terminateClient();
+
+      subscriptions.forEach(fn => fn());
+
+      unsubWatcher();
+    }),
+
+    onTokenTerminated(_ => {
+      terminateClient();
+
+      subscriptions.forEach(fn => fn());
+
+      unsubWatcher();
+    }),
+
+    onUserDeleted((user: Amity.User) => {
+      if (user.userId === client.userId) {
+        terminateClient();
+
+        subscriptions.forEach(fn => fn());
+
+        unsubWatcher();
+      }
+    }),
+
+    onTokenExpired(state => {
+      setSessionState(state);
+
       disconnectClient();
+
       subscriptions.forEach(fn => fn());
     }),
+
     onUserDeleted(() => null),
-  ];
+  );
 
   return client.ws.connected;
 };

package/src/client/api/createClient.ts

@@ -14,6 +14,8 @@ import { createEventEmitter } from '~/core/events';
 import { getActiveClient, setActiveClient } from './activeClient';
 import { getFeedSettings } from './getFeedSettings';
 
+import { accessTokenExpiryWatcher } from './accessTokenExpiryWatcher';
+
 const DEFAULT_DEBUG_SESSION = 'amity';
 
 /**
@@ -27,7 +29,7 @@ const DEFAULT_DEBUG_SESSION = 'amity';
  * @param apiKey for the {@link Amity.Client} instance
  * @param apiRegion endpoint to connect to
  * @param apiEndpoint custom endpoint in case you don't want to use a preset endpoint
- * @param debugSession session's identifier for the client's logger instance
+ * @param param.debugSession session's identifier for the client's logger instance
  * @returns A {@link Amity.Client} instance
  *
  * @category Client API
@@ -59,6 +61,9 @@ export const createClient = (
 
   const emitter = createEventEmitter();
 
+  const sessionState = Amity.SessionStates.NOT_LOGGED_IN;
+  const sessionHandler = undefined;
+
   const client = {
     version: `${VERSION}`,
 
@@ -68,13 +73,16 @@ export const createClient = (
     ws,
     mqtt,
     emitter,
+    accessTokenExpiryWatcher,
     use: () => setActiveClient(client),
 
+    sessionState,
+    sessionHandler,
     getFeedSettings,
   };
 
   try {
-    getActiveClient();
+    return getActiveClient();
   } catch {
     setActiveClient(client);
   }

package/src/client/api/disconnectClient.ts

@@ -1,4 +1,5 @@
 import { getActiveClient } from './activeClient';
+import { setSessionState } from './setSessionState';
 
 /**
  * ```js
@@ -8,7 +9,6 @@ import { getActiveClient } from './activeClient';
  *
  * Disconnects an {@link Amity.Client} instance from ASC servers
  *
- * @param client The {@link Amity.Client} instance to disconnect
  * @returns a success boolean if disconnected
  *
  * @category Client API
@@ -16,6 +16,7 @@ import { getActiveClient } from './activeClient';
  */
 export const disconnectClient = async (): Promise<boolean> => {
   const client = getActiveClient();
+
   client.log('client/api/disconnectClient');
 
   await new Promise(resolve => {
@@ -29,7 +30,30 @@ export const disconnectClient = async (): Promise<boolean> => {
   client.ws.removeAllListeners();
   client.mqtt.removeAllListeners();
   client.userId = undefined;
-  client.accessToken = undefined;
+  client.token = undefined;
+
+  client.http.defaults.headers.common.Authorization = '';
+  client.ws.io.opts.query = { token: '' };
+
+  /*
+   * for cases when session state is terminated (example on ban) or token expired,
+   * the terminating block will set session state to terminated or for the or
+   * in the case of expired token the same happens
+   *
+   * establishing state also ignored in cases where accessTokenExpiryWatcher
+   * calls renewal. There is a possibility that renewal will be called before
+   * disconnectClient finishes execution
+   */
+  if (client.sessionState === Amity.SessionStates.ESTABLISHED)
+    setSessionState(Amity.SessionStates.NOT_LOGGED_IN);
+
+  /*
+   * Cache should be usable if tokenExpired
+   * https://ekoapp.atlassian.net/wiki/spaces/UP/pages/2082537485/ASC+Core+-+Session+Management+3.0#SDK-usability-based-on-Session-State
+   */
+  if (client.sessionState !== Amity.SessionStates.TOKEN_EXPIRED && client.cache) {
+    client.cache = { data: {} };
+  }
 
   return !client.ws.connected;
 };

package/src/client/api/getChatSettings.ts

@@ -0,0 +1,22 @@
+import { getActiveClient } from './activeClient';
+
+/**
+ * ```js
+ * import { getChatSettings } from '@amityco/ts-sdk'
+ * const chatSettings = await getChatSettings()
+ * ```
+ *
+ * Fetches a {@link Amity.ChatSettings} object
+ *
+ * @returns A Promise of {@link Amity.ChatSettings} object
+ *
+ * @category Client API
+ * @async
+ */
+export const getChatSettings = async (): Promise<Amity.ChatSettings> => {
+  const client = getActiveClient();
+
+  const { data } = await client.http.get<Amity.ChatSettings>(`/api/v3/network-settings/chat`);
+
+  return data;
+};

package/src/client/api/getSocialSettings.ts

@@ -0,0 +1,24 @@
+import { getActiveClient } from './activeClient';
+
+/**
+ * ```js
+ * import { getSocialSettings } from '@amityco/ts-sdk'
+ * const socialSettings = await getSocialSettings()
+ * ```
+ *
+ * Fetches a {@link Amity.SocialSettings} object
+ *
+ * @returns A Promise of {@link Amity.SocialSettings} object
+ *
+ * @category Client API
+ * @async
+ */
+export const getSocialSettings = async (): Promise<Amity.SocialSettings> => {
+  const client = getActiveClient();
+
+  const { data } = await client.http.get<{ socialNetworkSetting: Amity.SocialSettings }>(
+    `/api/v3/network-settings/social`,
+  );
+
+  return data.socialNetworkSetting;
+};

package/src/client/api/getToken.ts

@@ -5,10 +5,10 @@ import { getDeviceInfo } from '~/core/device';
 /**
  * Retrieves a pair of {@link Amity.Tokens} necessary for connection
  *
- * @param userId The userId to use to issue a token
- * @param displayName The user's displayName
- * @param deviceId The user's device Id (can be manually set for native users)
- * @param authToken The authentication token - necessary when network option is set to secure
+ * @param params.userId The userId to use to issue a token
+ * @param params.displayName The user's displayName
+ * @param params.deviceId The user's device Id (can be manually set for native users)
+ * @param params.authToken The authentication token - necessary when network option is set to secure
  * @return The accessToken for the given userId
  *
  * @category Client API
@@ -23,10 +23,10 @@ export const getToken = async (params: {
   const client = getActiveClient();
   client.log('client/api/getToken', params);
 
-  const deviceInfo = await getDeviceInfo();
+  const deviceInfo = getDeviceInfo();
 
   const { data } = await client.http.post<Amity.Tokens & { users: Amity.User[] }>(
-    '/v1/device',
+    '/api/v3/sessions',
     {
       ...params,
       deviceInfo,

package/src/client/api/index.ts

@@ -8,3 +8,5 @@ export * from './disconnectClient';
 export * from './isConnected';
 
 export * from './getFeedSettings';
+
+export * from './renewal';

package/src/client/api/renewal.ts

@@ -0,0 +1,74 @@
+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 { getActiveClient } from './activeClient';
+import { connectClient } from './connectClient';
+
+/*
+ * Renewal defintion accepted by SessionHandler interface
+ *
+ * Tech Spec:
+ * https://ekoapp.atlassian.net/wiki/spaces/UP/pages/2082537485/ASC+Core+-+Session+Management+3.0#Session-Handler
+ *
+ * @category private
+ */
+export const renewal = (): Amity.AccessTokenRenewal => {
+  let tokenRenewed = false;
+  let renewTimeoutId: ReturnType<typeof setTimeout>;
+
+  const client = getActiveClient();
+
+  client.log('initiating access token renewal');
+  /*
+   * Renews a token if it is hasn't been renewed before. Also marks token as
+   * renewed once done
+   * Per instance of Renewal, only one renewal is allowed
+   */
+  const renewToken = async (authToken?: Amity.ConnectClientParams['authToken']): Promise<void> => {
+    const { userId, displayName } = getActiveUser();
+    const deviceId = getDeviceId();
+
+    const params = { userId, displayName, authToken, deviceId };
+
+    if (client.sessionState === Amity.SessionStates.TOKEN_EXPIRED) {
+      // sessionHandler will never be empty when renewal is instantiatied
+      await connectClient(params, client.sessionHandler!);
+    } else {
+      // about to expire
+
+      // @ts-ignore: in that particular case, typing can be
+      // ignored since we enforce default values just before.
+      await refreshToken(params);
+    }
+
+    tokenRenewed = true;
+
+    if (renewTimeoutId) clearTimeout(renewTimeoutId);
+  };
+
+  return {
+    renew: () => {
+      if (tokenRenewed) {
+        console.log("'renew' method can be called only once per renewal instance");
+        return;
+      }
+      renewToken();
+    },
+
+    renewWithAuthToken: (authToken: string) => {
+      if (tokenRenewed) {
+        console.log("'renewWithAuthToken' method can be called only once per renewal instance");
+        return;
+      }
+      renewToken(authToken);
+    },
+
+    unableToRetrieveAuthToken: () => {
+      renewTimeoutId = setTimeout(() => {
+        client.sessionHandler?.sessionWillRenewAccessToken(renewal());
+      }, ACCESS_TOKEN_WATCHER_INTERVAL);
+    },
+  };
+};