switch from cookie-based auth to header (since my api endpoint may be…

… on a different domain)
xiankai · Aug 13, 2023 · 83f7db5 · 83f7db5
1 parent 2e8e4e5
commit 83f7db5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 51 deletions.
diff --git a/src/datasources/txtai.ts b/src/datasources/txtai.ts
@@ -109,17 +109,14 @@ export default class TxtaiDatasource implements AsyncBaseDatasource {
           source_metadata: message[ChatLogFormatSourceMetadata],
         })),
       },
-      firebaseToken: Cookies.get("firebase_token"),
     })
       .then(() => (finished = messages.length))
       .catch((err) => (finished = JSON.stringify(err)));
     return () => finished;
   }
 
   async retrieveBucketListFromStorage(): Promise<Recipient[]> {
-    return DefaultService.recipientsRecipientsGet({
-      firebaseToken: Cookies.get("firebase_token"),
-    });
+    return DefaultService.recipientsRecipientsGet();
   }
 
   async retrieveBucketFromStorage(
@@ -131,7 +128,6 @@ export default class TxtaiDatasource implements AsyncBaseDatasource {
       date: parseDateBucketIntoDateString(date),
       recipient,
       source,
-      firebaseToken: Cookies.get("firebase_token"),
     });
 
     return response.map(this.formatTxtaiResponse);
@@ -144,7 +140,6 @@ export default class TxtaiDatasource implements AsyncBaseDatasource {
     const response = await DefaultService.dayFirstDayGet({
       recipient,
       source,
-      firebaseToken: Cookies.get("firebase_token"),
     });
 
     return response.map(this.formatTxtaiResponse);
@@ -157,7 +152,6 @@ export default class TxtaiDatasource implements AsyncBaseDatasource {
     const response = await DefaultService.dayLastDayGet({
       recipient,
       source,
-      firebaseToken: Cookies.get("firebase_token"),
     });
 
     return response.map(this.formatTxtaiResponse);
@@ -170,7 +164,6 @@ export default class TxtaiDatasource implements AsyncBaseDatasource {
     const response = await DefaultService.deleteDeleteDelete({
       recipient,
       source,
-      firebaseToken: Cookies.get("firebase_token"),
     });
   }
 
@@ -186,7 +179,6 @@ export default class TxtaiDatasource implements AsyncBaseDatasource {
   async searchStorage(query: SearchQuery): Promise<ChatLogFormat[]> {
     const response = await DefaultService.searchSearchGet({
       q: query,
-      firebaseToken: Cookies.get("firebase_token"),
     });
 
     return response.map(this.formatTxtaiResponse);

diff --git a/src/datasources/txtai/generated/core/OpenAPI.ts b/src/datasources/txtai/generated/core/OpenAPI.ts
@@ -1,6 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+import Cookies from 'js-cookie';
 import type { ApiRequestOptions } from './ApiRequestOptions';
 
 type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
@@ -26,6 +27,8 @@ export const OpenAPI: OpenAPIConfig = {
     TOKEN: undefined,
     USERNAME: undefined,
     PASSWORD: undefined,
-    HEADERS: undefined,
+    HEADERS: {
+        'Authorization': `Bearer ${Cookies.get("firebase_token")}`,
+    },
     ENCODE_PATH: undefined,
 };
diff --git a/src/datasources/txtai/generated/services/DefaultService.ts b/src/datasources/txtai/generated/services/DefaultService.ts
@@ -15,20 +15,10 @@ export class DefaultService {
      * @returns string Successful Response
      * @throws ApiError
      */
-    public static recipientsRecipientsGet({
-        firebaseToken,
-    }: {
-        firebaseToken?: string,
-    }): CancelablePromise<Array<string>> {
+    public static recipientsRecipientsGet(): CancelablePromise<Array<string>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/recipients',
-            cookies: {
-                'firebase_token': firebaseToken,
-            },
-            errors: {
-                422: `Validation Error`,
-            },
         });
     }
 
@@ -47,7 +37,6 @@ export class DefaultService {
         order = 'desc',
         recipient = '',
         source = '',
-        firebaseToken,
     }: {
         q: string,
         fromDate?: string,
@@ -58,14 +47,10 @@ export class DefaultService {
         order?: string,
         recipient?: string,
         source?: string,
-        firebaseToken?: string,
     }): CancelablePromise<Array<DocumentDataFull>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/search',
-            cookies: {
-                'firebase_token': firebaseToken,
-            },
             query: {
                 'q': q,
                 'from_date': fromDate,
@@ -92,19 +77,14 @@ export class DefaultService {
         date,
         recipient,
         source,
-        firebaseToken,
     }: {
         date: string,
         recipient: string,
         source: string,
-        firebaseToken?: string,
     }): CancelablePromise<Array<DocumentDataFull>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/day',
-            cookies: {
-                'firebase_token': firebaseToken,
-            },
             query: {
                 'date': date,
                 'recipient': recipient,
@@ -124,18 +104,13 @@ export class DefaultService {
     public static dayFirstDayGet({
         recipient,
         source,
-        firebaseToken,
     }: {
         recipient: string,
         source: string,
-        firebaseToken?: string,
     }): CancelablePromise<Array<DocumentDataFull>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/first_day',
-            cookies: {
-                'firebase_token': firebaseToken,
-            },
             query: {
                 'recipient': recipient,
                 'source': source,
@@ -154,18 +129,13 @@ export class DefaultService {
     public static dayLastDayGet({
         recipient,
         source,
-        firebaseToken,
     }: {
         recipient: string,
         source: string,
-        firebaseToken?: string,
     }): CancelablePromise<Array<DocumentDataFull>> {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/last_day',
-            cookies: {
-                'firebase_token': firebaseToken,
-            },
             query: {
                 'recipient': recipient,
                 'source': source,
@@ -183,17 +153,12 @@ export class DefaultService {
      */
     public static indexIndexPost({
         requestBody,
-        firebaseToken,
     }: {
         requestBody: Documents,
-        firebaseToken?: string,
     }): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/index',
-            cookies: {
-                'firebase_token': firebaseToken,
-            },
             body: requestBody,
             mediaType: 'application/json',
             errors: {
@@ -210,18 +175,13 @@ export class DefaultService {
     public static deleteDeleteDelete({
         recipient,
         source,
-        firebaseToken,
     }: {
         recipient: string,
         source: string,
-        firebaseToken?: string,
     }): CancelablePromise<any> {
         return __request(OpenAPI, {
             method: 'DELETE',
             url: '/delete',
-            cookies: {
-                'firebase_token': firebaseToken,
-            },
             query: {
                 'recipient': recipient,
                 'source': source,