@amityco/ts-sdk 7.26.1-05b87b67.0 → 7.26.1-0cff400d.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -12,13 +12,11 @@ declare global {
12
12
  EditChannelRatelimitPermission = "EDIT_CHANNEL_RATELIMIT",
13
13
  MuteChannelPermission = "MUTE_CHANNEL",
14
14
  CloseChannelPermission = "CLOSE_CHANNEL",
15
- DeleteChannelPermission = "DELETE_CHANNEL",
16
- ManageNotificationNetworkSettingPermission = "MANAGE_NOTIFICATION_NETWORK_SETTING",
17
15
  AddChannelUserPermission = "ADD_CHANNEL_USER",
18
16
  EditChannelUserPermission = "EDIT_CHANNEL_USER",
19
17
  RemoveChannelUserPermission = "REMOVE_CHANNEL_USER",
20
- MuteUserInsideChannelPermission = "MUTE_USER_INSIDE_CHANNEL",
21
- BanUserFromChannelPermission = "BAN_USER_FROM_CHANNEL",
18
+ MuteChannelUserPermission = "MUTE_CHANNEL_USER",
19
+ BanChannelUserPermission = "BAN_CHANNEL_USER",
22
20
  EditMessagePermission = "EDIT_MESSAGE",
23
21
  DeleteMessagePermission = "DELETE_MESSAGE",
24
22
  EditCommunityPermission = "EDIT_COMMUNITY",
@@ -40,10 +38,8 @@ declare global {
40
38
  EditCommunityCategoryPermission = "EDIT_COMMUNITY_CATEGORY",
41
39
  DeleteCommunityCategoryPermission = "DELETE_COMMUNITY_CATEGORY",
42
40
  ManageStoryPermission = "MANAGE_COMMUNITY_STORY",
43
- CreatePrivilegedPostPermission = "CREATE_PRIVILEGED_POST",
44
- ReviewCommunityPost = "REVIEW_COMMUNITY_POST",
41
+ CreatePrivillegedPostPermission = "CREATE_PRIVILEGED_POST",
45
42
  CreateEventPermission = "CREATE_EVENT",
46
- UpdateEventPermission = "UPDATE_EVENT",
47
43
  DeleteEventPermission = "DELETE_EVENT",
48
44
  CreateEventWithLivestreamPermission = "CREATE_EVENT_WITH_LIVESTREAM",
49
45
  ManageCommunityEventsPermission = "MANAGE_COMMUNITY_EVENTS"
@@ -1 +1 @@
1
- {"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../../src/@types/core/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC;AAEV,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,KAAK,CAAC;QACd,WAAW,UAAU;YACnB,kBAAkB,cAAc;YAChC,iBAAiB,aAAa;YAC9B,oBAAoB,gBAAgB;YACpC,kBAAkB,cAAc;YAChC,oBAAoB,gBAAgB;YACpC,oBAAoB,qBAAqB;YACzC,qBAAqB,iBAAiB;YACtC,8BAA8B,2BAA2B;YACzD,qBAAqB,iBAAiB;YACtC,sBAAsB,kBAAkB;YACxC,uBAAuB,mBAAmB;YAC1C,0CAA0C,wCAAwC;YAClF,wBAAwB,qBAAqB;YAC7C,yBAAyB,sBAAsB;YAC/C,2BAA2B,wBAAwB;YACnD,+BAA+B,6BAA6B;YAC5D,4BAA4B,0BAA0B;YACtD,qBAAqB,iBAAiB;YACtC,uBAAuB,mBAAmB;YAC1C,uBAAuB,mBAAmB;YAC1C,yBAAyB,qBAAqB;YAC9C,6BAA6B,uBAAuB;YACpD,8BAA8B,wBAAwB;YACtD,gCAAgC,0BAA0B;YAC1D,8BAA8B,wBAAwB;YACtD,6BAA6B,uBAAuB;YACpD,0BAA0B,wBAAwB;YAClD,4BAA4B,0BAA0B;YACtD,6BAA6B,2BAA2B;YACxD,+BAA+B,6BAA6B;YAC5D,+BAA+B,wBAAwB;YACvD,iCAAiC,0BAA0B;YAC3D,kCAAkC,2BAA2B;YAC7D,oCAAoC,6BAA6B;YACjE,iCAAiC,8BAA8B;YAC/D,+BAA+B,4BAA4B;YAC3D,iCAAiC,8BAA8B;YAC/D,qBAAqB,2BAA2B;YAChD,8BAA8B,2BAA2B;YACzD,mBAAmB,0BAA0B;YAC7C,qBAAqB,iBAAiB;YACtC,qBAAqB,iBAAiB;YACtC,qBAAqB,iBAAiB;YACtC,mCAAmC,iCAAiC;YACpE,+BAA+B,4BAA4B;SAC5D;QAED,WAAW,gBAAgB;YACzB,mBAAmB,cAAc;YACjC,wBAAwB,oBAAoB;YAC5C,qBAAqB,iBAAiB;YACtC,uBAAuB,oBAAoB;YAC3C,wBAAwB,qBAAqB;YAC7C,2BAA2B,wBAAwB;YACnD,6BAA6B,0BAA0B;YACvD,gCAAgC,6BAA6B;YAC7D,8BAA8B,2BAA2B;YACzD,2BAA2B,wBAAwB;YACnD,4BAA4B,yBAAyB;YACrD,iCAAiC,2BAA2B;YAC5D,oCAAoC,8BAA8B;YAClE,8BAA8B,wBAAwB;YACtD,6BAA6B,sBAAsB;YACnD,mCAAmC,4BAA4B;YAC/D,mCAAmC,4BAA4B;YAC/D,yCAAyC,kCAAkC;YAC3E,2BAA2B,qBAAqB;YAChD,8BAA8B,wBAAwB;YACtD,iCAAiC,gCAAgC;SAClE;QAED,KAAK,IAAI,GAAG;YACV,MAAM,EAAE,MAAM,CAAC;YACf,WAAW,EAAE,MAAM,CAAC;YACpB,WAAW,EAAE,UAAU,EAAE,CAAC;SAC3B,GAAG,KAAK,CAAC,UAAU,GAClB,KAAK,CAAC,UAAU,CAAC;QAEnB,KAAK,iBAAiB,GAAG;YACvB,SAAS,EAAE,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,OAAO,CAAC;YACpE,OAAO,EAAE,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,OAAO,CAAC;YAC5D,WAAW,EAAE,MAAM,OAAO,CAAC;SAC5B,CAAC;KACH;CACF"}
1
+ {"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../../src/@types/core/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC;AAEV,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,KAAK,CAAC;QACd,WAAW,UAAU;YACnB,kBAAkB,cAAc;YAChC,iBAAiB,aAAa;YAC9B,oBAAoB,gBAAgB;YACpC,kBAAkB,cAAc;YAChC,oBAAoB,gBAAgB;YACpC,oBAAoB,qBAAqB;YACzC,qBAAqB,iBAAiB;YACtC,8BAA8B,2BAA2B;YACzD,qBAAqB,iBAAiB;YACtC,sBAAsB,kBAAkB;YACxC,wBAAwB,qBAAqB;YAC7C,yBAAyB,sBAAsB;YAC/C,2BAA2B,wBAAwB;YACnD,yBAAyB,sBAAsB;YAC/C,wBAAwB,qBAAqB;YAC7C,qBAAqB,iBAAiB;YACtC,uBAAuB,mBAAmB;YAC1C,uBAAuB,mBAAmB;YAC1C,yBAAyB,qBAAqB;YAC9C,6BAA6B,uBAAuB;YACpD,8BAA8B,wBAAwB;YACtD,gCAAgC,0BAA0B;YAC1D,8BAA8B,wBAAwB;YACtD,6BAA6B,uBAAuB;YACpD,0BAA0B,wBAAwB;YAClD,4BAA4B,0BAA0B;YACtD,6BAA6B,2BAA2B;YACxD,+BAA+B,6BAA6B;YAC5D,+BAA+B,wBAAwB;YACvD,iCAAiC,0BAA0B;YAC3D,kCAAkC,2BAA2B;YAC7D,oCAAoC,6BAA6B;YACjE,iCAAiC,8BAA8B;YAC/D,+BAA+B,4BAA4B;YAC3D,iCAAiC,8BAA8B;YAC/D,qBAAqB,2BAA2B;YAChD,+BAA+B,2BAA2B;YAC1D,qBAAqB,iBAAiB;YACtC,qBAAqB,iBAAiB;YACtC,mCAAmC,iCAAiC;YACpE,+BAA+B,4BAA4B;SAC5D;QAED,WAAW,gBAAgB;YACzB,mBAAmB,cAAc;YACjC,wBAAwB,oBAAoB;YAC5C,qBAAqB,iBAAiB;YACtC,uBAAuB,oBAAoB;YAC3C,wBAAwB,qBAAqB;YAC7C,2BAA2B,wBAAwB;YACnD,6BAA6B,0BAA0B;YACvD,gCAAgC,6BAA6B;YAC7D,8BAA8B,2BAA2B;YACzD,2BAA2B,wBAAwB;YACnD,4BAA4B,yBAAyB;YACrD,iCAAiC,2BAA2B;YAC5D,oCAAoC,8BAA8B;YAClE,8BAA8B,wBAAwB;YACtD,6BAA6B,sBAAsB;YACnD,mCAAmC,4BAA4B;YAC/D,mCAAmC,4BAA4B;YAC/D,yCAAyC,kCAAkC;YAC3E,2BAA2B,qBAAqB;YAChD,8BAA8B,wBAAwB;YACtD,iCAAiC,gCAAgC;SAClE;QAED,KAAK,IAAI,GAAG;YACV,MAAM,EAAE,MAAM,CAAC;YACf,WAAW,EAAE,MAAM,CAAC;YACpB,WAAW,EAAE,UAAU,EAAE,CAAC;SAC3B,GAAG,KAAK,CAAC,UAAU,GAClB,KAAK,CAAC,UAAU,CAAC;QAEnB,KAAK,iBAAiB,GAAG;YACvB,SAAS,EAAE,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,OAAO,CAAC;YACpE,OAAO,EAAE,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,OAAO,CAAC;YAC5D,WAAW,EAAE,MAAM,OAAO,CAAC;SAC5B,CAAC;KACH;CACF"}
@@ -67,6 +67,7 @@ declare global {
67
67
  getProductCatalogueSetting: () => Promise<Amity.ProductCatalogueSetting>;
68
68
  getForYouFeedSetting: () => Promise<Amity.ForYouFeedSetting>;
69
69
  loginType?: 'accessToken' | 'userId';
70
+ isGloballyBanned?: boolean;
70
71
  };
71
72
  type Device = {
72
73
  deviceId: string;
@@ -86,6 +87,13 @@ declare global {
86
87
  userType: Amity.UserType;
87
88
  files: Amity.File<'image'>[];
88
89
  };
90
+ type GetSessionResponse = {
91
+ users: Amity.RawUser[];
92
+ files: Amity.File<'image'>[];
93
+ roles: Amity.Role[];
94
+ userType: Amity.UserType;
95
+ lastCachePurge?: string;
96
+ };
89
97
  type AccessTokenRenewal = {
90
98
  renew: () => void;
91
99
  renewWithAuthToken: (authToken: string) => void;
@@ -1 +1 @@
1
- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/@types/domains/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/@types/domains/client.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"loginWithAccessToken.d.ts","sourceRoot":"","sources":["../../../src/client/api/loginWithAccessToken.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE;QACJ,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACvC,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;CACH;AAWD;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,oBAAoB,gBAAuB,MAAM,KAAG,QAAQ,OAAO,CAoI/E,CAAC"}
1
+ {"version":3,"file":"loginWithAccessToken.d.ts","sourceRoot":"","sources":["../../../src/client/api/loginWithAccessToken.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE;QACJ,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACvC,SAAS,EAAE,MAAM,CAAC;QAClB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;CACH;AAWD;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,oBAAoB,gBAAuB,MAAM,KAAG,QAAQ,OAAO,CAqH/E,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../../src/client/api/logout.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,MAAM,QAAa,QAAQ,OAAO,CAmD9C,CAAC"}
1
+ {"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../../src/client/api/logout.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,MAAM,QAAa,QAAQ,OAAO,CAoD9C,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"renewTokenWithHandler.d.ts","sourceRoot":"","sources":["../../../src/client/api/renewTokenWithHandler.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB;sBAGd,OAAO;MACvB,QAAQ,IAAI,CAmBf,CAAC"}
1
+ {"version":3,"file":"renewTokenWithHandler.d.ts","sourceRoot":"","sources":["../../../src/client/api/renewTokenWithHandler.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB;sBAGd,OAAO;MACvB,QAAQ,IAAI,CAuBf,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"renewWithAccessToken.d.ts","sourceRoot":"","sources":["../../../src/client/api/renewWithAccessToken.ts"],"names":[],"mappings":"AAoBA,eAAO,MAAM,oBAAoB,gBAAuB,MAAM,kBAiE7D,CAAC"}
1
+ {"version":3,"file":"renewWithAccessToken.d.ts","sourceRoot":"","sources":["../../../src/client/api/renewWithAccessToken.ts"],"names":[],"mappings":"AAoBA,eAAO,MAAM,oBAAoB,gBAAuB,MAAM,kBAwE7D,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"resumeSession.d.ts","sourceRoot":"","sources":["../../../src/client/api/resumeSession.ts"],"names":[],"mappings":"AA0CA,UAAU,MAAM;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAKD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,aAAa,WAChB,MAAM,kBACE,MAAM,cAAc,WAC3B,MAAM,mBAAmB,KACjC,QAAQ,OAAO,CAwIjB,CAAC"}
1
+ {"version":3,"file":"resumeSession.d.ts","sourceRoot":"","sources":["../../../src/client/api/resumeSession.ts"],"names":[],"mappings":"AA0CA,UAAU,MAAM;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAKD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,aAAa,WAChB,MAAM,kBACE,MAAM,cAAc,WAC3B,MAAM,mBAAmB,KACjC,QAAQ,OAAO,CA8HjB,CAAC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=renewTokenWithHandler.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"renewTokenWithHandler.test.d.ts","sourceRoot":"","sources":["../../../../src/client/api/tests/renewTokenWithHandler.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=renewWithAccessToken.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"renewWithAccessToken.test.d.ts","sourceRoot":"","sources":["../../../../src/client/api/tests/renewWithAccessToken.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=validateAccessToken.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"validateAccessToken.test.d.ts","sourceRoot":"","sources":["../../../../src/client/api/tests/validateAccessToken.test.ts"],"names":[],"mappings":""}
@@ -6,6 +6,6 @@ interface Params {
6
6
  accessToken: string;
7
7
  };
8
8
  }
9
- export declare const validateAccessToken: ({ token, userId }: Params) => Promise<any>;
9
+ export declare const validateAccessToken: ({ token, userId }: Params) => Promise<Amity.RawUser>;
10
10
  export {};
11
11
  //# sourceMappingURL=validateAccessToken.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"validateAccessToken.d.ts","sourceRoot":"","sources":["../../../src/client/api/validateAccessToken.ts"],"names":[],"mappings":"AAGA,UAAU,MAAM;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,eAAO,MAAM,mBAAmB,sBAA6B,MAAM,iBAwClE,CAAC"}
1
+ {"version":3,"file":"validateAccessToken.d.ts","sourceRoot":"","sources":["../../../src/client/api/validateAccessToken.ts"],"names":[],"mappings":"AAKA,UAAU,MAAM;IACd,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,eAAO,MAAM,mBAAmB,sBAA6B,MAAM,2BA4ClE,CAAC"}
package/dist/index.cjs.js CHANGED
@@ -5469,6 +5469,7 @@ const logout = async () => {
5469
5469
  client.userId = undefined;
5470
5470
  client.token = undefined;
5471
5471
  client.loginType = undefined;
5472
+ client.isGloballyBanned = false;
5472
5473
  client.http.defaults.headers.common.Authorization = '';
5473
5474
  client.http.defaults.metadata = {
5474
5475
  tokenExpiry: '',
@@ -7734,19 +7735,21 @@ const renewal = () => {
7734
7735
 
7735
7736
  const validateAccessToken = async ({ token, userId }) => {
7736
7737
  const client = getActiveClient();
7737
- // Validate token using sessions API
7738
- await client.http.get('/api/v3/sessions', {
7738
+ // Verify the token and hydrate the caller in a single call.
7739
+ const { data } = await client.http.get('/api/v4/sessions', {
7739
7740
  headers: {
7740
7741
  Authorization: `Bearer ${token.accessToken}`,
7741
7742
  },
7742
7743
  });
7743
- // Get user details
7744
- const { data: { users }, } = await client.http.get(`/api/v3/users/${userId}`, {
7745
- headers: {
7746
- Authorization: `Bearer ${token.accessToken}`,
7747
- },
7748
- });
7749
- const user = users.find((u) => u.userId === userId);
7744
+ const { users, files, userType } = data;
7745
+ const [user] = users;
7746
+ if (userId && (user === null || user === void 0 ? void 0 : user.userId) && userId !== user.userId) {
7747
+ client.log('client/api/validateAccessToken', {
7748
+ message: 'session userId does not match the token userId; using the server value',
7749
+ tokenUserId: userId,
7750
+ sessionUserId: user.userId,
7751
+ });
7752
+ }
7750
7753
  client.http.defaults.headers.common.Authorization = `Bearer ${token.accessToken}`;
7751
7754
  client.http.defaults.metadata = {
7752
7755
  tokenExpiry: token.expiresAt,
@@ -7760,6 +7763,8 @@ const validateAccessToken = async ({ token, userId }) => {
7760
7763
  isUserDeleted: false,
7761
7764
  };
7762
7765
  client.token = token;
7766
+ ingestInCache(prepareUserPayload({ users, files }));
7767
+ setCurrentUserType(userType);
7763
7768
  return user;
7764
7769
  };
7765
7770
 
@@ -7842,14 +7847,6 @@ const loginWithAccessToken = async (accessToken) => {
7842
7847
  setSessionState("notLoggedIn" /* Amity.SessionStates.NOT_LOGGED_IN */);
7843
7848
  throw new ASCError(`User ${userId} has not been found`, 800000 /* Amity.ClientError.UNKNOWN_ERROR */, "error" /* Amity.ErrorLevel.ERROR */);
7844
7849
  }
7845
- if (user.isDeleted) {
7846
- setSessionState("notLoggedIn" /* Amity.SessionStates.NOT_LOGGED_IN */);
7847
- throw new ASCError(`User ${userId} has been deleted`, 800000 /* Amity.ClientError.UNKNOWN_ERROR */, "error" /* Amity.ErrorLevel.ERROR */);
7848
- }
7849
- if (user.isGlobalBanned) {
7850
- setSessionState("notLoggedIn" /* Amity.SessionStates.NOT_LOGGED_IN */);
7851
- throw new ASCError(`User ${userId} is globally banned`, 800000 /* Amity.ClientError.UNKNOWN_ERROR */, "error" /* Amity.ErrorLevel.ERROR */);
7852
- }
7853
7850
  // Set userId and login method flag
7854
7851
  client.userId = user.userId;
7855
7852
  // Set login method flag to 'accessToken' in platform-specific login session
@@ -7863,8 +7860,10 @@ const loginWithAccessToken = async (accessToken) => {
7863
7860
  catch (error) {
7864
7861
  // If error occurs, revert session state to not logged in
7865
7862
  setSessionState("notLoggedIn" /* Amity.SessionStates.NOT_LOGGED_IN */);
7866
- // Re-throw if it's already an ASCError
7867
7863
  if (error instanceof ASCError) {
7864
+ if (error.code === 400312 /* Amity.ServerError.GLOBAL_BAN */) {
7865
+ client.isGloballyBanned = true;
7866
+ }
7868
7867
  throw error;
7869
7868
  }
7870
7869
  // Wrap other errors
@@ -7932,11 +7931,18 @@ const renewWithAccessToken = async (accessToken) => {
7932
7931
  await loginWithAccessToken(accessToken);
7933
7932
  }
7934
7933
  else {
7935
- // about to expire
7936
- await validateAccessToken({
7937
- token: tokenObject,
7938
- userId,
7939
- });
7934
+ try {
7935
+ await validateAccessToken({
7936
+ token: tokenObject,
7937
+ userId,
7938
+ });
7939
+ }
7940
+ catch (error) {
7941
+ if (error instanceof ASCError && error.code === 400312 /* Amity.ServerError.GLOBAL_BAN */) {
7942
+ client.isGloballyBanned = true;
7943
+ }
7944
+ throw error;
7945
+ }
7940
7946
  }
7941
7947
  };
7942
7948
  /* end_public_function */
@@ -7953,6 +7959,9 @@ const renewTokenWithHandler = async ({ useScheduledTask = false, }) => {
7953
7959
  if (!client.userId || !client.accessTokenHandler) {
7954
7960
  return;
7955
7961
  }
7962
+ if (client.isGloballyBanned) {
7963
+ return;
7964
+ }
7956
7965
  try {
7957
7966
  const newToken = await client.accessTokenHandler.onTokenRenew(client.userId);
7958
7967
  if (useScheduledTask) {
@@ -8648,21 +8657,13 @@ const resumeSession = async (params, sessionHandler, config) => {
8648
8657
  if (user == null) {
8649
8658
  throw new ASCError(`${params.userId} has not been found`, 800000 /* Amity.ClientError.UNKNOWN_ERROR */, "error" /* Amity.ErrorLevel.ERROR */);
8650
8659
  }
8651
- if (user.isDeleted) {
8652
- terminateClient("userDeleted" /* Amity.TokenTerminationReason.USER_DELETED */);
8653
- return false;
8654
- }
8655
- if (user.isGlobalBanned) {
8656
- terminateClient("globalBan" /* Amity.TokenTerminationReason.GLOBAL_BAN */);
8657
- return false;
8658
- }
8659
8660
  client.userId = user.userId;
8660
8661
  client.sessionHandler = sessionHandler;
8661
8662
  /*
8662
8663
  * Cannot push to subscriptions as watcher needs to continue working even if
8663
8664
  * token expires
8664
8665
  */
8665
- unsubWatcher = client.accessTokenExpiryWatcher(sessionHandler);
8666
+ unsubWatcher = client.accessTokenExpiryWatcher();
8666
8667
  setActiveUser(user);
8667
8668
  }
8668
8669
  catch (error) {
package/dist/index.esm.js CHANGED
@@ -5469,6 +5469,7 @@ const logout = async () => {
5469
5469
  client.userId = undefined;
5470
5470
  client.token = undefined;
5471
5471
  client.loginType = undefined;
5472
+ client.isGloballyBanned = false;
5472
5473
  client.http.defaults.headers.common.Authorization = '';
5473
5474
  client.http.defaults.metadata = {
5474
5475
  tokenExpiry: '',
@@ -7734,19 +7735,21 @@ const renewal = () => {
7734
7735
 
7735
7736
  const validateAccessToken = async ({ token, userId }) => {
7736
7737
  const client = getActiveClient();
7737
- // Validate token using sessions API
7738
- await client.http.get('/api/v3/sessions', {
7738
+ // Verify the token and hydrate the caller in a single call.
7739
+ const { data } = await client.http.get('/api/v4/sessions', {
7739
7740
  headers: {
7740
7741
  Authorization: `Bearer ${token.accessToken}`,
7741
7742
  },
7742
7743
  });
7743
- // Get user details
7744
- const { data: { users }, } = await client.http.get(`/api/v3/users/${userId}`, {
7745
- headers: {
7746
- Authorization: `Bearer ${token.accessToken}`,
7747
- },
7748
- });
7749
- const user = users.find((u) => u.userId === userId);
7744
+ const { users, files, userType } = data;
7745
+ const [user] = users;
7746
+ if (userId && (user === null || user === void 0 ? void 0 : user.userId) && userId !== user.userId) {
7747
+ client.log('client/api/validateAccessToken', {
7748
+ message: 'session userId does not match the token userId; using the server value',
7749
+ tokenUserId: userId,
7750
+ sessionUserId: user.userId,
7751
+ });
7752
+ }
7750
7753
  client.http.defaults.headers.common.Authorization = `Bearer ${token.accessToken}`;
7751
7754
  client.http.defaults.metadata = {
7752
7755
  tokenExpiry: token.expiresAt,
@@ -7760,6 +7763,8 @@ const validateAccessToken = async ({ token, userId }) => {
7760
7763
  isUserDeleted: false,
7761
7764
  };
7762
7765
  client.token = token;
7766
+ ingestInCache(prepareUserPayload({ users, files }));
7767
+ setCurrentUserType(userType);
7763
7768
  return user;
7764
7769
  };
7765
7770
 
@@ -7842,14 +7847,6 @@ const loginWithAccessToken = async (accessToken) => {
7842
7847
  setSessionState("notLoggedIn" /* Amity.SessionStates.NOT_LOGGED_IN */);
7843
7848
  throw new ASCError(`User ${userId} has not been found`, 800000 /* Amity.ClientError.UNKNOWN_ERROR */, "error" /* Amity.ErrorLevel.ERROR */);
7844
7849
  }
7845
- if (user.isDeleted) {
7846
- setSessionState("notLoggedIn" /* Amity.SessionStates.NOT_LOGGED_IN */);
7847
- throw new ASCError(`User ${userId} has been deleted`, 800000 /* Amity.ClientError.UNKNOWN_ERROR */, "error" /* Amity.ErrorLevel.ERROR */);
7848
- }
7849
- if (user.isGlobalBanned) {
7850
- setSessionState("notLoggedIn" /* Amity.SessionStates.NOT_LOGGED_IN */);
7851
- throw new ASCError(`User ${userId} is globally banned`, 800000 /* Amity.ClientError.UNKNOWN_ERROR */, "error" /* Amity.ErrorLevel.ERROR */);
7852
- }
7853
7850
  // Set userId and login method flag
7854
7851
  client.userId = user.userId;
7855
7852
  // Set login method flag to 'accessToken' in platform-specific login session
@@ -7863,8 +7860,10 @@ const loginWithAccessToken = async (accessToken) => {
7863
7860
  catch (error) {
7864
7861
  // If error occurs, revert session state to not logged in
7865
7862
  setSessionState("notLoggedIn" /* Amity.SessionStates.NOT_LOGGED_IN */);
7866
- // Re-throw if it's already an ASCError
7867
7863
  if (error instanceof ASCError) {
7864
+ if (error.code === 400312 /* Amity.ServerError.GLOBAL_BAN */) {
7865
+ client.isGloballyBanned = true;
7866
+ }
7868
7867
  throw error;
7869
7868
  }
7870
7869
  // Wrap other errors
@@ -7932,11 +7931,18 @@ const renewWithAccessToken = async (accessToken) => {
7932
7931
  await loginWithAccessToken(accessToken);
7933
7932
  }
7934
7933
  else {
7935
- // about to expire
7936
- await validateAccessToken({
7937
- token: tokenObject,
7938
- userId,
7939
- });
7934
+ try {
7935
+ await validateAccessToken({
7936
+ token: tokenObject,
7937
+ userId,
7938
+ });
7939
+ }
7940
+ catch (error) {
7941
+ if (error instanceof ASCError && error.code === 400312 /* Amity.ServerError.GLOBAL_BAN */) {
7942
+ client.isGloballyBanned = true;
7943
+ }
7944
+ throw error;
7945
+ }
7940
7946
  }
7941
7947
  };
7942
7948
  /* end_public_function */
@@ -7953,6 +7959,9 @@ const renewTokenWithHandler = async ({ useScheduledTask = false, }) => {
7953
7959
  if (!client.userId || !client.accessTokenHandler) {
7954
7960
  return;
7955
7961
  }
7962
+ if (client.isGloballyBanned) {
7963
+ return;
7964
+ }
7956
7965
  try {
7957
7966
  const newToken = await client.accessTokenHandler.onTokenRenew(client.userId);
7958
7967
  if (useScheduledTask) {
@@ -8648,21 +8657,13 @@ const resumeSession = async (params, sessionHandler, config) => {
8648
8657
  if (user == null) {
8649
8658
  throw new ASCError(`${params.userId} has not been found`, 800000 /* Amity.ClientError.UNKNOWN_ERROR */, "error" /* Amity.ErrorLevel.ERROR */);
8650
8659
  }
8651
- if (user.isDeleted) {
8652
- terminateClient("userDeleted" /* Amity.TokenTerminationReason.USER_DELETED */);
8653
- return false;
8654
- }
8655
- if (user.isGlobalBanned) {
8656
- terminateClient("globalBan" /* Amity.TokenTerminationReason.GLOBAL_BAN */);
8657
- return false;
8658
- }
8659
8660
  client.userId = user.userId;
8660
8661
  client.sessionHandler = sessionHandler;
8661
8662
  /*
8662
8663
  * Cannot push to subscriptions as watcher needs to continue working even if
8663
8664
  * token expires
8664
8665
  */
8665
- unsubWatcher = client.accessTokenExpiryWatcher(sessionHandler);
8666
+ unsubWatcher = client.accessTokenExpiryWatcher();
8666
8667
  setActiveUser(user);
8667
8668
  }
8668
8669
  catch (error) {