Fix JS WrappedTokenResponse type (#1997)

* Fix JS WrappedTokenResponse type * Fix JS WrappedTokenResponse type * Remove ts-ignore
SciPhi-AI · Feb 22, 2025 · d010711 · d010711
1 parent 777cc31
commit d010711
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/js/sdk/package-lock.json b/js/sdk/package-lock.json
diff --git a/js/sdk/package.json b/js/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "r2r-js",
-  "version": "0.4.27",
+  "version": "0.4.28",
   "description": "",
   "main": "dist/index.js",
   "browser": "dist/index.browser.js",

diff --git a/js/sdk/src/r2rClient.ts b/js/sdk/src/r2rClient.ts
@@ -154,12 +154,9 @@ export class r2rClient extends BaseClient {
 
           // Attempt refresh
           try {
-            //@ts-ignore
             const refreshResponse = await this.users.refreshAccessToken();
-            //@ts-ignore
-            const newAccessToken = refreshResponse.results.accessToken?.token;
-            //@ts-ignore
-            const newRefreshToken = refreshResponse.results.refreshToken?.token;
+            const newAccessToken = refreshResponse.results.accessToken.token;
+            const newRefreshToken = refreshResponse.results.refreshToken.token;
 
             // set new tokens
             this.setTokens(newAccessToken, newRefreshToken);

diff --git a/js/sdk/src/types.ts b/js/sdk/src/types.ts
@@ -278,9 +278,16 @@ export interface SettingsResponse {
 
 // User types
 
+export type TokenType = "access" | "refresh";
+
 export interface Token {
-  accessToken: string;
-  refreshToken: string;
+  token: string;
+  tokenType: TokenType;
+}
+
+export interface TokenResponse {
+  accessToken: Token;
+  refreshToken: Token;
 }
 
 export interface User {
@@ -424,7 +431,7 @@ export type WrappedSettingsResponse = ResultsWrapper<SettingsResponse>;
 export type WrappedServerStatsResponse = ResultsWrapper<ServerStats>;
 
 // User Responses
-export type WrappedTokenResponse = ResultsWrapper<Token>;
+export type WrappedTokenResponse = ResultsWrapper<TokenResponse>;
 export type WrappedUserResponse = ResultsWrapper<User>;
 export type WrappedUsersResponse = PaginatedResultsWrapper<User[]>;
 export type WrappedLimitsResponse = ResultsWrapper<LimitsResponse>;

diff --git a/js/sdk/src/v3/clients/collections.ts b/js/sdk/src/v3/clients/collections.ts
@@ -328,11 +328,16 @@ export class CollectionsClient {
    * @param name The name of the collection to retrieve.
    * @returns A promise that resolves with the collection details.
    */
-  async retrieveByName(options: { name: string; ownerId?: string }): Promise<WrappedCollectionResponse> {
+  async retrieveByName(options: {
+    name: string;
+    ownerId?: string;
+  }): Promise<WrappedCollectionResponse> {
     const queryParams: Record<string, any> = {};
     if (options.ownerId) {
       queryParams.owner_id = options.ownerId;
     }
-    return this.client.makeRequest("GET", `collections/name/${options.name}`, { params: queryParams });
+    return this.client.makeRequest("GET", `collections/name/${options.name}`, {
+      params: queryParams,
+    });
   }
 }