From e06b7ab87a6ead39e8367f7ff698324b8aaaa080 Mon Sep 17 00:00:00 2001
From: Faruk AYDIN <omerfaruk26@gmail.com>
Date: Mon, 28 Aug 2023 14:37:10 +0200
Subject: [PATCH] chore(web): Remove API url env variable

---
 packages/backend/src/graphql/schema.graphql            |  1 +
 packages/backend/src/models/saml-auth-provider.ee.ts   |  8 ++++++++
 packages/types/index.d.ts                              |  5 +++--
 packages/web/.env-example                              |  1 -
 packages/web/src/components/SsoProviders/index.ee.tsx  |  2 +-
 packages/web/src/config/app.ts                         | 10 +---------
 packages/web/src/config/urls.ts                        |  4 ----
 .../src/graphql/queries/list-saml-auth-providers.ee.ts |  1 +
 8 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/packages/backend/src/graphql/schema.graphql b/packages/backend/src/graphql/schema.graphql
index 96974fa816..4237bc842c 100644
--- a/packages/backend/src/graphql/schema.graphql
+++ b/packages/backend/src/graphql/schema.graphql
@@ -720,6 +720,7 @@ type ListSamlAuthProvider {
   id: String
   name: String
   issuer: String
+  loginUrl: String
 }
 
 type Permission {
diff --git a/packages/backend/src/models/saml-auth-provider.ee.ts b/packages/backend/src/models/saml-auth-provider.ee.ts
index 1541eb810f..075c87ebbf 100644
--- a/packages/backend/src/models/saml-auth-provider.ee.ts
+++ b/packages/backend/src/models/saml-auth-provider.ee.ts
@@ -75,6 +75,14 @@ class SamlAuthProvider extends Base {
     },
   });
 
+  static get virtualAttributes() {
+    return ['loginUrl'];
+  }
+
+  get loginUrl() {
+    return new URL(`/login/saml/${this.issuer}`, appConfig.baseUrl).toString();
+  }
+
   get config(): SamlConfig {
     const callbackUrl = new URL(
       `/login/saml/${this.issuer}/callback`,
diff --git a/packages/types/index.d.ts b/packages/types/index.d.ts
index 2aa1ddb83e..76b7aa6e35 100644
--- a/packages/types/index.d.ts
+++ b/packages/types/index.d.ts
@@ -427,6 +427,7 @@ type TSamlAuthProvider = {
   roleAttributeName: string;
   defaultRoleId: string;
   active: boolean;
+  loginUrl: string;
 };
 
 type AppConfig = {
@@ -437,7 +438,7 @@ type AppConfig = {
   canCustomConnect: boolean;
   shared: boolean;
   disabled: boolean;
-}
+};
 
 type AppAuthClient = {
   id: string;
@@ -445,7 +446,7 @@ type AppAuthClient = {
   appConfigId: string;
   authDefaults: string;
   formattedAuthDefaults: IJSONObject;
-}
+};
 
 declare module 'axios' {
   interface AxiosResponse {
diff --git a/packages/web/.env-example b/packages/web/.env-example
index e1d9669336..003236c060 100644
--- a/packages/web/.env-example
+++ b/packages/web/.env-example
@@ -1,5 +1,4 @@
 PORT=3001
-REACT_APP_API_URL=http://localhost:3000
 REACT_APP_GRAPHQL_URL=http://localhost:3000/graphql
 # HTTPS=true
 REACT_APP_BASE_URL=http://localhost:3001
diff --git a/packages/web/src/components/SsoProviders/index.ee.tsx b/packages/web/src/components/SsoProviders/index.ee.tsx
index 13f5b2fe6a..7617c30dc4 100644
--- a/packages/web/src/components/SsoProviders/index.ee.tsx
+++ b/packages/web/src/components/SsoProviders/index.ee.tsx
@@ -24,7 +24,7 @@ function SsoProviders() {
             <Button
               key={provider.id}
               component="a"
-              href={URLS.SSO_LOGIN(provider.issuer)}
+              href={provider.loginUrl}
               variant="outlined"
             >
               {formatMessage('ssoProviders.loginWithProvider', {
diff --git a/packages/web/src/config/app.ts b/packages/web/src/config/app.ts
index 8b10f3258b..8e38746ee4 100644
--- a/packages/web/src/config/app.ts
+++ b/packages/web/src/config/app.ts
@@ -1,7 +1,6 @@
 type Config = {
   [key: string]: string;
   baseUrl: string;
-  apiUrl: string;
   graphqlUrl: string;
   notificationsUrl: string;
   chatwootBaseUrl: string;
@@ -10,17 +9,10 @@ type Config = {
 
 const config: Config = {
   baseUrl: process.env.REACT_APP_BASE_URL as string,
-  apiUrl: process.env.REACT_APP_API_URL as string,
   graphqlUrl: process.env.REACT_APP_GRAPHQL_URL as string,
   notificationsUrl: process.env.REACT_APP_NOTIFICATIONS_URL as string,
   chatwootBaseUrl: 'https://app.chatwoot.com',
-  supportEmailAddress: 'support@automatisch.io'
+  supportEmailAddress: 'support@automatisch.io',
 };
 
-if (!config.apiUrl && !config.graphqlUrl) {
-  config.apiUrl = '/';
-} else if (!config.apiUrl) {
-  config.apiUrl = (new URL(config.graphqlUrl)).origin;
-}
-
 export default config;
diff --git a/packages/web/src/config/urls.ts b/packages/web/src/config/urls.ts
index bedd463b6f..b11d12be99 100644
--- a/packages/web/src/config/urls.ts
+++ b/packages/web/src/config/urls.ts
@@ -1,5 +1,3 @@
-import appConfig from './app';
-
 export const CONNECTIONS = '/connections';
 export const EXECUTIONS = '/executions';
 export const EXECUTION_PATTERN = '/executions/:executionId';
@@ -7,8 +5,6 @@ export const EXECUTION = (executionId: string) => `/executions/${executionId}`;
 
 export const LOGIN = '/login';
 export const LOGIN_CALLBACK = `${LOGIN}/callback`;
-export const SSO_LOGIN = (issuer: string) =>
-  `${appConfig.apiUrl}/login/saml/${issuer}`;
 export const SIGNUP = '/sign-up';
 export const FORGOT_PASSWORD = '/forgot-password';
 export const RESET_PASSWORD = '/reset-password';
diff --git a/packages/web/src/graphql/queries/list-saml-auth-providers.ee.ts b/packages/web/src/graphql/queries/list-saml-auth-providers.ee.ts
index 62646bd2b6..9f1d927812 100644
--- a/packages/web/src/graphql/queries/list-saml-auth-providers.ee.ts
+++ b/packages/web/src/graphql/queries/list-saml-auth-providers.ee.ts
@@ -5,6 +5,7 @@ export const LIST_SAML_AUTH_PROVIDERS = gql`
     listSamlAuthProviders {
       id
       name
+      loginUrl
       issuer
     }
   }