From bde479b4ac391acb7db246bba8cc2f00e9076fe2 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Wed, 8 Dec 2021 13:57:39 +0200
Subject: [PATCH] Change default value of userInfoUrl. Add redis configuration
 to ReadMe

---
 README.md                                         | 15 +++++++++------
 .../stateless/utils/AuthorizationUtils.java       |  2 +-
 src/main/resources/authorization.properties       |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 9534adc..76cbceb 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ a Redis http session.
 In stateless strategy, there is not a session. A filter makes a request
 to an "userinfo" endpoint and creates an Authentication base on the response.
 The advantage of this method is that it doesn't need any storage to store 
-user's session, but with the cost of an extra http request per request.
+user's session, but with a cost of an extra http request per request.
 
 ### Usage
 
@@ -19,7 +19,7 @@ user's session, but with the cost of an extra http request per request.
     <dependency>
         <groupId>eu.dnetlib</groupId>
         <artifactId>uoa-authorization-library</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
     </dependency>
 
 #### Spring Application/Configuration
@@ -35,8 +35,8 @@ user's session, but with the cost of an extra http request per request.
 
 #### Configuration
 
-    authorization.security.userInfoUrl = http://<domain>/login-service/userInfo
-    authorization.security.session=openAIRESession # Default, do not change
+    authorization.security.userInfoUrl = http://<domain>/login-service/userInfo # Required, default ""
+    authorization.security.session=<session-cookie-name> # Default openAIRESession
 
 ## Redis
 
@@ -52,7 +52,7 @@ where session is stored.
     <dependency>
         <groupId>eu.dnetlib</groupId>
         <artifactId>uoa-authorization-library</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1</version>
         <classifier>redis</classifier>
     </dependency>
 
@@ -69,8 +69,11 @@ where session is stored.
 
 #### Configuration
 
+    authorization.secuirty.redis.host=<redis-ip> # Default localhost
+    authorization.secuirty.redis.port=<redis-port> # Default 6379
+    authorization.secuirty.redis.password=<redis-password> # Default ""
     authorization.security.domain=<domain-suffix> # e.g openaire.eu
-    authorization.security.session=openAIRESession # Default, do not change
+    authorization.security.session=<session-cookie-name> # Default openAIRESession
 
 
 ## Authorize Requests
diff --git a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/stateless/utils/AuthorizationUtils.java b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/stateless/utils/AuthorizationUtils.java
index 0c3b3d2..35f3f36 100644
--- a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/stateless/utils/AuthorizationUtils.java
+++ b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/stateless/utils/AuthorizationUtils.java
@@ -27,7 +27,7 @@ public class AuthorizationUtils {
         String url = securityConfig.getUserInfoUrl();
         RestTemplate restTemplate = new RestTemplate();
         try {
-            if(hasCookie(request)) {
+            if(url != null && hasCookie(request)) {
                 ResponseEntity<UserInfo> response = restTemplate.exchange(url, HttpMethod.GET, createHeaders(request), UserInfo.class);
                 return response.getBody();
             }
diff --git a/src/main/resources/authorization.properties b/src/main/resources/authorization.properties
index 313d978..0cb88d4 100644
--- a/src/main/resources/authorization.properties
+++ b/src/main/resources/authorization.properties
@@ -1,6 +1,6 @@
 #dev
 spring.session.store-type=none
-authorization.security.userInfoUrl = http://mpagasas.di.uoa.gr:8080/login-service/userInfo
+authorization.security.userInfoUrl=
 authorization.security.domain=di.uoa.gr
 authorization.security.session=openAIRESession
 authorization.globalVars.buildDate=@timestampAuthorizationLibrary@