post review fixes

packages/backend/src/apps/gitlab/auth/generate-auth-url.ts

@@ -1,5 +1,6 @@
 import { IGlobalVariable } from '@automatisch/types';
 import { URLSearchParams } from 'url';
+import getBaseUrl from '../common/get-base-url';
 
 export default async function generateAuthUrl($: IGlobalVariable) {
   // ref: https://docs.gitlab.com/ee/api/oauth2.html#authorization-code-flow
@@ -11,14 +12,13 @@ export default async function generateAuthUrl($: IGlobalVariable) {
     redirect_uri: $.auth.data.oAuthRedirectUrl as string,
     scope: scopes.join(' '),
     response_type: 'code',
-    state: `${Date.now()}`,
+    state: Date.now().toString(),
   });
 
-  const url = `${
-    $.auth.data.oInstanceUrl
-  }/oauth/authorize?${searchParams.toString()}`;
+  const baseUrl = getBaseUrl($);
+  const path = `/oauth/authorize?${searchParams.toString()}`;
 
   await $.auth.set({
-    url,
+    url: baseUrl + path,
   });
 }

packages/backend/src/apps/gitlab/auth/index.ts

@@ -5,18 +5,6 @@ import refreshToken from './refresh-token';
 
 export default {
   fields: [
-    {
-      key: 'oInstanceUrl',
-      label: 'Gitlab instance URL',
-      type: 'string' as const,
-      required: false,
-      readOnly: false,
-      value: 'https://gitlab.com',
-      placeholder: 'https://gitlab.com',
-      description: 'Your Gitlab instance URL. Default is https://gitlab.com.',
-      docUrl: 'https://automatisch.io/docs/gitlab#oauth-redirect-url',
-      clickToCopy: true,
-    },
     {
       key: 'oAuthRedirectUrl',
       label: 'OAuth Redirect URL',
@@ -30,6 +18,18 @@ export default {
       docUrl: 'https://automatisch.io/docs/gitlab#oauth-redirect-url',
       clickToCopy: true,
     },
+    {
+      key: 'instanceUrl',
+      label: 'Gitlab instance URL',
+      type: 'string' as const,
+      required: false,
+      readOnly: false,
+      value: 'https://gitlab.com',
+      placeholder: 'https://gitlab.com',
+      description: 'Your Gitlab instance URL. Default is https://gitlab.com.',
+      docUrl: 'https://automatisch.io/docs/gitlab#oauth-redirect-url',
+      clickToCopy: true,
+    },
     {
       key: 'clientId',
       label: 'Client ID',

packages/backend/src/apps/gitlab/auth/verify-credentials.ts

@@ -5,7 +5,7 @@ const verifyCredentials = async ($: IGlobalVariable) => {
   // ref: https://docs.gitlab.com/ee/api/oauth2.html#authorization-code-flow
 
   const response = await $.http.post(
-    `${$.auth.data.oInstanceUrl}/oauth/token`,
+    '/oauth/token',
     {
       client_id: $.auth.data.clientId,
       client_secret: $.auth.data.clientSecret,