From 616f782155041cbe1312175e0569311a34148d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= <y0rune@aol.com>
Date: Fri, 4 Dec 2020 15:54:49 +0100
Subject: [PATCH] Updated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcin Woźniak <y0rune@aol.com>
---
 .../java/com/plannaplan/controllers/TokenController.java | 9 +++++++--
 restservice/src/main/resources/application.properties    | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/restservice/src/main/java/com/plannaplan/controllers/TokenController.java b/restservice/src/main/java/com/plannaplan/controllers/TokenController.java
index 8de674a..77272e6 100755
--- a/restservice/src/main/java/com/plannaplan/controllers/TokenController.java
+++ b/restservice/src/main/java/com/plannaplan/controllers/TokenController.java
@@ -4,7 +4,9 @@ import com.plannaplan.entities.User;
 import com.plannaplan.exceptions.UserNotFoundException;
 import com.plannaplan.security.cas.CasUserIdentity;
 import com.plannaplan.security.cas.CasValidationExcepiton;
+import com.plannaplan.security.cas.CasValidator;
 import com.plannaplan.security.cas.CustomUAMCasValidator;
+import com.plannaplan.security.cas.DefaultUAMCasValidator;
 import com.plannaplan.services.UserService;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +28,10 @@ import io.swagger.annotations.ApiParam;
 public class TokenController {
 
     @Value("${plannaplan.frontendUrl}")
-    private String SERVICE_URL;
+    private String serviceUrl;
+
+    @Value("${plannaplan.dev}")
+    private boolean isDev;
 
     @Autowired
     private UserService userService;
@@ -35,7 +40,7 @@ public class TokenController {
     @ApiOperation(value = "Endpoint to access token required to call secured endpoints. In order to access token we need to provide access token comming from unviersity CAS system")
     public ResponseEntity<String> getToken(
             @RequestParam("ticket") @ApiParam(value = "Ticket get from CAS system. It should look like ST-1376572-wo41gty5R0JCZFKMMie2-cas.amu.edu.psl") final String ticket) {
-        final CustomUAMCasValidator validator = new CustomUAMCasValidator(SERVICE_URL, ticket);
+        final CasValidator validator = isDev ? new DefaultUAMCasValidator(serviceUrl, ticket) : new CustomUAMCasValidator(serviceUrl, ticket);
 
         try {
             final CasUserIdentity casUserIdentity = validator.validate();
diff --git a/restservice/src/main/resources/application.properties b/restservice/src/main/resources/application.properties
index 4ec6d84..27bae32 100755
--- a/restservice/src/main/resources/application.properties
+++ b/restservice/src/main/resources/application.properties
@@ -11,4 +11,5 @@ spring.jackson.default-property-inclusion = NON_NULL
 
 server.port=1285
 
+plannaplan.dev = true
 plannaplan.frontendUrl = http://localhost:3000
\ No newline at end of file