fix: setup correct URL for prod/dev proxies

FrontMen · Aug 3, 2021 · 28b8bde · 28b8bde
1 parent 4e9c16a
commit 28b8bde
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 17 deletions.
diff --git a/helpers/api.ts b/helpers/api.ts
@@ -0,0 +1,7 @@
+import {NuxtRuntimeConfig} from '@nuxt/types/config/runtime';
+
+export default function ($config: NuxtRuntimeConfig) {
+  return $config.isDevelopment
+    ? '/api/v1'
+    : 'https://bridge.hosted-tools.com/api/v1';
+}
diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -86,10 +86,13 @@ export default defineNuxtConfig({
     proxy: true,
   },
 
-  proxy: [
-    'https://bridge.hosted-tools.com/api/v1',
-    'https://auth.hosted-tools.com/api/get-token',
-  ],
+  proxy:
+    process.env.NODE_ENV === 'development'
+      ? {
+          '/api/v1': 'https://bridge.hosted-tools.com',
+          '/api/get-token': 'https://auth.hosted-tools.com',
+        }
+      : [],
 
   // Build Configuration (https://go.nuxtjs.dev/config-build)
   build: {},

diff --git a/plugins/services.ts b/plugins/services.ts
@@ -10,14 +10,14 @@ import TimesheetsService from '~/services/timesheets-service';
 import MailService from '~/services/mail-service';
 import AuthService from '~/services/auth-service';
 
-export default defineNuxtPlugin(({$fire, $axios}, inject) => {
+export default defineNuxtPlugin(({$fire, $axios, $config}, inject) => {
   inject('customersService', new CustomersService($fire));
   inject('holidaysService', new HolidaysService($fire));
   inject('timeRecordsService', new TimeRecordsService($fire));
   inject('travelRecordsService', new TravelRecordsService($fire));
   inject('employeesService', new EmployeesService($fire));
-  inject('workSchemeService', new WorkSchemeService($axios));
+  inject('workSchemeService', new WorkSchemeService($axios, $config));
   inject('timesheetsService', new TimesheetsService($fire));
   inject('mailService', new MailService($axios));
-  inject('authService', new AuthService($fire, $axios));
+  inject('authService', new AuthService($fire, $axios, $config));
 });
diff --git a/services/auth-service.ts b/services/auth-service.ts
@@ -1,16 +1,23 @@
+import {NuxtRuntimeConfig} from '@nuxt/types/config/runtime';
 import {NuxtAxiosInstance} from '@nuxtjs/axios';
 import {NuxtFireInstance} from '@nuxtjs/firebase';
 import Cookies from 'js-cookie';
 import jwtDecode from 'jwt-decode';
+import ApiUrl from '~/helpers/api';
 
 export default class AuthService {
   fire: NuxtFireInstance;
   axios: NuxtAxiosInstance;
-  ApiUrl = '/api/v1';
+  config: NuxtRuntimeConfig;
 
-  constructor(fire: NuxtFireInstance, axios: NuxtAxiosInstance) {
+  constructor(
+    fire: NuxtFireInstance,
+    axios: NuxtAxiosInstance,
+    config: NuxtRuntimeConfig
+  ) {
     this.fire = fire;
     this.axios = axios;
+    this.config = config;
   }
 
   setAuthCookie(cookieData: string, expires: Date): void {
@@ -64,9 +71,12 @@ export default class AuthService {
   }
 
   async getUserInfo() {
-    const employeeId = await this.axios.$get(`${this.ApiUrl}/users/me`, {
-      withCredentials: true,
-    });
+    const employeeId = await this.axios.$get(
+      `${ApiUrl(this.config)}/users/me`,
+      {
+        withCredentials: true,
+      }
+    );
     return employeeId;
   }
 }
diff --git a/services/work-scheme-service.ts b/services/work-scheme-service.ts
@@ -1,13 +1,16 @@
 import {format} from 'date-fns';
 
+import {NuxtRuntimeConfig} from '@nuxt/types/config/runtime';
 import {NuxtAxiosInstance} from '@nuxtjs/axios';
+import ApiUrl from '~/helpers/api';
 
 export default class WorkSchemeService {
   axios: NuxtAxiosInstance;
-  ApiUrl = '/api/v1';
+  config: NuxtRuntimeConfig;
 
-  constructor(axios: NuxtAxiosInstance) {
+  constructor(axios: NuxtAxiosInstance, config: NuxtRuntimeConfig) {
     this.axios = axios;
+    this.config = config;
   }
 
   async getWorkScheme(params: {
@@ -19,7 +22,7 @@ export default class WorkSchemeService {
 
     try {
       const response = await this.axios.$get<WorkSchemeResponse>(
-        `${this.ApiUrl}/users/${bridgeUid}/worktime?date_from=${format(
+        `${ApiUrl(this.config)}/users/${bridgeUid}/worktime?date_from=${format(
           startDate,
           'yyyy-MM-dd'
         )}&date_to=${format(endDate, 'yyyy-MM-dd')}`,

diff --git a/store/employee/actions.ts b/store/employee/actions.ts
@@ -25,7 +25,11 @@ const actions: ActionTree<EmployeeStoreState, RootStoreState> = {
   },
 
   logout({commit}) {
-    const authService = new AuthService(this.$fire, this.$axios);
+    const authService = new AuthService(
+      this.$fire,
+      this.$axios,
+      this.app.$config
+    );
 
     localStorage.removeItem('@fm-hours/ppid');
     authService.deleteAuthCookie();
@@ -45,7 +49,11 @@ const actions: ActionTree<EmployeeStoreState, RootStoreState> = {
 
     try {
       const employeesService = new EmployeesService(this.$fire);
-      const authService = new AuthService(this.$fire, this.$axios);
+      const authService = new AuthService(
+        this.$fire,
+        this.$axios,
+        this.app.$config
+      );
 
       if (!authService.getAuthCookie()) {
         const ppid =