Merge pull request #331 from dadosfera/feature/sso-openid

FIX: using only header origin

deploy/helmfiles/stg.yaml

@@ -4,8 +4,6 @@ charts:
     values:
     - ../helm-chart/values.yaml
     set:
-      - name: maestro.env
-        value: stg
       - name: maestro.duc_url
         value: duc.stg.dadosfera.ai
       - name: hostname
@@ -24,37 +22,35 @@ charts:
         value: 1
   
     # Environment to test Network Policies
-  # - name: private-maestro
-  #   chart: ../helm-chart
-  #   values:
-  #   - ../helm-chart/values.yaml
-  #   set:
-  #     - name: app_name
-  #       value: maestro-private
-  #     - name: maestro.env
-  #       value: stg
-  #     - name: maestro.duc_url
-  #       value: duc.stg.dadosfera.ai
-  #     - name: hostname
-  #       value: private-maestro.stg.dadosfera.ai
-  #     - name: maestro.pi_factory_url
-  #       value: pi-factory.dadosfera.ai
-  #     - name: maestro.in_factory_url
-  #       value: in-factory.stg.dadosfera.ai
-  #     - name: maestro.tr_factory_url
-  #       value: in-factory.dadosfera.ai
-  #     - name: maestro.open_customer_id
-  #       value: b3e3dfe5-b992-4586-a73c-c0b0c00f615d
-  #     - name: maestro.open_group_id
-  #       value: e3f98a2f-7748-4981-8505-7695c8ca8218
-  #     # Customer id
-  #     - name: maestro.dedicated_proxy
-  #       value: 14d52fd4-d83d-4cdd-be34-bf11cc28b3bd
-  #     - name: replicaCount
-  #       value: 1
-  #     - name: affinity
-  #       value: null
-  #     - name: resources
-  #       value: null
-  #     - name: maestro.restricted_ip
-  #       value: "57.151.113.140/30"
+  - name: private-maestro
+    chart: ../helm-chart
+    values:
+    - ../helm-chart/values.yaml
+    set:
+      - name: app_name
+        value: maestro-private
+      - name: maestro.duc_url
+        value: duc.stg.dadosfera.ai
+      - name: hostname
+        value: private-maestro.stg.dadosfera.ai
+      - name: maestro.pi_factory_url
+        value: pi-factory.dadosfera.ai
+      - name: maestro.in_factory_url
+        value: in-factory.stg.dadosfera.ai
+      - name: maestro.tr_factory_url
+        value: in-factory.dadosfera.ai
+      - name: maestro.open_customer_id
+        value: b3e3dfe5-b992-4586-a73c-c0b0c00f615d
+      - name: maestro.open_group_id
+        value: e3f98a2f-7748-4981-8505-7695c8ca8218
+      # Customer id
+      - name: maestro.dedicated_proxy
+        value: 14d52fd4-d83d-4cdd-be34-bf11cc28b3bd
+      - name: replicaCount
+        value: 1
+      - name: affinity
+        value: null
+      - name: resources
+        value: null
+      - name: maestro.restricted_ip
+        value: "57.151.113.140/30"

src/main.ts

@@ -28,7 +28,7 @@ async function bootstrap() {
   });
   app.use(helmet());
 
-  if (process.env.ENV !== 'local') {
+  if (process.env.ENV === 'prd') {
     app.use('/catalog/register-dataset', json({ limit: '10mb' }));
     app.use('/catalog/register-dataset', urlencoded({ extended: true, limit: '10mb' }));
   }

src/modules/identity-provider/identity-provider.controller.ts

@@ -186,14 +186,11 @@ export class IdentityProviderController {
     this.logger.info('GET /identity-providers/:id');
 
 
-    const frontDomain = req.headers['origin'] as string || req.headers['referer'] as string;
-    this.logger.info(`Front domain: ${frontDomain}`);
-    const host = frontDomain.lastIndexOf('/') !== -1
-      ? frontDomain.substring(0, frontDomain.lastIndexOf('/'))
-      : frontDomain;
+    const origin = req.headers['origin'] as string;
+    console.log('Origin:', origin);
 
     const lang = language.substring(0, 2) + language.substring(2).toUpperCase();
-    const callbackUrl = process.env.ENV !== "prd" ? `${host}/auth/callback` : `${host}/${lang}/auth/callback`;
+    const callbackUrl = process.env.ENV !== "prd" ? `${origin}/auth/callback` : `${origin}/${lang}/auth/callback`;
 
     const redirectUrl =
       await this.identityProviderService.loginIdentityProvider(id, callbackUrl);