From 6658e1139c8b311ad18183fdd95b5bad259029fc Mon Sep 17 00:00:00 2001
From: mrrajan <86094767+mrrajan@users.noreply.github.com.>
Date: Wed, 3 Jun 2026 20:37:46 +0530
Subject: [PATCH] feat: rename uiScopes to uiScope and add loadUser OIDC option

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 charts/trustify/templates/helpers/_oidc.tpl        | 14 +++++++++++---
 .../templates/services/server/030-Deployment.yaml  |  6 ++++--
 charts/trustify/values.schema.json                 |  9 +++++++--
 charts/trustify/values.schema.yaml                 | 10 ++++++++--
 charts/trustify/values.yaml                        |  3 ++-
 5 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/charts/trustify/templates/helpers/_oidc.tpl b/charts/trustify/templates/helpers/_oidc.tpl
index 2fe9e1b..5a574b7 100644
--- a/charts/trustify/templates/helpers/_oidc.tpl
+++ b/charts/trustify/templates/helpers/_oidc.tpl
@@ -28,12 +28,20 @@ Arguments: (dict)
 UI scopes passed to the backend for the frontend client.
 Arguments: .
 */}}
-{{- define "trustification.oidc.uiScopes" -}}
-{{- if .Values.oidc.uiScopes -}}
-{{- .Values.oidc.uiScopes -}}
+{{- define "trustification.oidc.uiScope" -}}
+{{- if .Values.oidc.uiScope -}}
+{{- .Values.oidc.uiScope -}}
 {{- end -}}
 {{- end -}}
 
+{{/*
+OIDC user Info boolean.
+Arguments: .
+*/}}
+{{- define "trustification.oidc.loadUser" -}}
+{{- .Values.oidc.loadUser | quote -}}
+{{- end -}}
+
 {{/*
 Configuration required for setting up an OIDC client for making requests
 
diff --git a/charts/trustify/templates/services/server/030-Deployment.yaml b/charts/trustify/templates/services/server/030-Deployment.yaml
index 585462b..7fba8e7 100644
--- a/charts/trustify/templates/services/server/030-Deployment.yaml
+++ b/charts/trustify/templates/services/server/030-Deployment.yaml
@@ -58,8 +58,10 @@ spec:
               value: {{ include "trustification.oidc.frontendIssuerUrl" . }}
             - name: UI_CLIENT_ID
               value: {{ include "trustification.oidc.frontendClientId" . }}
-            {{- with (include "trustification.oidc.uiScopes" . | trim) }}
-            - name: UI_SCOPES
+            - name: UI_LOAD_USER
+              value: {{ include "trustification.oidc.loadUser" . }}
+            {{- with (include "trustification.oidc.uiScope" . | trim) }}
+            - name: UI_SCOPE
               value: {{ . | quote }}
             {{- end }}
 
diff --git a/charts/trustify/values.schema.json b/charts/trustify/values.schema.json
index 920c923..73a3eb3 100644
--- a/charts/trustify/values.schema.json
+++ b/charts/trustify/values.schema.json
@@ -762,9 +762,9 @@
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "uiScopes": {
+        "uiScope": {
           "type": "string",
-          "description": "Optional value for the `UI_SCOPES` environment variable in the server deployment.\n"
+          "description": "Optional value for the `UI_SCOPE` environment variable in the server deployment.\n"
         },
         "issuerUrl": {
           "$ref": "#/definitions/ValueOrRef"
@@ -774,6 +774,11 @@
           "description": "Use insecure TLS when communicating with the issuer (DANGER!)\n",
           "default": false
         },
+        "loadUser": {
+          "type": "boolean",
+          "description": "Value for the `UI_LOAD_USER` environment variable in the server deployment\n",
+          "default": true
+        },
         "clients": {
           "properties": {
             "frontend": {
diff --git a/charts/trustify/values.schema.yaml b/charts/trustify/values.schema.yaml
index 16134df..4d4c4da 100644
--- a/charts/trustify/values.schema.yaml
+++ b/charts/trustify/values.schema.yaml
@@ -592,10 +592,10 @@ definitions:
     type: object
     additionalProperties: false
     properties:
-      uiScopes:
+      uiScope:
         type: string
         description: |
-          Optional value for the `UI_SCOPES` environment variable in the server deployment.
+          Optional value for the `UI_SCOPE` environment variable in the server deployment.
 
       issuerUrl:
         $ref: "#/definitions/ValueOrRef"
@@ -606,6 +606,12 @@ definitions:
           Use insecure TLS when communicating with the issuer (DANGER!)
         default: false
 
+      loadUser:
+        type: boolean
+        description: |
+          Value for the `UI_LOAD_USER` environment variable in the server deployment
+        default: true
+
       clients:
         properties:
           frontend:
diff --git a/charts/trustify/values.yaml b/charts/trustify/values.yaml
index 7f67739..7d24732 100644
--- a/charts/trustify/values.yaml
+++ b/charts/trustify/values.yaml
@@ -24,7 +24,8 @@ openshift:
   useServiceCa: true
 
 oidc:
-  uiScopes: ""
+  uiScope: ""
+  loadUser: true
   clients:
     frontend: {}
     cli: