Merge pull request #3020 from ckavili/master

oidc server is updated to work with OCP OAuth

helm/wekan/templates/deployment.yaml

@@ -37,6 +37,12 @@ spec:
               value: {{ .Values.root_url | default "https://wekan.local" | quote }}
             - name: MONGO_URL
               value: "{{ template "mongodb-replicaset.url" . }}"
+          {{- range $key := .Values.env }}
+          {{- if .value }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+          {{- end }}
+          {{- end }}
           livenessProbe:
             httpGet:
               path: /

helm/wekan/templates/serviceaccount.yaml

@@ -2,6 +2,10 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
+{{- if .Values.serviceAccounts.annotations }}
+  annotations:
+{{ .Values.serviceAccounts.annotations | indent 4}}
+{{- end }}
   labels:
     app: {{ template "wekan.name" . }}
     chart: {{ template "wekan.chart" . }}

helm/wekan/values.yaml

@@ -8,6 +8,7 @@
 serviceAccounts:
   create: true
   name: ""
+  annotations: ""
 
 ## Wekan image configuration
 ##
@@ -29,7 +30,9 @@ credentials:
 
 ## Specify additional environmental variables for the Deployment
 ##
-env: {}
+env:
+  - name: ""
+    value: ""
 
 service:
   type: NodePort
@@ -59,10 +62,10 @@ ingress:
   #    hosts:
   #      - wekan-example.local
 
-  route:
+route:
-    enabled: false
+  enabled: false
 
-resources: 
+resources:
   requests:
     memory: 128Mi
     cpu: 300m

packages/wekan-oidc/oidc_server.js

@@ -11,6 +11,7 @@ OAuth.registerService('oidc', 2, null, function (query) {
 
   var userinfo = getUserInfo(accessToken);
   if (userinfo.ocs) userinfo = userinfo.ocs.data; // Nextcloud hack
+  if (userinfo.metadata) userinfo = userinfo.metadata // Openshift hack
   if (debug) console.log('XXX: userinfo:', userinfo);
 
   var serviceData = {};