Skip to content

Add user type #25 #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rmitoi wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Add user type #25 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d5f605
Add user type #25
rmitoi Mar 28, 2020
22bd990
Add user type #25
rmitoi Mar 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions api/src/main/java/com/code4ro/nextdoor/authentication/entity/Role.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.code4ro.nextdoor.authentication.entity;

public enum Role {
REGULAR, PUBLIC_AUTHORITY, PUBLIC_UTILITY
}
25 changes: 17 additions & 8 deletions api/src/main/java/com/code4ro/nextdoor/authentication/entity/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,30 @@
package com.code4ro.nextdoor.authentication.entity;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;

import com.code4ro.nextdoor.core.entity.BaseEntity;
import lombok.AllArgsConstructor;

import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

import javax.persistence.Column;
import javax.persistence.Entity;

@Entity
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class User extends BaseEntity {
@Column(unique = true)
private String email;
private String password;
@Column(unique = true)
private String email;
private String password;

@Enumerated(EnumType.STRING)
private Role role;

public User(String email, String password) {
this.email = email;
this.password = password;
}
}
27 changes: 18 additions & 9 deletions api/src/main/java/com/code4ro/nextdoor/security/entity/UserPrincipal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,40 @@
package com.code4ro.nextdoor.security.entity;

import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.UUID;

import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;

import com.code4ro.nextdoor.authentication.entity.Role;
import com.code4ro.nextdoor.authentication.entity.User;
import com.fasterxml.jackson.annotation.JsonIgnore;

import lombok.AllArgsConstructor;
import lombok.Getter;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;

import java.util.Collection;
import java.util.Collections;
import java.util.UUID;

@Getter
@AllArgsConstructor
public class UserPrincipal implements UserDetails {
private UUID id;
private String email;
private String email;
@JsonIgnore
private String password;
private Role userRole;

public static UserPrincipal create(final User user) {
return new UserPrincipal(user.getId(), user.getEmail(), user.getPassword());
return new UserPrincipal(user.getId(), user.getEmail(), user.getPassword(), user.getRole());
}

@Override
public Collection<? extends GrantedAuthority> getAuthorities() {
return Collections.emptyList();
if (this.getUserRole() == null) {
return Collections.emptyList();
}
return List.of(new SimpleGrantedAuthority(this.getUserRole().toString()));
}

@Override
Expand Down