Merge pull request #364 from dadosfera/chore/oracle

UPDATE: redis host

deploy/helm-chart/templates/deployment.yaml

@@ -74,6 +74,8 @@ spec:
               value: "logstash-pipelines.dadosfera.ai"
             - name: LOGGER_GELF_PORT
               value: "{{ .Values.maestro.logger_gelf_port }}"
+            - name: LOGGER_CONSOLE_EXTRA
+              value: "true"
             - name: NIMBUS_BASE_URL
               value: "http://nimbus-api"
             - name: NPM_TOKEN
@@ -94,6 +96,8 @@ spec:
               value: {{ .Values.maestro.open_group_id }}
             - name: DEDICATED_PROXY
               value: {{ .Values.maestro.dedicated_proxy }}
+            - name: COOKIE_SECRET
+              value: {{ .Values.maestro.cookie_secret }}
             - name: REDIS_DATABASE
               value: "{{ .Values.maestro.redis_database }}"
             - name: REDIS_HOST

deploy/helm-chart/templates/ingress.yaml

@@ -9,6 +9,9 @@ metadata:
     nginx.ingress.kubernetes.io/server-snippet: |
       underscores_in_headers on;
       ignore_invalid_headers on;
+    nginx.ingress.kubernetes.io/proxy-buffer-size: "16k"
+    nginx.ingress.kubernetes.io/proxy-buffers-number: "8"
+    nginx.ingress.kubernetes.io/proxy-busy-buffers-size: "64k"
     {{- if .Values.maestro.restricted_ip}}
     nginx.ingress.kubernetes.io/whitelist-source-range: {{ .Values.maestro.restricted_ip }}
     {{- end }}

deploy/helm-chart/values-stg.yaml

@@ -6,6 +6,9 @@ maestro:
   tr_factory_url: in-factory.stg.dadosfera.ai
   open_customer_id: b3e3dfe5-b992-4586-a73c-c0b0c00f615d
   open_group_id: e3f98a2f-7748-4981-8505-7695c8ca8218
+  cookie_secret: "ff7bc13823edb2ae50d248e5780bddc9d4b31c36"
+  redis_host: "aaapzppmlyamkocqwstpo7zvopczyyiyuy6xzm2g6c5k4mq3a66be4a-0.redis.sa-saopaulo-1.oci.oraclecloud.com"
+  redis_database: "1"
 
 hostname: maestro.stg.dadosfera.ai
 

deploy/helm-chart/values.yaml

@@ -48,6 +48,7 @@ maestro:
   redis_host: "product-redis-prd.z4xvqj.0001.use1.cache.amazonaws.com"
   redis_port: "6379"
   redis_database: "0"
+  cookie_secret: "13cc5e136d3074bcc05bec8697092ec1f5f376bf"
 autoscaling:
   enabled: false
   minReplicas: 1

environment.d.ts

@@ -15,6 +15,7 @@ declare global {
       OPEN_GROUP_ID: string;
       OPEN_CUSTOMER_ID: string;
       DEDICATED_PROXY: string;
+      COOKIE_SECRET: string;
     }
   }
 }

src/modules/auth/auth.controller.ts

@@ -101,11 +101,15 @@ export class AuthController {
       const metadata = PackTheMetadata({ language });
       this.logger.info('metadata: ' + JSON.stringify(metadata.toJSON()));
       const data = await this.authClient.signIn({ username, password, totp }, metadata);
-      this.addTokenInCookie(res, {
-        accessToken: data.tokens.accessToken,
-        refreshToken: data.tokens.refreshToken,
-        userId: data.user.id
-      });
+
+      if (data.tokens) {
+        this.addTokenInCookie(res, {
+          accessToken: data.tokens.accessToken,
+          refreshToken: data.tokens.refreshToken,
+          userId: data.user.id
+        });
+      }
+
 
       return res.send(data);
     } catch (error) {
@@ -568,7 +572,7 @@ export class AuthController {
 
       this.logger.info('Set Cookie ddf-auth')
       res.cookie('ddf-auth', data.accessToken, {
-        domain: 'dadosfera.ai',
+        domain: 'stg.dadosfera.ai',
         maxAge: exp,
         httpOnly: true,
         secure: true,
@@ -579,7 +583,7 @@ export class AuthController {
     if (data.refreshToken) {
       this.logger.info('Set Cookie ddf-refresh-auth')
       res.cookie('ddf-refresh-auth', data.refreshToken, {
-        domain: 'dadosfera.ai',
+        domain: 'stg.dadosfera.ai',
         maxAge: exp,
         httpOnly: true,
         secure: true,
@@ -590,7 +594,7 @@ export class AuthController {
     if (data.userId) {
       this.logger.info('Set Cookie ddf-refresh-auth')
       res.cookie('ddf-user-id', data.userId, {
-        domain: 'dadosfera.ai',
+        domain: 'stg.dadosfera.ai',
         maxAge: exp,
         httpOnly: true,
         secure: true,

src/services/service.module.ts

@@ -12,6 +12,9 @@ import { redisStore } from 'cache-manager-ioredis-yet';
           port: process.env.REDIS_PORT && Number(process.env.REDIS_PORT),
           db: process.env.REDIS_DATABASE && Number(process.env.REDIS_DATABASE),
           keyPrefix: 'maestro:sso',
+          tls: {
+            servername: process.env.REDIS_HOST,
+          }
         }),
       }),
     }),