@amityco/ts-sdk-react-native 6.27.0 → 6.28.0

package/dist/postRepository/api/editPost.d.ts

@@ -15,7 +15,7 @@
  * @category Post API
  * @async
  */
-export declare const editPost: <T extends Amity.PostContentType>(postId: Amity.Post['postId'], patch: Partial<Pick<Amity.Post<any>, "data" | "metadata" | "mentionees" | "tags">> & {
+export declare const editPost: <T extends string>(postId: Amity.Post['postId'], patch: Partial<Pick<Amity.Post<any>, "data" | "metadata" | "mentionees" | "tags">> & {
     attachments?: {
         type: T;
         fileId: Amity.File['fileId'];

package/dist/postRepository/api/editPost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editPost.d.ts","sourceRoot":"","sources":["../../../src/postRepository/api/editPost.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,QAAQ,4CACX,MAAM,IAAI,CAAC,QAAQ,CAAC;;;gBAIhB,UAAU,CAAC,QAAQ,CAAC;;MAG/B,QAAQ,MAAM,MAAM,CAAC,MAAM,IAAI,CAAC,CAsBlC,CAAC"}
+{"version":3,"file":"editPost.d.ts","sourceRoot":"","sources":["../../../src/postRepository/api/editPost.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,QAAQ,6BACX,MAAM,IAAI,CAAC,QAAQ,CAAC;;;gBAIhB,UAAU,CAAC,QAAQ,CAAC;;MAG/B,QAAQ,MAAM,MAAM,CAAC,MAAM,IAAI,CAAC,CAsBlC,CAAC"}

package/dist/postRepository/api/updatePost.d.ts

@@ -15,7 +15,7 @@
  * @category Post API
  * @async
  */
-export declare const updatePost: <T extends Amity.PostContentType>(postId: Amity.Post['postId'], patch: Partial<Pick<Amity.Post<any>, "data" | "metadata" | "mentionees" | "tags">> & {
+export declare const updatePost: <T extends string>(postId: Amity.Post['postId'], patch: Partial<Pick<Amity.Post<any>, "data" | "metadata" | "mentionees" | "tags">> & {
     attachments?: {
         type: T;
         fileId: Amity.File['fileId'];

package/dist/postRepository/api/updatePost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updatePost.d.ts","sourceRoot":"","sources":["../../../src/postRepository/api/updatePost.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,UAAU,4CACb,MAAM,IAAI,CAAC,QAAQ,CAAC;;;gBAIhB,UAAU,CAAC,QAAQ,CAAC;;MAG/B,QAAQ,MAAM,MAAM,CAAC,MAAM,IAAI,CAAC,CA0BlC,CAAC"}
+{"version":3,"file":"updatePost.d.ts","sourceRoot":"","sources":["../../../src/postRepository/api/updatePost.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,UAAU,6BACb,MAAM,IAAI,CAAC,QAAQ,CAAC;;;gBAIhB,UAAU,CAAC,QAAQ,CAAC;;MAG/B,QAAQ,MAAM,MAAM,CAAC,MAAM,IAAI,CAAC,CA0BlC,CAAC"}

package/dist/utils/linkedObject/categoryLinkedObject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"categoryLinkedObject.d.ts","sourceRoot":"","sources":["../../../src/utils/linkedObject/categoryLinkedObject.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,aAAc,MAAM,gBAAgB,KAAG,MAAM,QAqC7E,CAAC"}
+{"version":3,"file":"categoryLinkedObject.d.ts","sourceRoot":"","sources":["../../../src/utils/linkedObject/categoryLinkedObject.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,aAAc,MAAM,gBAAgB,KAAG,MAAM,QAe7E,CAAC"}

package/dist/utils/linkedObject/userLinkedObject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userLinkedObject.d.ts","sourceRoot":"","sources":["../../../src/utils/linkedObject/userLinkedObject.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,gBAAgB,SAAU,MAAM,YAAY,KAAG,MAAM,IAiCjE,CAAC"}
+{"version":3,"file":"userLinkedObject.d.ts","sourceRoot":"","sources":["../../../src/utils/linkedObject/userLinkedObject.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,gBAAgB,SAAU,MAAM,YAAY,KAAG,MAAM,IAcjE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk-react-native",
-  "version": "6.27.0",
+  "version": "6.28.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/domains/file.ts

@@ -26,8 +26,15 @@ export const VideoSize = Object.freeze({
   ORIGINAL: 'original',
 });
 
+export enum FileAccessTypeEnum {
+  PUBLIC = 'public',
+  NETWORK = 'network',
+}
+
 declare global {
   namespace Amity {
+    type FileAccessType = `${FileAccessTypeEnum}`;
+
     type FileType = ValueOf<typeof FileType>;
 
     type VideoResolution = ValueOf<typeof VideoResolution>;
@@ -73,6 +80,7 @@ declare global {
         mimeType: string;
         metadata: MetadataFor<T>;
       };
+      accessType: FileAccessType;
     } & (T extends 'video' ? VideoFileExtraPayload : unknown) &
       Amity.Timestamps &
       Amity.SoftDelete;

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

@@ -12,7 +12,7 @@ declare global {
     // bad hack until we get proper feed objects in backend
     type PostTargetType = Amity.Feed['targetType'] | 'content';
 
-    type PostContentType = ValueOf<typeof PostContentType>;
+    type PostContentType = ValueOf<typeof PostContentType> | string;
 
     type PostActionType =
       | 'onFetch'
@@ -26,7 +26,7 @@ declare global {
       | 'onReactionAdded'
       | 'onReactionRemoved';
 
-    type InternalPost<T extends PostContentType | string = any> = {
+    type InternalPost<T extends PostContentType = any> = {
       postId: string;
       postedUserId: Amity.InternalUser['userId']; // API-FIX: it should be "userId"
       parentId: Amity.InternalPost['postId'];
@@ -59,8 +59,7 @@ declare global {
       };
     };
 
-    type Post<T extends PostContentType | string = any> = Amity.InternalPost<T> &
-      Amity.PostLinkObject;
+    type Post<T extends PostContentType = any> = Amity.InternalPost<T> & Amity.PostLinkObject;
 
     type QueryPosts = {
       targetId: string;

package/src/client/api/getToken.ts

@@ -14,11 +14,17 @@ import { getDeviceInfo } from '~/core/device';
  * @category Client API
  * @hidden
  */
-export const getToken = async (params: {
-  userId: Amity.InternalUser['userId'];
-  displayName?: Amity.InternalUser['displayName'];
-  authToken?: string;
-  deviceId: Amity.Device['deviceId'];
+export const getToken = async ({
+  params,
+  options,
+}: {
+  params: {
+    userId: Amity.InternalUser['userId'];
+    displayName?: Amity.InternalUser['displayName'];
+    authToken?: string;
+    deviceId: Amity.Device['deviceId'];
+  };
+  options?: { setAccessTokenCookie?: boolean };
 }) => {
   const client = getActiveClient();
   client.log('client/api/getToken', params);
@@ -32,8 +38,10 @@ export const getToken = async (params: {
       deviceInfo,
     },
     {
-      // @ts-ignore
-      headers: { 'X-API-Key': client.apiKey },
+      headers: {
+        'X-API-Key': client.apiKey,
+        'set-access-token-cookie': options?.setAccessTokenCookie || false,
+      },
     },
   );
 

package/src/client/api/index.ts

@@ -19,3 +19,4 @@ export * from './enableUnreadCount';
 
 export * from './registerPushNotification';
 export * from './unregisterPushNotification';
+export * from './setUploadedFileAccessType';

package/src/client/api/login.ts

@@ -18,8 +18,6 @@ import { getActiveClient } from './activeClient';
 import { terminateClient } from './terminateClient';
 import { setActiveUser } from './activeUser';
 
-import { setSessionState } from './setSessionState';
-
 import { onClientBanned } from '../events';
 import { onTokenExpired } from '../events/onTokenExpired';
 import { onTokenTerminated } from '../events/onTokenTerminated';
@@ -29,6 +27,7 @@ import { removeChannelMarkerCache } from '../utils/removeChannelMarkerCache';
 import { initializeMessagePreviewSetting } from '../utils/messagePreviewEngine';
 import { startMarkerSync } from '../utils/markerSyncEngine';
 import { ASCError } from '~/core/errors';
+import SessionWatcher from '../utils/SessionWatcher';
 
 /*
  * declared earlier to accomodate case when logging in with a different user
@@ -92,9 +91,14 @@ export const login = async (
 
   try {
     const { users } = await setClientToken({
-      ...params,
-      displayName: params?.displayName,
-      deviceId: params?.deviceId || defaultDeviceId,
+      params: {
+        ...params,
+        displayName: params?.displayName,
+        deviceId: params?.deviceId || defaultDeviceId,
+      },
+      options: {
+        setAccessTokenCookie: true,
+      },
     });
 
     const user = users.find(u => u.userId === params.userId);
@@ -139,7 +143,7 @@ export const login = async (
      * if getting token failed session state reverts to initial state when app
      * is first launched
      */
-    setSessionState(Amity.SessionStates.NOT_LOGGED_IN);
+    SessionWatcher.getInstance().setSessionState(Amity.SessionStates.NOT_LOGGED_IN);
 
     // pass error down tree so the calling function handle it
     throw error;
@@ -181,7 +185,7 @@ export const login = async (
       }),
 
       onTokenExpired(state => {
-        setSessionState(state);
+        SessionWatcher.getInstance().setSessionState(state);
 
         logout();
 

package/src/client/api/logout.ts

@@ -60,6 +60,10 @@ export const logout = async (): Promise<boolean> => {
   };
   client.ws.io.opts.query = { token: '' };
 
+  if (typeof document !== 'undefined') {
+    document.cookie = '_ascSession=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
+  }
+
   /*
    * 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

package/src/client/api/renewal.ts

@@ -40,7 +40,12 @@ export const renewal = (): Amity.AccessTokenRenewal => {
     } else {
       // about to expire
 
-      await refreshToken(params);
+      await refreshToken({
+        params,
+        options: {
+          setAccessTokenCookie: true,
+        },
+      });
     }
 
     tokenRenewed = true;

package/src/client/api/setUploadedFileAccessType.ts

@@ -0,0 +1,5 @@
+import GlobalFileAccessType from '~/client/utils/GlobalFileAccessType';
+
+export function setUploadedFileAccessType(accessType: Amity.FileAccessType) {
+  GlobalFileAccessType.getInstance().setFileAccessType(accessType);
+}

package/src/client/api/tests/getToken.test.ts

@@ -13,7 +13,7 @@ describe('getToken', () => {
     const mockApi = jest.fn().mockResolvedValue(sessionResponse);
     client.http.post = mockApi;
 
-    await getToken(params);
+    await getToken({ params });
     const [recieved] = mockApi.mock.lastCall;
 
     expect(recieved).toBe(expected);
@@ -23,7 +23,7 @@ describe('getToken', () => {
     const expected = sessionResponse.data;
     client.http.post = jest.fn().mockResolvedValue(sessionResponse);
 
-    const recieved = await getToken(params);
+    const recieved = await getToken({ params });
 
     expect(recieved).toStrictEqual(expected);
   });
@@ -31,6 +31,6 @@ describe('getToken', () => {
   test('it should throw error', async () => {
     client.http.post = jest.fn().mockRejectedValue(new Error('error'));
 
-    await expect(getToken(params)).rejects.toThrow();
+    await expect(getToken({ params })).rejects.toThrow();
   });
 });

package/src/client/utils/GlobalFileAccessType.ts

@@ -0,0 +1,23 @@
+import { FileAccessTypeEnum } from '~/@types';
+
+export class GlobalFileAccessType {
+  #fileAccessType: Amity.FileAccessType = FileAccessTypeEnum.PUBLIC;
+
+  public setFileAccessType(fileAccessType: Amity.FileAccessType) {
+    this.#fileAccessType = fileAccessType;
+  }
+
+  public getFileAccessType() {
+    return this.#fileAccessType;
+  }
+}
+
+let instance: GlobalFileAccessType;
+export default {
+  getInstance: () => {
+    if (!instance) {
+      instance = new GlobalFileAccessType();
+    }
+    return instance;
+  },
+};

package/src/fileRepository/api/createFile.ts

@@ -1,6 +1,7 @@
 import { getActiveClient } from '~/client/api';
 
 import { ingestInCache } from '~/cache/api/ingestInCache';
+import GlobalFileAccessType from '~/client/utils/GlobalFileAccessType';
 
 /**
  * ```js
@@ -28,6 +29,9 @@ export const createFile = async <T extends Amity.FileType = any>(
 
   if (!files.length) throw new Error('The formData object must have a `files` key.');
 
+  const accessType = GlobalFileAccessType.getInstance().getFileAccessType();
+  formData.append('accessType', accessType);
+
   formData.append('preferredFilename', (files[0] as File).name);
 
   const headers =

package/src/fileRepository/api/createImage.ts

@@ -1,5 +1,6 @@
 import { getActiveClient } from '~/client/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
+import GlobalFileAccessType from '~/client/utils/GlobalFileAccessType';
 
 /**
  * ```js
@@ -27,6 +28,9 @@ export const createImage = async (
 
   if (!files.length) throw new Error('The formData object must have a `files` key.');
 
+  const accessType = GlobalFileAccessType.getInstance().getFileAccessType();
+  formData.append('accessType', accessType);
+
   formData.append('preferredFilename', (files[0] as File).name);
 
   const headers =

package/src/fileRepository/api/createVideo.ts

@@ -1,6 +1,7 @@
 import { getActiveClient } from '~/client/api';
 
 import { ingestInCache } from '~/cache/api/ingestInCache';
+import GlobalFileAccessType from '~/client/utils/GlobalFileAccessType';
 
 /**
  * ```js
@@ -30,6 +31,9 @@ export const createVideo = async (
 
   if (!files.length) throw new Error('The formData object must have a `files` key.');
 
+  const accessType = GlobalFileAccessType.getInstance().getFileAccessType();
+  formData.append('accessType', accessType);
+
   formData.append('preferredFilename', (files[0] as File).name);
 
   if (feedType) {

package/src/fileRepository/api/uploadFile.ts

@@ -1,6 +1,7 @@
 import { getActiveClient } from '~/client/api';
 
 import { ingestInCache } from '~/cache/api/ingestInCache';
+import GlobalFileAccessType from '~/client/utils/GlobalFileAccessType';
 
 /* begin_public_function
   id: file.upload.file
@@ -31,6 +32,9 @@ export const uploadFile = async <T extends Amity.FileType = any>(
 
   if (!files.length) throw new Error('The formData object must have a `files` key.');
 
+  const accessType = GlobalFileAccessType.getInstance().getFileAccessType();
+  formData.append('accessType', accessType);
+
   formData.append('preferredFilename', (files[0] as File).name);
 
   const headers =

package/src/fileRepository/api/uploadImage.ts

@@ -1,6 +1,7 @@
 import { getActiveClient } from '~/client/api';
 
 import { ingestInCache } from '~/cache/api/ingestInCache';
+import GlobalFileAccessType from '~/client/utils/GlobalFileAccessType';
 
 /* begin_public_function
   id: file.upload.image
@@ -31,6 +32,9 @@ export const uploadImage = async (
 
   if (!files.length) throw new Error('The formData object must have a `files` key.');
 
+  const accessType = GlobalFileAccessType.getInstance().getFileAccessType();
+  formData.append('accessType', accessType);
+
   formData.append('preferredFilename', (files[0] as File).name);
 
   const headers =

package/src/fileRepository/api/uploadVideo.ts

@@ -1,6 +1,7 @@
 import { getActiveClient } from '~/client/api';
 
 import { ingestInCache } from '~/cache/api/ingestInCache';
+import GlobalFileAccessType from '~/client/utils/GlobalFileAccessType';
 
 /* begin_public_function
   id: file.upload.video, file.upload.audio
@@ -33,6 +34,9 @@ export const uploadVideo = async (
 
   if (!files.length) throw new Error('The formData object must have a `files` key.');
 
+  const accessType = GlobalFileAccessType.getInstance().getFileAccessType();
+  formData.append('accessType', accessType);
+
   formData.append('preferredFilename', (files[0] as File).name);
 
   if (feedType) {

package/src/utils/linkedObject/categoryLinkedObject.ts

@@ -3,38 +3,16 @@ import { pullFromCache } from '~/cache/api';
 export const categoryLinkedObject = (category: Amity.InternalCategory): Amity.Category => {
   return {
     ...category,
-    get avatar(): Amity.File<'image'> | null {
-      if (!category.avatarFileId) return null;
-      let avatar: Amity.File<'image'> = {
-        fileId: category.avatarFileId?.toString() ? category.avatarFileId.toString() : '',
-        type: 'image',
-        fileUrl: '',
-        createdAt: '',
-        attributes: {
-          name: '',
-          extension: '',
-          size: '',
-          mimeType: '',
-          metadata: {
-            exif: {},
-            gps: {},
-            width: 0,
-            height: 0,
-            isFull: false,
-          },
-        },
-      };
-      const cacheData = pullFromCache<Amity.File<'image'>>([
+    get avatar(): Amity.File<'image'> | undefined {
+      if (!category.avatarFileId) return undefined;
+
+      const avatar = pullFromCache<Amity.File<'image'>>([
         'file',
         'get',
         `${category.avatarFileId}`,
-      ]);
-
-      if (cacheData?.data) {
-        avatar = cacheData?.data;
-      }
+      ])?.data;
 
-      return avatar as Amity.File<'image'>;
+      return avatar;
     },
   };
 };

package/src/utils/linkedObject/userLinkedObject.ts

@@ -3,34 +3,15 @@ import { pullFromCache } from '~/cache/api/pullFromCache';
 export const userLinkedObject = (user: Amity.InternalUser): Amity.User => {
   return {
     ...user,
-    get avatar(): Amity.File<'image'> | null {
-      if (!user.avatarFileId) return null;
-      let avatar: Amity.File<'image'> = {
-        fileId: user.avatarFileId?.toString() ? user.avatarFileId.toString() : '',
-        type: 'image',
-        fileUrl: '',
-        createdAt: '',
-        attributes: {
-          name: '',
-          extension: '',
-          size: '',
-          mimeType: '',
-          metadata: {
-            exif: {},
-            gps: {},
-            width: 0,
-            height: 0,
-            isFull: false,
-          },
-        },
-      };
-      const cacheData = pullFromCache<Amity.File<'image'>>(['file', 'get', `${user.avatarFileId}`]);
+    get avatar(): Amity.File<'image'> | undefined {
+      if (!user.avatarFileId) return undefined;
+      const avatar = pullFromCache<Amity.File<'image'>>([
+        'file',
+        'get',
+        `${user.avatarFileId}`,
+      ])?.data;
 
-      if (cacheData?.data) {
-        avatar = cacheData?.data;
-      }
-
-      return avatar as Amity.File<'image'>;
+      return avatar;
     },
   };
 };