Merge branch 'main' into dependabot/npm_and_yarn/demo/vue/app/fronten…

…d/core-js-3.39.0
bcgov · Nov 12, 2024 · b2faca4 · b2faca4
2 parents 48fe092 + 7a1edbd
commit b2faca4
Show file tree

Hide file tree

Showing 16 changed files with 234 additions and 133 deletions.
diff --git a/charts/vc-authn-oidc/templates/deployment.yaml b/charts/vc-authn-oidc/templates/deployment.yaml
@@ -39,6 +39,12 @@ spec:
         - name: auth-session-ttl
           configMap:
             name: {{ include "global.fullname" . }}-session-timeout
+        - name: custom-variable-substitution
+          configMap:
+            name:  {{ include "global.fullname" . }}-variable-substitution-config
+            items:
+              - key: user_variable_substitution.py
+                path: user_variable_substitution.py
       containers:
         - name: {{ .Chart.Name }}
           securityContext:
@@ -72,6 +78,8 @@ spec:
               value: {{ .Values.controller.presentationExpireTime | quote }}
             # - name: CONTROLLER_SESSION_TIMEOUT_CONFIG_FILE
             #   value: /home/aries/sessiontimeout.json
+            - name: CONTROLLER_VARIABLE_SUBSTITUTION_OVERRIDE
+              value: /home/aries/user_variable_substitution.py
             - name: CONTROLLER_PRESENTATION_CLEANUP_TIME
               value: {{ .Values.controller.sessionTimeout.duration | quote }}
             - name: ACAPY_AGENT_URL
@@ -133,6 +141,9 @@ spec:
             - name: auth-session-ttl
               mountPath: /home/aries/sessiontimeout.json
               subPath: sessiontimeout.json
+            - name: custom-variable-substitution
+              mountPath: /home/aries/user_variable_substitution.py
+              subPath: user_variable_substitution.py
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/demo/vue/app/frontend/package-lock.json b/demo/vue/app/frontend/package-lock.json
diff --git a/demo/vue/app/frontend/package.json b/demo/vue/app/frontend/package.json
@@ -43,7 +43,7 @@
     "eslint-plugin-vuetify": "^1.1.0",
     "lodash": "^4.17.21",
     "prettier": "^3.3.3",
-    "sass": "^1.80.5",
+    "sass": "^1.80.6",
     "sass-loader": "^14.2.1",
     "vue-cli-plugin-vuetify": "^2.5.8",
     "vue-template-compiler": "^2.7.16",

diff --git a/demo/vue/app/package-lock.json b/demo/vue/app/package-lock.json
diff --git a/demo/vue/app/package.json b/demo/vue/app/package.json
@@ -35,7 +35,7 @@
     "axios": "^1.7.7",
     "axios-oauth-client": "^2.2.0",
     "axios-token-interceptor": "^0.2.0",
-    "compression": "^1.7.4",
+    "compression": "^1.7.5",
     "config": "^3.3.12",
     "crypto": "^1.0.1",
     "express": "^4.21.1",
@@ -44,8 +44,8 @@
     "fs-extra": "^11.2.0",
     "js-yaml": "^4.1.0",
     "jsonwebtoken": "^9.0.2",
-    "keycloak-connect": "^26.0.2",
-    "winston": "^3.15.0",
+    "keycloak-connect": "^26.0.5",
+    "winston": "^3.16.0",
     "winston-transport": "^4.8.0"
   },
   "devDependencies": {

diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
@@ -27,6 +27,7 @@ services:
       - CONTROLLER_PRESENTATION_EXPIRE_TIME=${CONTROLLER_PRESENTATION_EXPIRE_TIME}
       - CONTROLLER_PRESENTATION_CLEANUP_TIME=${CONTROLLER_PRESENTATION_CLEANUP_TIME}
       - CONTROLLER_SESSION_TIMEOUT_CONFIG_FILE=${CONTROLLER_SESSION_TIMEOUT_CONFIG_FILE}
+      - CONTROLLER_VARIABLE_SUBSTITUTION_OVERRIDE=${CONTROLLER_VARIABLE_SUBSTITUTION_OVERRIDE}
       - ACAPY_TENANCY=${AGENT_TENANT_MODE}
       - ACAPY_AGENT_URL=${AGENT_ENDPOINT}
       - ACAPY_ADMIN_URL=${AGENT_ADMIN_URL}
@@ -45,6 +46,7 @@ services:
     volumes:
       - ../oidc-controller:/app:rw
       - ./oidc-controller/config/sessiontimeout.json:/home/aries/sessiontimeout.json
+      - ./oidc-controller/config/user_variable_substitution.py:/home/aries/user_variable_substitution.py
     networks:
       - vc_auth
 

diff --git a/docker/manage b/docker/manage
@@ -179,6 +179,9 @@ configureEnvironment() {
   # The path to the auth_session timeouts config file
   export CONTROLLER_SESSION_TIMEOUT_CONFIG_FILE="/home/aries/sessiontimeout.json"
 
+  # Extend Variable Substitutions
+  export CONTROLLER_VARIABLE_SUBSTITUTION_OVERRIDE="/home/aries/user_variable_substitution.py"
+
   #controller app settings
   export INVITATION_LABEL=${INVITATION_LABEL:-"VC-AuthN"}
   export SET_NON_REVOKED="True"

diff --git a/docker/oidc-controller/Dockerfile b/docker/oidc-controller/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12 as main
+FROM python:3.12 AS main
 
 WORKDIR /app
 

diff --git a/docker/oidc-controller/config/user_variable_substitution.py b/docker/oidc-controller/config/user_variable_substitution.py