Enable aoe login and set secrets

Opetushallitus · Dec 17, 2024 · 85cc1eb · 85cc1eb
1 parent 866c950
commit 85cc1eb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/aoe-infra/infra/bin/infra.ts b/aoe-infra/infra/bin/infra.ts
@@ -455,11 +455,18 @@ if (environmentName == 'dev' || environmentName == 'qa' || environmentName == 'p
       Secrets.secrets.CLIENT_SECRET,
       Secrets.secrets.JWT_SECRET,
       Secrets.secrets.PID_API_KEY,
+      Secrets.secrets.PROXY_URI,
+      Secrets.secrets.CLIENT_ID
     ],
     utilityAccountId: utilityAccountId,
     alb: Alb.alb,
     listener: Alb.albListener,
-    listenerPathPatterns: ["/api/v1*", "/api/v2*", "/h5p/*", "/embed/*"],
+    listenerPathPatterns: [
+      "/api/*",
+      "/api/v1*",
+      "/api/v2*",
+      "/h5p/*",
+      "/embed/*"],
     healthCheckPath: "/",
     healthCheckGracePeriod: 180,
     healthCheckInterval: 5,

diff --git a/aoe-infra/infra/environments/dev.json b/aoe-infra/infra/environments/dev.json
@@ -77,9 +77,7 @@
             "image_tag": "ga-105",
             "allow_ecs_exec": true,
             "env_vars": {
-                "PROXY_URI":  "http://localhost",
                 "PID_SERVICE_URL": "http://localhost",
-                "CLIENT_ID":  "temp",
                 "NODE_ENV": "production",
                 "LOG_LEVEL": "error",
                 "PORT_LISTEN": "8080",
@@ -98,7 +96,7 @@
                 "KAFKA_CLIENT_ID": "aoe-web-backend",
                 "KAFKA_CLIENT_REGION": "eu-west-1",
 
-                "SESSION_COOKIE_DOMAIN":".dev.aoe.fi",
+                "SESSION_COOKIE_DOMAIN":".aoe.fi",
                 "SESSION_COOKIE_HTTP_ONLY": "true",
                 "SESSION_COOKIE_MAX_AGE": "86400000",
                 "SESSION_COOKIE_PATH": "/api",
@@ -163,7 +161,7 @@
 
                 "CLOUD_STORAGE_ENABLED": "1",
                 "KAFKA_ENABLED": "1",
-                "LOGIN_ENABLED": "0",
+                "LOGIN_ENABLED": "1",
 
                 "PID_SERVICE_RUN_SCHEDULED": "0",
                 "PID_SERVICE_ENABLED": "0",

diff --git a/aoe-infra/infra/lib/secrets-manager-stack.ts b/aoe-infra/infra/lib/secrets-manager-stack.ts
@@ -26,6 +26,8 @@ export class SecretManagerStack extends cdk.Stack {
     public readonly documentDbPassword: secretsmanager.Secret;
 
     public readonly secrets: Secrets = {
+        CLIENT_ID: {envVarName: 'CLIENT_ID', path: '/service/web-backend/CLIENT_ID', secretKey: 'secretkey'},
+        PROXY_URI: {envVarName: 'PROXY_URI', path: '/service/web-backend/PROXY_URI', secretKey: 'secretkey'},
         REDIS_PASS: { envVarName: 'REDIS_PASS', path: '/service/semantic-apis/REDIS_PASS', secretKey: 'secretkey' },
         PG_PASS: { envVarName: 'PG_PASS', path: '/service/web-backend/PG_PASS', secretKey: 'secretkey' },
         SESSION_SECRET: { envVarName: 'SESSION_SECRET', path: '/service/web-backend/SESSION_SECRET', secretKey: 'secretkey' },