fix(redirect): supports browser origin redirect when not in extension

Author: dvcol

src/services/common/base-client.test.ts

@@ -160,7 +160,7 @@ describe('base-client.ts', () => {
     delete: vi.spyOn(cacheStore, 'delete'),
   };
 
-  const client: TestableBaseClient = new TestableBaseClient({ cacheStore });
+  const client: TestableBaseClient = new TestableBaseClient({ endpoint: 'http://my-endpoint', cacheStore });
   const fetch = vi.spyOn(CancellableFetch, 'fetch').mockResolvedValue(new Response());
 
   const payload = {
@@ -335,7 +335,7 @@ describe('base-client.ts', () => {
 
         const _cacheStore: CacheStore<Response> = new Map();
         _cacheStore.retention = 15;
-        const _client = new TestableBaseClient({ cacheStore: _cacheStore });
+        const _client = new TestableBaseClient({ endpoint: 'http://my-endpoint', cacheStore: _cacheStore });
 
         await _client.endpointWithCache.cached();
         await _client.endpointWithCache.cached();

src/services/common/base-client.ts

@@ -43,7 +43,7 @@ export type BaseSettings<S extends RecursiveRecord = RecursiveRecord> = S & {
   corsPrefix?: string;
 };
 
-export type BaseOptions<S extends RecursiveRecord = RecursiveRecord, R extends Response = Response> = S & {
+export type BaseOptions<S extends BaseSettings = BaseSettings, R extends Response = Response> = S & {
   /** Optional cache store to manage cache read/write */
   cacheStore?: CacheStore<R>;
 };

src/services/tvdb-client/clients/base-tvdb-client.ts

@@ -13,7 +13,15 @@ import type {
 import type { TvdbApi } from '~/services/tvdb-client/api/tvdb-api.endpoints';
 
 import { TraktApiHeaders } from '~/models/trakt/trakt-client.model';
-import { BaseApiHeaders, type BaseBody, BaseClient, BaseHeaderContentType, parseBody, parseUrl } from '~/services/common/base-client';
+import {
+  BaseApiHeaders,
+  type BaseBody,
+  BaseClient,
+  BaseHeaderContentType,
+  injectCorsProxyPrefix,
+  parseBody,
+  parseUrl,
+} from '~/services/common/base-client';
 
 /** Needed to type Object assignment */
 // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging  -- To allow type extension
@@ -80,6 +88,7 @@ export class BaseTvdbClient extends BaseClient<TvdbApiQuery, TvdbApiResponse, Tv
    */
   protected _parseUrl<T extends TvdbApiParam = TvdbApiParam>(template: TvdbApiTemplate<T>, params: T): URL {
     if (this.settings.version && !template.url.startsWith(`/${this.settings.version}`)) template.url = `/${this.settings.version}${template.url}`;
+    injectCorsProxyPrefix(template, this.settings);
     return parseUrl<T>(template, params, this.settings.endpoint);
   }
 

src/settings/traktv.api.ts

@@ -1,5 +1,7 @@
 import type { TraktClientSettings } from '~/models/trakt/trakt-client.model';
 
+import { chromeRuntimeId } from '~/utils/browser/browser.utils';
+
 export const Config = {
   UserAgent: `${import.meta.env.PKG_NAME}/${import.meta.env.PKG_VERSION}`,
 };
@@ -20,12 +22,14 @@ export const Staging = {
 
 const isProd = import.meta.env.PROD;
 
-const client = isProd ? Production : Staging;
+const client = !isProd ? Production : Staging;
+
+const browserRedirect = window.location.href.split('#').at(0) ?? client.RedirectionUrl;
 
 export const traktClientSettings: TraktClientSettings = {
   client_id: client.ID,
   client_secret: client.Secret,
-  redirect_uri: client.RedirectionUrl,
+  redirect_uri: chromeRuntimeId ? client.RedirectionUrl : browserRedirect,
   endpoint: client.TraktEndpoint,
 
   useragent: Config.UserAgent,

src/utils/browser/browser.utils.ts

@@ -5,12 +5,15 @@
  *
  * @param options - The options for the new tab.
  */
-const openTab = (options: chrome.tabs.CreateProperties) => {
-  console.info(options);
-  window.open(options.url, options.active ? '_self' : '_blank');
-};
+const openTab = (options: chrome.tabs.CreateProperties) => window.open(options.url, options.active ? '_self' : '_blank');
 
 /**
  * @see [chrome.tabs.create](https://developer.chrome.com/docs/extensions/reference/tabs/#method-create)
  */
 export const createTab = chrome?.tabs?.create ?? openTab;
+
+/**
+ * The ID of the current extension.
+ * @see [chrome.runtime.id](https://developer.chrome.com/docs/extensions/reference/runtime/#property-id)
+ */
+export const chromeRuntimeId = chrome?.runtime?.id;