fix(proxy): adds cors proxy when in browser

Author: dvcol

.github/workflows/deploy.yml

@@ -26,8 +26,8 @@ jobs:
     runs-on: ubuntu-latest
 
     environment:
-      name: about-me
-      url: https://dvcol.github.io/about-me/
+      name: trakt-extension
+      url: https://dvcol.github.io/trakt-extension/
 
     steps:
       - name: Checkout branch ${{ github.ref }}

src/components/views/login/LoginComponent.vue

@@ -17,12 +17,8 @@ const router = useRouter();
 const { isAuthenticated } = useAuthSettingsStoreRefs();
 
 onMounted(() => {
-  console.info('authResponse:', route.query);
   const { redirect } = route.query;
-  if (redirect) {
-    console.info('redirect:', redirect, isAuthenticated.value);
-    router.push(route.query.redirect as string);
-  }
+  if (redirect) router.push(route.query.redirect as string);
 });
 
 const redirect = async () => {

src/services/trakt.service.ts

@@ -82,7 +82,9 @@ export class TraktService {
   }
 
   static async approve(params: TraktAuthenticationApprove = {}) {
-    const url = this.traktClient.redirectToAuthenticationUrl(params);
+    const url = this.traktClient
+      .redirectToAuthenticationUrl(params)
+      .replace(`${traktClientSettings.corsProxy}/${traktClientSettings.corsPrefix}`, traktClientSettings.endpoint);
     return createTab({ url });
   }
 

src/settings/traktv.api.ts

@@ -1,5 +1,6 @@
 import type { TraktClientSettings } from '~/models/trakt/trakt-client.model';
 
+import { WebConfig } from '~/settings/web.config';
 import { chromeRuntimeId } from '~/utils/browser/browser.utils';
 
 export const Config = {
@@ -24,13 +25,19 @@ const isProd = import.meta.env.PROD;
 
 const client = isProd ? Production : Staging;
 
-const browserRedirect = window.location.href.split('#').at(0) ?? client.RedirectionUrl;
-
-export const traktClientSettings: TraktClientSettings = {
+const traktClientSettings: TraktClientSettings = {
   client_id: client.ID,
   client_secret: client.Secret,
-  redirect_uri: chromeRuntimeId ? client.RedirectionUrl : browserRedirect,
+  redirect_uri: client.RedirectionUrl,
   endpoint: client.TraktEndpoint,
 
   useragent: Config.UserAgent,
 };
+
+if (!chromeRuntimeId) {
+  traktClientSettings.redirect_uri = window.location.origin + (import.meta.env.VITE_BASE ? `/${import.meta.env.VITE_BASE}` : '');
+  traktClientSettings.corsProxy = WebConfig.CorsProxy;
+  traktClientSettings.corsPrefix = WebConfig.CorsPrefix.trakt;
+}
+
+export { traktClientSettings };

vitest.setup.ts

@@ -1 +1 @@
-global.chrome = {} as typeof chrome;
+global.chrome = { runtime: { id: 'extension-id' } } as typeof chrome;