Skip to content

fix(image): admin UI regressions #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 24, 2022
Merged

fix(image): admin UI regressions #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9b4379
fix(image): regression on CONFIG_API_BASE_URL defined in env template…
iromli Oct 24, 2022
62fddbc
fix(image): regression on getting scopes loaded by interception scri…
iromli Oct 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-admin-ui/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apk update \
# TODO:
# - use NODE_ENV=production
# - download build package (not git clone)
ENV ADMIN_UI_VERSION=5798ee9f6320602d756cb2d33fe297200d2231dd
ENV ADMIN_UI_VERSION=9c01b841e5a5c28d58d7b3aed6cbe87ff1c2126f

# 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
Expand Down
4 changes: 1 addition & 3 deletions docker-admin-ui/scripts/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
def render_env(manager):
hostname = manager.config.get("hostname")
ctx = {
# "base_path": os.environ.get("CN_ADMIN_API_BASE_PATH", "/admin"),
"config_api_base_url": f"https://{hostname}",
"api_base_url": f"https://{hostname}/jans-config-api/admin-ui",
"hostname": hostname,
}

with open("/app/templates/env.tmpl") as fr:
Expand Down
6 changes: 3 additions & 3 deletions docker-admin-ui/templates/clients.ldif
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ inum: %(admin_ui_client_id)s
jansAccessTknAsJwt: true
jansAccessTknSigAlg: RS256
jansAppTyp: web
jansAttrs: {"tlsClientAuthSubjectDn":"","runIntrospectionScriptBeforeAccessTokenAsJwtCreationAndIncludeClaims":false,"keepClientAuthorizationAfterExpiration":false,"allowSpontaneousScopes":false,"spontaneousScopes":[],"spontaneousScopeScriptDns":[],"backchannelLogoutUri":[],"backchannelLogoutSessionRequired":false,"additionalAudience":[],"postAuthnScripts":[],"consentGatheringScripts":[],"introspectionScripts":[],"rptClaimsScripts":[],"parLifetime":600,"requirePar":false,"jansAuthSignedRespAlg":"RS256","jansAuthEncRespAlg":null,"jansAuthEncRespEnc":null}
jansAttrs: {"tlsClientAuthSubjectDn":"","runIntrospectionScriptBeforeJwtCreation":false,"keepClientAuthorizationAfterExpiration":false,"allowSpontaneousScopes":false,"spontaneousScopes":[],"spontaneousScopeScriptDns":[],"backchannelLogoutUri":[],"backchannelLogoutSessionRequired":false,"additionalAudience":[],"postAuthnScripts":[],"consentGatheringScripts":[],"introspectionScripts":[],"rptClaimsScripts":[],"parLifetime":600,"requirePar":false,"jansAuthSignedRespAlg":"RS256","jansAuthEncRespAlg":null,"jansAuthEncRespEnc":null}
jansClntSecret: %(admin_ui_client_encoded_pw)s
jansDisabled: false
jansGrantTyp: authorization_code
Expand Down Expand Up @@ -35,11 +35,11 @@ dn: inum=%(token_server_admin_ui_client_id)s,ou=clients,o=jans
objectClass: top
objectClass: jansClnt
del: false
displayName: admin-ui-client
displayName: Token server admin-ui client
inum: %(token_server_admin_ui_client_id)s
jansAccessTknAsJwt: true
jansAccessTknSigAlg: RS256
jansAttrs: {"tlsClientAuthSubjectDn":"","runIntrospectionScriptBeforeAccessTokenAsJwtCreationAndIncludeClaims":true,"keepClientAuthorizationAfterExpiration":false,"allowSpontaneousScopes":false,"spontaneousScopes":[],"spontaneousScopeScriptDns":[],"backchannelLogoutUri":[],"backchannelLogoutSessionRequired":false,"additionalAudience":[],"postAuthnScripts":[],"consentGatheringScripts":[],"introspectionScripts":["inum=A44E-4F3D,ou=scripts,o=jans"],"rptClaimsScripts":[],"parLifetime":600,"requirePar":false,"jansAuthSignedRespAlg":"RS256","jansAuthEncRespAlg":null,"jansAuthEncRespEnc":null}
jansAttrs: {"tlsClientAuthSubjectDn":"","runIntrospectionScriptBeforeJwtCreation":true,"keepClientAuthorizationAfterExpiration":false,"allowSpontaneousScopes":false,"spontaneousScopes":[],"spontaneousScopeScriptDns":[],"backchannelLogoutUri":[],"backchannelLogoutSessionRequired":false,"additionalAudience":[],"postAuthnScripts":[],"consentGatheringScripts":[],"introspectionScripts":["inum=A44E-4F3D,ou=scripts,o=jans"],"rptClaimsScripts":[],"parLifetime":600,"requirePar":false,"jansAuthSignedRespAlg":"RS256","jansAuthEncRespAlg":null,"jansAuthEncRespEnc":null}
jansAppTyp: web
jansClntSecret: %(token_server_admin_ui_client_encoded_pw)s
jansDisabled: false
Expand Down
4 changes: 2 additions & 2 deletions docker-admin-ui/templates/env.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BASE_PATH=/admin
CONFIG_API_BASE_URL=%(config_api_base_url)s
API_BASE_URL=%(api_base_url)s
CONFIG_API_BASE_URL=https://%(hostname)s/jans-config-api
API_BASE_URL=https://%(hostname)s/jans-config-api/admin-ui
NPM_TOKEN=
SESSION_TIMEOUT_IN_MINUTES=30