default when no base_url

ProgrammeVitam · Dec 19, 2023 · 9a5bb90 · 9a5bb90
1 parent d7924d3
commit 9a5bb90
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/deployment/roles/nginx_webapp/templates/frontend/config.json.j2 b/deployment/roles/nginx_webapp/templates/frontend/config.json.j2
@@ -32,7 +32,7 @@
   "ALLOWED_URLS": ["/{{ vitamui_struct.vitamui_component | regex_replace('^ui-', '') }}-api"],
   {% endif %}
   "OIDC_CONFIG": {
-    "issuer": "{{ vitamui.cas_server.base_url | default(url_prefix+'/cas') }}"/oidc",
+    "issuer": "{{ vitamui.cas_server.base_url | default(url_prefix+'/cas') }}/oidc",
     "redirectUri": "?",
     "postLogoutRedirectUri": "{{ vitamui.portal.base_url | default(url_prefix+'/') }}",
     "clientId": "{{ vitamui_struct.vitamui_component | regex_replace('^ui-', '') }}",

diff --git a/...t/scripts/mongod/v7.1/003_TRV-399_enable_oidc_code_grant_type_on_portal_service_ref.js.j2 b/...t/scripts/mongod/v7.1/003_TRV-399_enable_oidc_code_grant_type_on_portal_service_ref.js.j2
@@ -10,7 +10,7 @@ db.services.insertOne({
   _id: NumberInt(1),
   _class: "org.apereo.cas.services.OidcRegisteredService",
   clientId: "{{ vitamui.portal.clientId | default('portal') }}",
-  serviceId: "{{ vitamui.portal.serviceId | default('^' + vitamui.portal.base_url + '/.*') }}",
+  serviceId: "{{ vitamui.portal.serviceId | default('^' + vitamui.portal.base_url | default(url_prefix) + '/.*') }}",
   name: "{{ vitamui.portal.name | default('Portal Application') }}",
   bypassApprovalPrompt: true,
   supportedGrantTypes: ["authorization_code"],

diff --git a/...scripts/mongod/v7.1/004_TRV-400_enable_oidc_code_grant_type_on_identity_service_ref.js.j2 b/...scripts/mongod/v7.1/004_TRV-400_enable_oidc_code_grant_type_on_identity_service_ref.js.j2
@@ -10,7 +10,7 @@ db.services.insertOne({
   _id: NumberInt(2),
   _class: "org.apereo.cas.services.OidcRegisteredService",
   clientId: "{{ vitamui.identity.clientId | default('identity') }}",
-  serviceId: "{{ vitamui.identity.serviceId | default('^' + vitamui.identity.base_url + '/.*') }}",
+  serviceId: "{{ vitamui.identity.serviceId | default('^' + vitamui.identity.base_url | default(url_prefix+'/identity') + '/.*') }}",
   name: "{{ vitamui.identity.name | default('Identity Access Management Application') }}",
   bypassApprovalPrompt: true,
   supportedGrantTypes: ["authorization_code"],
@@ -29,7 +29,7 @@ db.services.insertOne({
   _id: NumberInt(3),
   _class: "org.apereo.cas.services.OidcRegisteredService",
   clientId: "{{ vitamui.identity_admin.clientId | default('identity-admin') }}",
-  serviceId: "{{ vitamui.identity_admin.serviceId | default('^' + vitamui.identity_admin.base_url + '/.*') }}",
+  serviceId: "{{ vitamui.identity_admin.serviceId | default('^' + vitamui.identity_admin.base_url | default(url_prefix+'/identity_admin') + '/.*') }}",
   name: "{{ vitamui.identity_admin.name | default('Identity Admin Access Management Application') }}",
   bypassApprovalPrompt: true,
   supportedGrantTypes: ["authorization_code"],

diff --git a/...ment/scripts/mongod/v7.1/037_enable_oidc_code_grant_type_on_referential_service_ref.js.j2 b/...ment/scripts/mongod/v7.1/037_enable_oidc_code_grant_type_on_referential_service_ref.js.j2
@@ -10,7 +10,7 @@ db.services.insertOne({
   _id: NumberInt(4),
   _class: "org.apereo.cas.services.OidcRegisteredService",
   clientId: "{{ vitamui.referential.clientId | default('referential') }}",
-  serviceId: "{{ vitamui.referential.serviceId | default('^' + vitamui.referential.base_url + '/.*') }}",
+  serviceId: "{{ vitamui.referential.serviceId | default('^' + vitamui.referential.base_url | default(url_prefix+'/referential') + '/.*') }}",
   name: "{{ vitamui.referential.name | default('Referential Application') }}",
   bypassApprovalPrompt: true,
   supportedGrantTypes: ["authorization_code"],