feat(image): use admin-ui client encoded secret to render properties (#…

…567)
GluuFederation · Oct 31, 2022 · 31e9142 · 31e9142
1 parent 1a57928
commit 31e9142
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/docker-admin-ui/Dockerfile b/docker-admin-ui/Dockerfile
@@ -7,7 +7,7 @@ RUN apk update \
 # TODO:
 # - use NODE_ENV=production
 # - download build package (not git clone)
-ENV ADMIN_UI_VERSION=9c01b841e5a5c28d58d7b3aed6cbe87ff1c2126f
+ENV ADMIN_UI_VERSION=1a57928d7e2bfdfa009e9de37f8785854d9e97e0
 
 # note that as we're pulling from a monorepo (with multiple project in it)
 # we are using partial-clone and sparse-checkout to get the admin-ui code

diff --git a/docker-admin-ui/requirements.txt b/docker-admin-ui/requirements.txt
@@ -1,4 +1,4 @@
 libcst<0.4
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.41.0
-git+https://github.com/JanssenProject/jans@e74ea8e27e59d35ff6e3c6f997e6c1df6a04ec83#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@63722ea7372f33bf2ad2c3ff01b068383e81e746#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
diff --git a/docker-admin-ui/scripts/bootstrap.py b/docker-admin-ui/scripts/bootstrap.py
@@ -158,6 +158,7 @@ def ctx(self):
     def export_plugin_properties(self):
         with open("/app/templates/auiConfiguration.properties.tmpl") as f:
             txt = f.read() % self.ctx
+            logger.info("Creating/updating plugins_admin_ui_properties secrets")
             self.manager.secret.set("plugins_admin_ui_properties", txt)
 
     @cached_property

diff --git a/docker-admin-ui/templates/auiConfiguration.properties.tmpl b/docker-admin-ui/templates/auiConfiguration.properties.tmpl
@@ -1,6 +1,6 @@
 # auth server
 authserver.clientId=%(admin_ui_client_id)s
-authserver.clientSecret=%(admin_ui_client_pw)s
+authserver.clientSecret=%(admin_ui_client_encoded_pw)s
 authserver.authzBaseUrl=https://%(hostname)s/jans-auth/restv1/authorize
 authserver.scope=openid+profile+email+user_name
 authserver.acrValues=%(admin_ui_auth_method)s
@@ -15,7 +15,7 @@ authserver.endSessionEndpoint=https://%(hostname)s/jans-auth/restv1/end_session
 
 # token server
 tokenServer.clientId=%(token_server_admin_ui_client_id)s
-tokenServer.clientSecret=%(token_server_admin_ui_client_pw)s
+tokenServer.clientSecret=%(token_server_admin_ui_client_encoded_pw)s
 tokenServer.authzBaseUrl=%(token_server_authz_url)s
 tokenServer.scope=openid+profile+email+user_name
 tokenServer.acrValues=basic