diff --git a/backend/src/main/java/de/szut/casino/security/oauth2/GitHubOAuth2UserInfo.java b/backend/src/main/java/de/szut/casino/security/oauth2/GitHubOAuth2UserInfo.java index baf8995..77ac16c 100644 --- a/backend/src/main/java/de/szut/casino/security/oauth2/GitHubOAuth2UserInfo.java +++ b/backend/src/main/java/de/szut/casino/security/oauth2/GitHubOAuth2UserInfo.java @@ -22,9 +22,4 @@ public class GitHubOAuth2UserInfo extends OAuth2UserInfo { public String getEmail() { return (String) attributes.get("email"); } - - @Override - public String getImageUrl() { - return (String) attributes.get("avatar_url"); - } } \ No newline at end of file diff --git a/backend/src/main/java/de/szut/casino/security/oauth2/OAuth2UserInfo.java b/backend/src/main/java/de/szut/casino/security/oauth2/OAuth2UserInfo.java index 3acd762..5019bb1 100644 --- a/backend/src/main/java/de/szut/casino/security/oauth2/OAuth2UserInfo.java +++ b/backend/src/main/java/de/szut/casino/security/oauth2/OAuth2UserInfo.java @@ -1,7 +1,10 @@ package de.szut.casino.security.oauth2; +import lombok.Getter; + import java.util.Map; +@Getter public abstract class OAuth2UserInfo { protected Map attributes; @@ -9,15 +12,9 @@ public abstract class OAuth2UserInfo { this.attributes = attributes; } - public Map getAttributes() { - return attributes; - } - public abstract String getId(); public abstract String getName(); public abstract String getEmail(); - - public abstract String getImageUrl(); } \ No newline at end of file diff --git a/backend/src/main/java/de/szut/casino/security/oauth2/UserPrincipal.java b/backend/src/main/java/de/szut/casino/security/oauth2/UserPrincipal.java index 6c993a0..1460982 100644 --- a/backend/src/main/java/de/szut/casino/security/oauth2/UserPrincipal.java +++ b/backend/src/main/java/de/szut/casino/security/oauth2/UserPrincipal.java @@ -1,6 +1,8 @@ package de.szut.casino.security.oauth2; import de.szut.casino.user.UserEntity; +import lombok.Getter; +import lombok.Setter; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; @@ -12,11 +14,14 @@ import java.util.List; import java.util.Map; public class UserPrincipal implements OAuth2User, UserDetails { + @Getter private Long id; + @Getter private String email; private String username; private String password; private Collection authorities; + @Setter private Map attributes; public UserPrincipal(Long id, String email, String username, String password, Collection authorities) { @@ -46,14 +51,6 @@ public class UserPrincipal implements OAuth2User, UserDetails { return userPrincipal; } - public Long getId() { - return id; - } - - public String getEmail() { - return email; - } - @Override public String getPassword() { return password; @@ -99,10 +96,6 @@ public class UserPrincipal implements OAuth2User, UserDetails { return attributes; } - public void setAttributes(Map attributes) { - this.attributes = attributes; - } - @Override public String getName() { return String.valueOf(id);