post review fixes

packages/backend/src/apps/gitlab/common/add-auth-header.ts

@@ -1,11 +1,8 @@
 import { TBeforeRequest } from '@automatisch/types';
 
 const addAuthHeader: TBeforeRequest = ($, requestConfig) => {
-  if ($.auth.data.oInstanceUrl) {
-    requestConfig.baseURL = $.auth.data.oInstanceUrl as string;
-  }
-
-  if (requestConfig.headers && $.auth.data?.accessToken) {
+  if ($.auth.data?.accessToken) {
+    requestConfig.headers = requestConfig.headers || {};
     requestConfig.headers.Authorization = `Bearer ${$.auth.data.accessToken}`;
   }
   return requestConfig;

packages/backend/src/apps/gitlab/common/get-base-url.ts

@@ -0,0 +1,15 @@
+import { IGlobalVariable } from '@automatisch/types';
+
+const getBaseUrl = ($: IGlobalVariable): string => {
+  if ($.auth.data.instanceUrl) {
+    return $.auth.data.instanceUrl as string;
+  }
+
+  if ($.app.apiBaseUrl) {
+    return $.app.apiBaseUrl;
+  }
+
+  return $.app.baseUrl;
+};
+
+export default getBaseUrl;

packages/backend/src/apps/gitlab/common/get-current-user.ts

@@ -3,7 +3,7 @@ import { IGlobalVariable, IJSONObject } from '@automatisch/types';
 const getCurrentUser = async ($: IGlobalVariable): Promise<IJSONObject> => {
   // ref: https://docs.gitlab.com/ee/api/users.html#list-current-user
 
-  const response = await $.http.get(`${$.auth.data.oInstanceUrl}/api/v4/user`);
+  const response = await $.http.get('/api/v4/user');
   const currentUser = response.data;
   return currentUser;
 };

packages/backend/src/apps/gitlab/common/set-base-url.ts

@@ -0,0 +1,13 @@
+import { TBeforeRequest } from '@automatisch/types';
+
+const setBaseUrl: TBeforeRequest = ($, requestConfig) => {
+  if ($.auth.data.instanceUrl) {
+    requestConfig.baseURL = $.auth.data.instanceUrl as string;
+  } else if ($.app.apiBaseUrl) {
+    requestConfig.baseURL = $.app.apiBaseUrl as string;
+  }
+
+  return requestConfig;
+};
+
+export default setBaseUrl;