revert token changes

Author: vagruchi

src/ApiClient.ts

@@ -1,11 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import {
-  ApiConfig,
-  RequestMetadata,
-  StreamError,
-  UserTokenPayload,
-} from './types';
-import { JWTUserToken } from './utils/create-token';
+import { ApiConfig, RequestMetadata, StreamError } from './types';
 import { APIError } from './gen/models';
 import { getRateLimitFromResponseHeader } from './utils/rate-limit';
 
@@ -153,50 +147,4 @@ export class ApiClient {
 
     return newParams.join('&');
   };
-
-  /**
-   *
-   * @param payload
-   * - user_id - the id of the user the token is for
-   * - validity_in_seconds - how many seconds is the token valid for (starting from issued at), by default it's 1 hour, dicarded if exp is provided
-   * - exp - when the token expires, unix timestamp in seconds
-   * - iat - issued at date of the token, unix timestamp in seconds, by default it's now
-   */
-  generateUserToken = (
-    payload: {
-      user_id: string;
-      validity_in_seconds?: number;
-      exp?: number;
-      iat?: number;
-    } & Record<string, unknown>,
-  ) => {
-    if (!this.apiConfig.secret) {
-      throw new Error('API secret is not set');
-    }
-
-    const defaultIat = Math.floor((Date.now() - 1000) / 1000);
-    payload.iat = payload.iat ?? defaultIat;
-    const validityInSeconds = payload.validity_in_seconds ?? 60 * 60;
-    payload.exp = payload.exp ?? payload.iat + validityInSeconds;
-
-    return JWTUserToken(this.apiConfig.secret, payload as UserTokenPayload);
-  };
-
-  createToken = (
-    userID: string,
-    exp = Math.round(Date.now() / 1000) + 60 * 60,
-    iat = Math.floor((Date.now() - 1000) / 1000),
-  ) => {
-    if (!this.apiConfig.secret) {
-      throw new Error('API secret is not set');
-    }
-
-    const payload: UserTokenPayload = {
-      user_id: userID,
-      exp,
-      iat,
-    };
-
-    return JWTUserToken(this.apiConfig.secret, payload);
-  };
 }

src/StreamCall.ts

@@ -57,7 +57,9 @@ export class StreamCall extends CallApi {
       );
     }
 
-    const token = this.videoApi.apiClient.createToken(userID, undefined);
+    const token = this.streamClient.generateUserToken({
+      user_id: userID,
+    });
     const segments = token.split('.');
     if (segments.length !== 3) {
       throw new Error('Invalid token format');

src/StreamClient.ts

@@ -3,7 +3,7 @@ import { CommonApi } from './gen/common/CommonApi';
 import { StreamVideoClient } from './StreamVideoClient';
 import crypto from 'crypto';
 import { StreamChatClient } from './StreamChatClient';
-import { CallTokenPayload } from './types';
+import { CallTokenPayload, UserTokenPayload } from './types';
 import {
   FileUploadRequest,
   ImageUploadRequest,
@@ -54,7 +54,6 @@ export class StreamClient extends CommonApi {
       baseUrl: chatBaseUrl,
       timeout,
       agent: config?.agent as RequestInit['dispatcher'],
-      secret,
     });
 
     const videoApiClient = new ApiClient({
@@ -63,7 +62,6 @@ export class StreamClient extends CommonApi {
       baseUrl: videoBaseUrl,
       timeout,
       agent: config?.agent as RequestInit['dispatcher'],
-      secret,
     });
 
     const feedsApiClient = new ApiClient({
@@ -72,7 +70,6 @@ export class StreamClient extends CommonApi {
       baseUrl: feedsBaseUrl,
       timeout,
       agent: config?.agent as RequestInit['dispatcher'],
-      secret,
     });
 
     super(chatApiClient);
@@ -139,7 +136,14 @@ export class StreamClient extends CommonApi {
       exp?: number;
       iat?: number;
     } & Record<string, unknown>,
-  ) => this.apiClient.generateUserToken(payload);
+  ) => {
+    const defaultIat = Math.floor((Date.now() - 1000) / 1000);
+    payload.iat = payload.iat ?? defaultIat;
+    const validityInSeconds = payload.validity_in_seconds ?? 60 * 60;
+    payload.exp = payload.exp ?? payload.iat + validityInSeconds;
+
+    return JWTUserToken(this.secret, payload as UserTokenPayload);
+  };
 
   /**
    *
@@ -175,7 +179,15 @@ export class StreamClient extends CommonApi {
     userID: string,
     exp = Math.round(Date.now() / 1000) + 60 * 60,
     iat = Math.floor((Date.now() - 1000) / 1000),
-  ) => this.apiClient.createToken(userID, exp, iat);
+  ) => {
+    const payload: UserTokenPayload = {
+      user_id: userID,
+      exp,
+      iat,
+    };
+
+    return JWTUserToken(this.secret, payload);
+  };
 
   /**
    *