From 13b7648be85df177fdd0486cd8845f540794d6af Mon Sep 17 00:00:00 2001 From: Jennifer Arps Date: Fri, 28 Jan 2022 12:27:06 +0100 Subject: [PATCH] [#141] change idp to idProvider, usage of Objects.isNull() --- .../java/de/bonndan/nivio/appuser/AppUser.java | 14 +++++++------- .../de/bonndan/nivio/appuser/AppUserRole.java | 17 +++++++++-------- .../nivio/security/CustomOAuth2User.java | 12 ++++++------ .../security/Oauth2LoginEventListener.java | 2 +- .../nivio/appuser/AppUserRepositoryTest.java | 4 ++-- .../bonndan/nivio/appuser/AppUserRoleTest.java | 4 ++-- .../de/bonndan/nivio/appuser/AppUserTest.java | 14 +++++++------- .../security/CustomOAuth2UserServiceTest.java | 3 ++- .../nivio/security/CustomOAuth2UserTest.java | 4 ++-- 9 files changed, 38 insertions(+), 36 deletions(-) diff --git a/src/main/java/de/bonndan/nivio/appuser/AppUser.java b/src/main/java/de/bonndan/nivio/appuser/AppUser.java index e93df8e8f..c3632994f 100644 --- a/src/main/java/de/bonndan/nivio/appuser/AppUser.java +++ b/src/main/java/de/bonndan/nivio/appuser/AppUser.java @@ -9,8 +9,8 @@ uniqueConstraints = { @UniqueConstraint(name = "emailUnique", columnNames = "email"), - @UniqueConstraint(name = "externalIdAndIdpUnique", - columnNames = {"externalId", "idp"}) + @UniqueConstraint(name = "externalIdAndIdProviderUnique", + columnNames = {"externalId", "idProvider"}) } ) @@ -40,11 +40,11 @@ public class AppUser { private String externalId; @Column( - name = "idp", + name = "idProvider", nullable = false, columnDefinition = "VARCHAR" ) - private String idp; + private String idProvider; @Column( name = "name", @@ -111,8 +111,8 @@ public String getExternalId() { return externalId; } - public String getIdp() { - return idp; + public String getIdProvider() { + return idProvider; } public Boolean getLocked() { @@ -159,6 +159,6 @@ public void setExternalId(String externalId) { this.externalId = externalId; } - public void setIdp(String idp) { this.idp = idp; } + public void setIdProvider(String idProvider) { this.idProvider = idProvider; } } diff --git a/src/main/java/de/bonndan/nivio/appuser/AppUserRole.java b/src/main/java/de/bonndan/nivio/appuser/AppUserRole.java index b0c90fad9..10e9125a1 100644 --- a/src/main/java/de/bonndan/nivio/appuser/AppUserRole.java +++ b/src/main/java/de/bonndan/nivio/appuser/AppUserRole.java @@ -1,5 +1,7 @@ package de.bonndan.nivio.appuser; +import java.util.Objects; + public enum AppUserRole { USER, ADMIN; @@ -9,14 +11,13 @@ public enum AppUserRole { // `of` as a substitute for `valueOf` handling the default value public static AppUserRole of(String value) { - - if(!value.equals("ADMIN")) return defaultValue; - return AppUserRole.valueOf(value); - } - - // `defaultOr` for handling default value for null - public static AppUserRole defaultOr(AppUserRole value) { - return value != null ? value : defaultValue; + if (Objects.isNull(value)) { + return defaultValue; + } + else if (!ADMIN.name().equalsIgnoreCase(value)){ + return defaultValue; + } + else return AppUserRole.valueOf(value); } } diff --git a/src/main/java/de/bonndan/nivio/security/CustomOAuth2User.java b/src/main/java/de/bonndan/nivio/security/CustomOAuth2User.java index 7cb2732cd..d0b1aaa6e 100644 --- a/src/main/java/de/bonndan/nivio/security/CustomOAuth2User.java +++ b/src/main/java/de/bonndan/nivio/security/CustomOAuth2User.java @@ -10,7 +10,7 @@ import org.springframework.security.oauth2.core.user.OAuth2User; /** - * Implementation of {@link OAuth2User} which provides an alias, name, avatar url, external id, and idp + * Implementation of {@link OAuth2User} which provides an alias, name, avatar url, external id, and idProvider */ public class CustomOAuth2User implements OAuth2User { @@ -19,7 +19,7 @@ public class CustomOAuth2User implements OAuth2User { @NonNull private final String alias; private final String externalId; - private final String idp; + private final String idProvider; private final Map attributes; private final Collection authorities; @@ -29,13 +29,13 @@ public CustomOAuth2User(@NonNull final String externalId, @NonNull final Map attributes, @NonNull final Collection authorities, @Nullable final String avatarUrl, - @NonNull final String idp + @NonNull final String idProvider ) { this.externalId = Objects.requireNonNull(externalId, "id must not be null"); this.alias = Objects.requireNonNull(alias, "alias must not be null"); this.attributes = Objects.requireNonNull(attributes, "attributes must not be null"); this.authorities = Objects.requireNonNull(authorities, "authorities must not be null"); - this.idp = Objects.requireNonNull(idp, "idp must not be null"); + this.idProvider = Objects.requireNonNull(idProvider, "idp must not be null"); this.name = name; this.avatarUrl = avatarUrl; @@ -67,8 +67,8 @@ public String getAlias() { } @NonNull - public String getIdp() { - return idp; + public String getIdProvider() { + return idProvider; } @NonNull diff --git a/src/main/java/de/bonndan/nivio/security/Oauth2LoginEventListener.java b/src/main/java/de/bonndan/nivio/security/Oauth2LoginEventListener.java index b9c206ab8..40f454fea 100644 --- a/src/main/java/de/bonndan/nivio/security/Oauth2LoginEventListener.java +++ b/src/main/java/de/bonndan/nivio/security/Oauth2LoginEventListener.java @@ -35,7 +35,7 @@ public void onLogin(final OAuth2LoginEvent oAuth2LoginEvent) { newAppUser.setLocked(false); newAppUser.setEnabled(true); newAppUser.setExternalId(customOAuth2User.getExternalId()); - newAppUser.setIdp(customOAuth2User.getIdp()); + newAppUser.setIdProvider(customOAuth2User.getIdProvider()); appUserRepository.save(newAppUser); } diff --git a/src/test/java/de/bonndan/nivio/appuser/AppUserRepositoryTest.java b/src/test/java/de/bonndan/nivio/appuser/AppUserRepositoryTest.java index 7703d5d83..48e99aeb4 100644 --- a/src/test/java/de/bonndan/nivio/appuser/AppUserRepositoryTest.java +++ b/src/test/java/de/bonndan/nivio/appuser/AppUserRepositoryTest.java @@ -23,7 +23,7 @@ void findByExternalId() { appUser.setExternalId("100"); appUser.setAlias("login"); appUser.setAppUserRole(AppUserRole.USER); - appUser.setIdp("github"); + appUser.setIdProvider("github"); appUserRepository.save(appUser); // when @@ -37,7 +37,7 @@ void findByExternalId() { assertThat(fetched.getExternalId()).isNotNull().isEqualTo(appUser.getExternalId()); assertThat(fetched.getAlias()).isNotNull().isEqualTo(appUser.getAlias()); assertThat(fetched.getId()).isNotNull(); - assertThat(fetched.getIdp()).isNotNull().isEqualTo(appUser.getIdp()); + assertThat(fetched.getIdProvider()).isNotNull().isEqualTo(appUser.getIdProvider()); assertThat(fetched.getAppUserRole()).isNotNull().isEqualTo(appUser.getAppUserRole()); }); diff --git a/src/test/java/de/bonndan/nivio/appuser/AppUserRoleTest.java b/src/test/java/de/bonndan/nivio/appuser/AppUserRoleTest.java index ffae592ee..ffa207eed 100644 --- a/src/test/java/de/bonndan/nivio/appuser/AppUserRoleTest.java +++ b/src/test/java/de/bonndan/nivio/appuser/AppUserRoleTest.java @@ -3,7 +3,6 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; class AppUserRoleTest { @@ -19,6 +18,7 @@ void valueOf() { assertEquals(AppUserRole.valueOf("USER"), user); // handling default value for null and random string assertEquals(AppUserRole.of("test"), user); - assertEquals(AppUserRole.defaultOr(null), user); + assertEquals(AppUserRole.of(null), user); } + } diff --git a/src/test/java/de/bonndan/nivio/appuser/AppUserTest.java b/src/test/java/de/bonndan/nivio/appuser/AppUserTest.java index d2cb8db57..de6b39a75 100644 --- a/src/test/java/de/bonndan/nivio/appuser/AppUserTest.java +++ b/src/test/java/de/bonndan/nivio/appuser/AppUserTest.java @@ -73,11 +73,11 @@ void getExternalId() { } @Test - void getIdp() { + void getIdProvider() { // when - appUser.setIdp("github"); + appUser.setIdProvider("github"); // then - assertEquals("github", appUser.getIdp()); + assertEquals("github", appUser.getIdProvider()); } @Test @@ -185,13 +185,13 @@ void setExternalId() { } @Test - void setIdp() { + void setIdProvider() { // given - String idp = "github"; + String idProvider = "github"; // when - appUser.setIdp(idp); + appUser.setIdProvider(idProvider); // then - assertEquals(idp, appUser.getIdp()); + assertEquals(idProvider, appUser.getIdProvider()); } } diff --git a/src/test/java/de/bonndan/nivio/security/CustomOAuth2UserServiceTest.java b/src/test/java/de/bonndan/nivio/security/CustomOAuth2UserServiceTest.java index a57032d2d..e3f8bc632 100644 --- a/src/test/java/de/bonndan/nivio/security/CustomOAuth2UserServiceTest.java +++ b/src/test/java/de/bonndan/nivio/security/CustomOAuth2UserServiceTest.java @@ -20,13 +20,14 @@ @DataJpaTest class CustomOAuth2UserServiceTest { + private OAuth2User oAuth2User; private String name = "Mary"; private String login = "foo"; private String avatarUrl = "https://www.avatar.com"; private String externalId = "123"; - private String idp = "github"; + private String idProvider = "github"; private Collection authorities; private CustomOAuth2User customOAuth2User; private ApplicationEventPublisher applicationEventPublisher; diff --git a/src/test/java/de/bonndan/nivio/security/CustomOAuth2UserTest.java b/src/test/java/de/bonndan/nivio/security/CustomOAuth2UserTest.java index 3cb97a39c..6e6d46685 100644 --- a/src/test/java/de/bonndan/nivio/security/CustomOAuth2UserTest.java +++ b/src/test/java/de/bonndan/nivio/security/CustomOAuth2UserTest.java @@ -22,7 +22,7 @@ class CustomOAuth2UserTest { private String login = "foo"; private String avatarUrl = "https://www.avatar.com"; private String email = "email"; - String idp = "github"; + String idProvider = "github"; String externalId = "123"; private Collection authorities; @@ -77,6 +77,6 @@ void getAuthorities() { } @Test - void getIdp() { assertThat(customOAuth2User.getIdp()).isEqualTo(idp); } + void getIdProvider() { assertThat(customOAuth2User.getIdProvider()).isEqualTo(idProvider); } }