MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Add Email Field on Principal

This commit is contained in:
George Kalampokis 2020-07-17 13:15:44 +03:00
parent 182c215069
commit 4127a05da4
5 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/PrincipalBuilder.java
View File

@ -17,6 +17,7 @@ public class PrincipalBuilder extends Builder<Principal> {
private UUID id;
private UUID token;
private String name;
private String email;
private Date expiresAt;
private String avatarUrl;
private Set<Authorities> authorities;
@ -43,6 +44,11 @@ public class PrincipalBuilder extends Builder<Principal> {
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 principal = new Principal();
principal.setAuthorities(authorities);
principal.setName(name);
principal.setEmail(email);
principal.setExpiresAt(expiresAt);
principal.setToken(token);
principal.setId(id);

4
dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java
View File

@ -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)

4
dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java
View File

@ -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)

9
dmp-backend/web/src/main/java/eu/eudat/models/data/security/Principal.java
View File

@ -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> 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;
}

1
dmp-frontend/src/app/core/model/auth/principal.ts
View File

@ -4,6 +4,7 @@ export interface Principal {
id: string;
token: string;
name: string;
email: string;
expiresAt: Date;
authorities: AppRole[];
avatarUrl: string;