From d01da644063d67354ca7890760ef38ed4a88ff19 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Fri, 20 Nov 2020 15:05:04 +0000
Subject: [PATCH]

---
 .../security/UserDetailsServiceImpl.java               |  2 +-
 .../uoaauthorizationlibrary/utils/UserInfo.java        | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/security/UserDetailsServiceImpl.java b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/security/UserDetailsServiceImpl.java
index 634a577..2991bc1 100644
--- a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/security/UserDetailsServiceImpl.java
+++ b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/security/UserDetailsServiceImpl.java
@@ -40,7 +40,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
         }
 
         return org.springframework.security.core.userdetails.User
-                .withUsername(user.getEmail()).password("")
+                .withUsername(user.getEmail()).password(user.getSub())
                 .authorities(getAuthorities(user.getRoles()))
                 .accountExpired(false)
                 .accountLocked(false)
diff --git a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/utils/UserInfo.java b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/utils/UserInfo.java
index 939813f..6df56f5 100644
--- a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/utils/UserInfo.java
+++ b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/utils/UserInfo.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class UserInfo {
+    String sub;
     String name;
     String email;
     List<String> edu_person_entitlements = new ArrayList<String>();
@@ -12,6 +13,7 @@ public class UserInfo {
     @Override
     public String toString() {
         return "UserInfo{" +
+                "sub='" + sub + '\'' +
                 "name='" + name + '\'' +
                 ", email='" + email + '\'' +
                 ", edu_person_entitlements=" + edu_person_entitlements +
@@ -19,6 +21,14 @@ public class UserInfo {
                 '}';
     }
 
+    public String getSub() {
+        return sub;
+    }
+
+    public void setSub(String sub) {
+        this.sub = sub;
+    }
+
     public String getName() {
         return name;
     }