@amityco/ts-sdk 6.17.3-c7279f3.0 → 6.17.3

package/dist/storyRepository/observers/getActiveStoriesByTarget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getActiveStoriesByTarget.d.ts","sourceRoot":"","sources":["../../../src/storyRepository/observers/getActiveStoriesByTarget.ts"],"names":[],"mappings":"AA6BA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,wBAAwB,WAC3B,MAAM,uBAAuB,YAC3B,MAAM,sBAAsB,CAAC,MAAM,KAAK,GAAG,SAAS,CAAC,eA+KhE,CAAC"}
+{"version":3,"file":"getActiveStoriesByTarget.d.ts","sourceRoot":"","sources":["../../../src/storyRepository/observers/getActiveStoriesByTarget.ts"],"names":[],"mappings":"AA6BA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,wBAAwB,WAC3B,MAAM,uBAAuB,YAC3B,MAAM,sBAAsB,CAAC,MAAM,KAAK,GAAG,SAAS,CAAC,eAyKhE,CAAC"}

package/dist/storyRepository/utils/convertRawToStory.d.ts

@@ -1,3 +1,3 @@
-export declare const convertRawStoryToInternalStory: (rawData: Amity.RawStory, isCreated?: boolean) => Amity.InternalStory;
-export declare const convertStoryRawToInternal: (data: Amity.StoryPayload, isCreated?: boolean) => Amity.StoryWithOptimisticPayload;
+export declare const convertRawStoryToInternalStory: (rawData: Amity.RawStory) => Amity.InternalStory;
+export declare const convertStoryRawToInternal: (data: Amity.StoryPayload) => Amity.StoryWithOptimisticPayload;
 //# sourceMappingURL=convertRawToStory.d.ts.map

package/dist/storyRepository/utils/convertRawToStory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convertRawToStory.d.ts","sourceRoot":"","sources":["../../../src/storyRepository/utils/convertRawToStory.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,8BAA8B,YAChC,MAAM,QAAQ,0BAEtB,MAAM,aAQR,CAAC;AAEF,eAAO,MAAM,yBAAyB,SAC9B,MAAM,YAAY,0BAEvB,MAAM,0BAIR,CAAC"}
+{"version":3,"file":"convertRawToStory.d.ts","sourceRoot":"","sources":["../../../src/storyRepository/utils/convertRawToStory.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,8BAA8B,YAAa,MAAM,QAAQ,KAAG,MAAM,aAK9E,CAAC;AAEF,eAAO,MAAM,yBAAyB,SAC9B,MAAM,YAAY,KACvB,MAAM,0BAIR,CAAC"}

package/package.json

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

package/src/client/api/login.ts

@@ -25,6 +25,7 @@ import { onTokenTerminated } from '../events/onTokenTerminated';
 import { setClientToken } from '../utils/setClientToken';
 import { removeChannelMarkerCache } from '../utils/removeChannelMarkerCache';
 import { initializeMessagePreviewSetting } from '../utils/messagePreviewEngine';
+import { ASCError } from '~/core/errors';
 
 /*
  * declared earlier to accomodate case when logging in with a different user
@@ -84,12 +85,34 @@ export const login = async (
   }
 
   // default values
-  params.deviceId ??= await getDeviceId();
+  const defaultDeviceId = await getDeviceId();
 
   try {
-    // @ts-ignore: in that particular case, typing can be
-    // ignored since we enforce default values just before.
-    const { users } = await setClientToken(params);
+    const { users } = await setClientToken({
+      ...params,
+      displayName: params?.displayName || params.userId,
+      deviceId: params?.deviceId || defaultDeviceId,
+    });
+
+    const user = users.find(u => u.userId === params.userId);
+
+    if (user == null) {
+      throw new ASCError(
+        `${params.userId} has not been founded`,
+        Amity.ClientError.UNKNOWN_ERROR,
+        Amity.ErrorLevel.ERROR,
+      );
+    }
+
+    if (user.isDeleted) {
+      terminateClient(Amity.TokenTerminationReason.USER_DELETED);
+      return false;
+    }
+
+    if (user.isGlobalBanned) {
+      terminateClient(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
@@ -99,7 +122,7 @@ export const login = async (
       client.ws.open();
     });
 
-    client.userId = params.userId;
+    client.userId = user.userId;
 
     client.sessionHandler = sessionHandler;
 
@@ -113,7 +136,7 @@ export const login = async (
       sessionHandler!,
     );
 
-    setActiveUser(users[0]);
+    setActiveUser(user);
   } catch (error) {
     /*
      * if getting token failed session state reverts to initial state when app

package/src/client/api/logout.ts

@@ -53,6 +53,11 @@ export const logout = async (): Promise<boolean> => {
   client.token = undefined;
 
   client.http.defaults.headers.common.Authorization = '';
+  client.http.defaults.metadata = {
+    tokenExpiry: '',
+    isGlobalBanned: false,
+    isUserDeleted: false,
+  };
   client.ws.io.opts.query = { token: '' };
 
   /*

package/src/client/utils/setClientToken.ts

@@ -14,7 +14,7 @@ import { getToken } from '../api/getToken';
  * @category private
  * @async
  */
-export const setClientToken = async (params: Parameters<typeof getToken>) => {
+export const setClientToken = async (params: Parameters<typeof getToken>[0]) => {
   const client = getActiveClient();
   // begin establishing session
   setSessionState(Amity.SessionStates.ESTABLISHING);

package/src/commentRepository/api/deleteComment.ts

@@ -7,7 +7,6 @@ import { getPost } from '~/postRepository/api/getPost';
 import { pushToTombstone } from '~/cache/api/pushToTombstone';
 import { scheduleTask } from '~/core/microtasks';
 
-import { getStoryByStoryId } from '~/storyRepository/internalApi/getStoryByStoryId';
 import { getComment } from './getComment';
 
 /* begin_public_function
@@ -49,36 +48,20 @@ export const deleteComment = async (
   // to support hard deletion
   const deleted = { ...comment.data, isDeleted: true };
 
-  if (comment.data.referenceType === 'story') {
-    const story = await getStoryByStoryId(comment.data.referenceId);
+  const post = await getPost(comment.data.referenceId);
 
-    fireEvent('local.story.updated', {
-      stories: [story.data],
-      categories: [],
-      comments: [],
-      communities: [],
-      communityUsers: [],
-      files: [],
-      users: [],
-    });
-  } else {
-    const post = await getPost(comment.data.referenceId);
-
-    // @TODO: Need to separate Local / MQTT later
-    fireEvent('post.updated', {
-      posts: [post.data],
-      categories: [],
-      comments: [],
-      communities: [],
-      communityUsers: [],
-      feeds: [],
-      files: [],
-      postChildren: [],
-      users: [],
-    });
-  }
+  fireEvent('post.updated', {
+    posts: [post.data],
+    categories: [],
+    comments: [],
+    communities: [],
+    communityUsers: [],
+    feeds: [],
+    files: [],
+    postChildren: [],
+    users: [],
+  });
 
-  // @TODO: Need to separate Local / MQTT later
   fireEvent('comment.deleted', {
     comments: [deleted],
     commentChildren: [],

package/src/storyRepository/events/onStoryCreated.ts

@@ -8,7 +8,7 @@ export const onStoryCreated = (callback: Amity.Listener<Amity.InternalStory[]>)
 
   const filter = async (payload: Amity.StoryPayload) => {
     // Apply the necessary field for story payload
-    const convertPayload = convertStoryRawToInternal(payload, true);
+    const convertPayload = convertStoryRawToInternal(payload);
     ingestInCache(convertPayload);
     callback(convertPayload.stories);
   };

package/src/storyRepository/observers/getActiveStoriesByTarget.ts

@@ -137,7 +137,6 @@ export const getActiveStoriesByTarget = (
 
   const processNewData = (
     result: Amity.InternalStory[] | undefined,
-    event: string,
     initial = false,
     loading = false,
     error = false,
@@ -152,14 +151,9 @@ export const getActiveStoriesByTarget = (
     };
 
     if (result) {
-      if (event === Amity.StoryActionType.OnDelete) {
-        const deletedIds = result.map(({ referenceId }) => referenceId);
-        data.data = data.data.filter(refId => !deletedIds.includes(refId!)) || [];
-      } else {
-        data.data = initial
-          ? result.map(getResolver('story'))
-          : [...new Set([...data.data, ...result.map(getResolver('story'))])];
-      }
+      data.data = initial
+        ? result.map(getResolver('story'))
+        : [...new Set([...data.data, ...result.map(getResolver('story'))])];
     }
 
     pushToCache(cacheKey, data.data);
@@ -168,7 +162,7 @@ export const getActiveStoriesByTarget = (
   };
 
   const realtimeRouter = (event: Amity.StoryActionType) => (story: Amity.InternalStory[]) => {
-    processNewData(story, event);
+    processNewData(story);
   };
 
   const reloadData = () => (newData: { referenceIds: Amity.Story['referenceId'][] }) => {
@@ -197,7 +191,7 @@ export const getActiveStoriesByTarget = (
     const query = createQuery(_getActiveStoriesByTarget, params);
 
     runQuery(query, ({ data: result, error, loading }) => {
-      processNewData(result, 'fetch', initial, loading, error);
+      processNewData(result, initial, loading, error);
     });
   };
 

package/src/storyRepository/utils/convertRawToStory.ts

@@ -1,23 +1,16 @@
 // Due to we have optimistic logic, we will use referenceId as a id in SDK instead of storyId
 
-export const convertRawStoryToInternalStory = (
-  rawData: Amity.RawStory,
-  isCreated = false,
-): Amity.InternalStory => {
+export const convertRawStoryToInternalStory = (rawData: Amity.RawStory): Amity.InternalStory => {
   const { storyId, referenceId } = rawData;
 
-  if (!isCreated) {
-    if (referenceId) return { ...rawData, syncState: Amity.SyncState.Synced };
-  }
-
+  if (referenceId) return { ...rawData, syncState: Amity.SyncState.Synced };
   return { ...rawData, syncState: Amity.SyncState.Synced, referenceId: storyId };
 };
 
 export const convertStoryRawToInternal = (
   data: Amity.StoryPayload,
-  isCreated = false,
 ): Amity.StoryWithOptimisticPayload => {
   const { stories } = data;
-  const storiesData = stories.map(story => convertRawStoryToInternalStory(story, isCreated));
+  const storiesData = stories.map(convertRawStoryToInternalStory);
   return { ...data, stories: storiesData };
 };