Skip to content

Commit 31e9142

Browse files
authored
feat(image): use admin-ui client encoded secret to render properties (#567)
1 parent 1a57928 commit 31e9142

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

docker-admin-ui/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN apk update \
77
# TODO:
88
# - use NODE_ENV=production
99
# - download build package (not git clone)
10-
ENV ADMIN_UI_VERSION=9c01b841e5a5c28d58d7b3aed6cbe87ff1c2126f
10+
ENV ADMIN_UI_VERSION=1a57928d7e2bfdfa009e9de37f8785854d9e97e0
1111

1212
# note that as we're pulling from a monorepo (with multiple project in it)
1313
# we are using partial-clone and sparse-checkout to get the admin-ui code

docker-admin-ui/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
libcst<0.4
22
# pinned to py3-grpcio version to avoid failure on native extension build
33
grpcio==1.41.0
4-
git+https://github.com/JanssenProject/jans@e74ea8e27e59d35ff6e3c6f997e6c1df6a04ec83#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
4+
git+https://github.com/JanssenProject/jans@63722ea7372f33bf2ad2c3ff01b068383e81e746#egg=jans-pycloudlib&subdirectory=jans-pycloudlib

docker-admin-ui/scripts/bootstrap.py

+1
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ def ctx(self):
158158
def export_plugin_properties(self):
159159
with open("/app/templates/auiConfiguration.properties.tmpl") as f:
160160
txt = f.read() % self.ctx
161+
logger.info("Creating/updating plugins_admin_ui_properties secrets")
161162
self.manager.secret.set("plugins_admin_ui_properties", txt)
162163

163164
@cached_property

docker-admin-ui/templates/auiConfiguration.properties.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# auth server
22
authserver.clientId=%(admin_ui_client_id)s
3-
authserver.clientSecret=%(admin_ui_client_pw)s
3+
authserver.clientSecret=%(admin_ui_client_encoded_pw)s
44
authserver.authzBaseUrl=https://%(hostname)s/jans-auth/restv1/authorize
55
authserver.scope=openid+profile+email+user_name
66
authserver.acrValues=%(admin_ui_auth_method)s
@@ -15,7 +15,7 @@ authserver.endSessionEndpoint=https://%(hostname)s/jans-auth/restv1/end_session
1515

1616
# token server
1717
tokenServer.clientId=%(token_server_admin_ui_client_id)s
18-
tokenServer.clientSecret=%(token_server_admin_ui_client_pw)s
18+
tokenServer.clientSecret=%(token_server_admin_ui_client_encoded_pw)s
1919
tokenServer.authzBaseUrl=%(token_server_authz_url)s
2020
tokenServer.scope=openid+profile+email+user_name
2121
tokenServer.acrValues=basic

0 commit comments

Comments
 (0)