Merge pull request #117 from correctexam/develop

Provide a clear config prooperty for shiboleth redirect
correctexam · Jan 10, 2024 · 7a05f0b · 7a05f0b
2 parents 60094be + 9e4550d
commit 7a05f0b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/fr/istic/web/rest/ShibAuth.java b/src/main/java/fr/istic/web/rest/ShibAuth.java
@@ -4,6 +4,9 @@
 import fr.istic.service.AuthenticationService;
 import fr.istic.service.UserService;
 import io.quarkus.security.runtime.QuarkusSecurityIdentity;
+
+import org.eclipse.microprofile.config.inject.ConfigProperties;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,6 +32,9 @@ public class ShibAuth {
     final String shibbolethLastName = "sn";
     final String shibbolethFirstName = "givenName";
 
+    @ConfigProperty(name="correctexam.shib.redirect.address",defaultValue = "https://correctexam-test.univ-rennes.fr?shib=true")
+    private String shibAdressRedirect;
+
     @Inject
     public ShibAuth(AuthenticationService authenticationService, TokenProvider tokenProvider, UserService userService, HttpServletRequest request) {
         this.authenticationService = authenticationService;
@@ -53,7 +59,7 @@ public Response askForRedirection()
     {
         log.debug("SHIB REDIRECTION");
         logHeadersShib();
-        return Response.seeOther(URI.create("https://correctexam-test.univ-rennes.fr?shib=true")).build();
+        return Response.seeOther(URI.create(shibAdressRedirect)).build();
     }
 
     @GET

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -7,6 +7,7 @@ application.name=correctExam
 %dev.quarkus.datasource.password=test
 %dev.quarkus.hibernate-orm.log.sql=false
 %dev.quarkus.http.port=8082
+%dev.correctexam.shib.redirect.address = https://correctexam-test.univ-rennes.fr?shib=true
 
 configcas.server_cas = https://sso-cas6-test.univ-rennes1.fr
 configcas.domain_service = https://correctexam-test.univ-rennes.fr
@@ -17,6 +18,7 @@ quarkus.liquibase.migrate-at-start=false
 %alone.quarkus.liquibase.migrate-at-start=true
 %alone.quarkus.hibernate-orm.second-level-caching-enabled=false
 %alone.correctexam.uses3=true
+%alone.correctexam.shib.redirect.address = https://correctexam-test.univ-rennes.fr?shib=true
 %alone.jhipster.mail.base-url=http://127.0.0.1:8080
 %alone.quarkus.datasource.db-kind=h2
 %alone.quarkus.datasource.jdbc.url=jdbc:h2:file:./mydb
@@ -34,6 +36,7 @@ quarkus.liquibase.migrate-at-start=false
 %prod.quarkus.datasource.password=test
 %prod.quarkus.liquibase.migrate-at-start=false
 %prod.quarkus.liquibase.change-log=config/liquibase/master.xml
+%prod.correctexam.shib.redirect.address = https://correctexam-test.univ-rennes.fr?shib=true
 
 
 #mysql
@@ -179,6 +182,7 @@ quarkus.minio.url=http://localhost:9000
 quarkus.minio.access-key=admin
 quarkus.minio.secret-key=minioadmin
 quarkus.minio.allow-empty=false
+
 correctexam.bucketname=test
 correctexam.uses3=true
 correctexam.saveasfile=false