diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java index 74ca6607b..bc5cce484 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java @@ -17,6 +17,7 @@ public class PrincipalBuilder extends Builder { private UUID id; private UUID token; private String name; + private String email; private Date expiresAt; private String avatarUrl; private Set authorities; @@ -43,6 +44,11 @@ public class PrincipalBuilder extends Builder { return this; } + public PrincipalBuilder email(String email) { + this.email = email; + return this; + } + public PrincipalBuilder expiresAt(Date expiresAt) { this.expiresAt = expiresAt; return this; @@ -98,6 +104,7 @@ public class PrincipalBuilder extends Builder { Principal principal = new Principal(); principal.setAuthorities(authorities); principal.setName(name); + principal.setEmail(email); principal.setExpiresAt(expiresAt); principal.setToken(token); principal.setId(id); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java index 4d849a51c..34fa80dc9 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java @@ -78,7 +78,9 @@ public class NonVerifiedUserEmailAuthenticationService extends AbstractAuthentic } Principal principal = this.apiContext.getOperationsContext().getBuilderFactory().getBuilder(PrincipalBuilder.class) .id(user.getId()).token(token.getToken()) - .expiresAt(token.getExpiresAt()).name(user.getName()) + .expiresAt(token.getExpiresAt()) + .name(user.getName()) + .email(user.getEmail()) .avatarUrl(avatarUrl) .culture(culture) .language(language) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java index d613b2b47..dfaca0d7a 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java @@ -87,7 +87,9 @@ public class VerifiedUserAuthenticationService extends AbstractAuthenticationSer } Principal principal = this.apiContext.getOperationsContext().getBuilderFactory().getBuilder(PrincipalBuilder.class) .id(user.getId()).token(token.getToken()) - .expiresAt(token.getExpiresAt()).name(user.getName()) + .expiresAt(token.getExpiresAt()) + .name(user.getName()) + .email(user.getEmail()) .avatarUrl(avatarUrl) .culture(culture) .language(language) diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java index 7f2992194..b7231ca78 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java @@ -12,6 +12,7 @@ public class Principal { private UUID id; private UUID token; private String name; + private String email; private Date expiresAt; private String avatarUrl; private Set authorities; @@ -47,6 +48,14 @@ public class Principal { this.name = name; } + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + public Date getExpiresAt() { return expiresAt; } diff --git a/dmp-frontend/src/app/core/model/auth/principal.ts b/dmp-frontend/src/app/core/model/auth/principal.ts index e5131a436..9307d33ea 100644 --- a/dmp-frontend/src/app/core/model/auth/principal.ts +++ b/dmp-frontend/src/app/core/model/auth/principal.ts @@ -4,6 +4,7 @@ export interface Principal { id: string; token: string; name: string; + email: string; expiresAt: Date; authorities: AppRole[]; avatarUrl: string;