default when no base_url

ProgrammeVitam · Dec 19, 2023 · 28f928b · 28f928b
1 parent d7924d3
commit 28f928b
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 55 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"],

diff --git a/pom.xml b/pom.xml
@@ -1725,19 +1725,6 @@
                                 </arguments>
                             </configuration>
                         </execution>
-                        <!--<execution>
-                            <id>npm run package</id>
-                            <goals>
-                                <goal>npm</goal>
-                            </goals>
-                            <phase>package</phase>
-                            <configuration>
-                                <skip>${skipAllFrontend}</skip>
-                                <arguments>run package${angular.build.profile}
-                                project=${angular.build.project}
-                                </arguments>
-                            </configuration>
-                        </execution>-->
                     </executions>
                 </plugin>
                 <plugin>
@@ -2095,37 +2082,6 @@
                 </plugins>
             </build>
         </profile>
-
-        <!-- This profile is used to build rpm package.-->
-        <!--<profile>
-            <id>rpm-publish</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>rpm-publish</id>
-                                <phase>deploy</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <skip>${rpm.skip}</skip>
-                                    <executable>${main.basedir}/tools/packaging/publish.sh</executable>
-                                    <workingDirectory>target</workingDirectory>
-                                    <arguments>
-                                        <argument>${rpm.publication.env}</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>-->
-
         <!-- This profile is used to define skipTests value for Karma when -DskipTests is used
         during maven process. -->
         <profile>

diff --git a/ui/ui-frontend/pom.xml b/ui/ui-frontend/pom.xml
@@ -104,8 +104,6 @@
             <phase>process-sources</phase>
             <configuration>
               <skip>${skipAllFrontend}</skip>
-              <!--<arguments>run build project=${angular.build.project} output-path=target/www</arguments>-->
-              <!--<arguments>run build:prod output-path=target/www</arguments>-->
               <arguments>run build:allModules</arguments>
             </configuration>
           </execution>
@@ -128,11 +126,7 @@
             <phase>package</phase>
             <configuration>
               <skip>${skipAllFrontend}</skip>
-              <!--<arguments>run package  project=</arguments>-->
               <arguments>run package:all</arguments>
-              <!--<arguments>run package${angular.build.profile}
-                project=${angular.build.project}
-            </arguments>-->
             </configuration>
           </execution>
         </executions>