SZUT/casino
SZUT/casino
Archived
3
1
Fork 0
Code Issues Pull requests 2 Releases 162 Packages 2 Wiki Activity Actions

refactor: simplify UserPrincipal and OAuth2UserInfo classes
Some checks failed
CI / Get Changed Files (pull_request) Successful in 8s
Details
CI / oxlint (pull_request) Successful in 26s
Details
CI / Docker frontend validation (pull_request) Successful in 30s
Details
CI / eslint (pull_request) Successful in 34s
Details
CI / prettier (pull_request) Failing after 37s
Details
CI / Checkstyle Main (pull_request) Failing after 1m29s
Details
CI / test-build (pull_request) Successful in 1m30s
Details
CI / Docker backend validation (pull_request) Successful in 1m54s
Details

Browse source
This commit is contained in:
Constantin Simonis 2025-05-21 10:54:31 +02:00
commit 6f264dccf7
No known key found for this signature in database
GPG key ID: 3878FF77C24AF4D2
3 changed files with 8 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
backend/src/main/java/de/szut/casino/security/oauth2/GitHubOAuth2UserInfo.java
View file

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

9
backend/src/main/java/de/szut/casino/security/oauth2/OAuth2UserInfo.java
View file

@ -1,7 +1,10 @@
package de.szut.casino.security.oauth2;
import lombok.Getter;
import java.util.Map;
@Getter
public abstract class OAuth2UserInfo {
protected Map<String, Object> attributes;
@ -9,15 +12,9 @@ public abstract class OAuth2UserInfo {
this.attributes = attributes;
}
public Map<String, Object> getAttributes() {
return attributes;
}
public abstract String getId();
public abstract String getName();
public abstract String getEmail();
public abstract String getImageUrl();
}

17
backend/src/main/java/de/szut/casino/security/oauth2/UserPrincipal.java
View file

@ -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<? extends GrantedAuthority> authorities;
@Setter
private Map<String, Object> attributes;
public UserPrincipal(Long id, String email, String username, String password, Collection<? extends GrantedAuthority> 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<String, Object> attributes) {
this.attributes = attributes;
}
@Override
public String getName() {
return String.valueOf(id);