[#141] PR Daniel comments

pom.xml

@@ -324,14 +324,6 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.22</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>

src/main/java/de/bonndan/nivio/appuser/AppUser.java

@@ -202,4 +202,4 @@ public void setExternalId(String externalId) {
     }
 
     public void setIdp(String idp) { this.idp = idp; }
-}
+}

src/main/java/de/bonndan/nivio/appuser/AppUserService.java

@@ -20,4 +20,4 @@ public UserDetails loadUserByUsername(String externalId) throws UsernameNotFound
                 .orElseThrow(() -> new UsernameNotFoundException(String.format(USER_NOT_FOUND, externalId)));
     }
 
-}
+}

src/main/java/de/bonndan/nivio/security/AuthConfigProperties.java

@@ -59,4 +59,4 @@ public String getGithubAliasAttribute() {
     public void setGithubAliasAttribute(String githubAliasAttribute) {
         this.githubAliasAttribute = githubAliasAttribute;
     }
-}
+}

src/main/java/de/bonndan/nivio/security/CustomOAuth2User.java

@@ -74,4 +74,4 @@ public String getIdp() {
     public String getExternalId() {
         return externalId;
     }
-}
+}

src/main/java/de/bonndan/nivio/security/CustomOAuth2UserService.java

@@ -102,4 +102,4 @@ private void saveUser(CustomOAuth2User customOAuth2User) {
         }
 
     }
-}
+}

src/main/java/de/bonndan/nivio/security/LoginController.java

@@ -66,4 +66,4 @@ public String showLoginPage(Model model, OAuth2AuthenticationToken token) {
         return "login";
     }
 
-}
+}

src/main/java/de/bonndan/nivio/security/MvcConfig.java

@@ -15,4 +15,3 @@ public void addViewControllers(ViewControllerRegistry registry) {
     }
 
 }
-

src/main/java/de/bonndan/nivio/security/SecurityConfig.java

@@ -150,4 +150,4 @@ public void writeHeaders(HttpServletRequest request, HttpServletResponse respons
         }
 
     }
-}
+}

src/main/resources/application.yml

@@ -123,15 +123,3 @@ spring:
       hibernate:
         format_sql: true
         dialect: org.hibernate.dialect.H2Dialect
-
-
-#security:
-#  oauth2:
-#    client:
-#      access-token-uri: https://github.com/login/oauth/access_token
-#      user-authorization-uri: https://github.com/login/oauth/authorize
-#      scope: read:user,user:email
-#      client-id: 89a7c4facbb3434d599d
-#      client-secret: 9b3b08e4a340bd20e866787e4645b54f73d74b6a
-#    resource:
-#      user-info-uri: https://api.github.com/user

src/test/java/de/bonndan/nivio/appuser/AppUserRepositoryTest.java

@@ -15,21 +15,24 @@ class AppUserRepositoryTest {
     @Autowired
     private AppUserRepository appUserRepository;
 
-    AppUserService appUserService = new AppUserService(appUserRepository);
-
-
     @Test
     void findByExternalId() {
+
+        AppUser appUser1 = new AppUser();
+        appUserRepository.save(appUser1);
+        // given
         Optional<AppUser> appUser = Optional.of(new AppUser());
         appUser.get().setExternalId("100");
         appUser.get().setAlias("login");
         appUser.get().setAppUserRole(AppUserRole.USER);
         appUser.get().setId(1L);
         appUser.get().setIdp("github");
 
+        // when
         appUser.ifPresent(user -> appUserRepository.save(user));
         final Optional<AppUser> fetchedAppUser = appUserRepository.findByExternalId(appUser.get().getExternalId());
 
+        // then
         assertNotNull(appUser);
 
         assertThat(fetchedAppUser)
@@ -43,4 +46,4 @@ void findByExternalId() {
                 });
     }
 
-}
+}

src/test/java/de/bonndan/nivio/appuser/AppUserRoleTest.java

@@ -2,17 +2,20 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class AppUserRoleTest {
 
     @Test
     void valueOf() {
 
-        assertThat(AppUserRole.valueOf("ADMIN"), is(notNullValue()));
-        assertThat(AppUserRole.valueOf("USER"), is(notNullValue()));
+        // when
+        AppUserRole admin = AppUserRole.ADMIN;
+        AppUserRole user = AppUserRole.USER;
+
+        // then
+        assertEquals(AppUserRole.valueOf("ADMIN"), admin);
+        assertEquals(AppUserRole.valueOf("USER"), user);
 
     }
-}
+}

src/test/java/de/bonndan/nivio/appuser/AppUserServiceTest.java

@@ -20,7 +20,9 @@ class AppUserServiceTest {
     void loadUserByUsername() {
 
         // given
-        AppUser appUser = mock(AppUser.class);
+        AppUser appUser = new AppUser();
+        appUser.setLocked(false);
+
         AppUserRepository appUserRepository = mock(AppUserRepository.class);
         AppUserService appUserService = new AppUserService(appUserRepository);
 
@@ -32,13 +34,13 @@ void loadUserByUsername() {
         assertThat(userDetails).isEqualTo(appUser);
         assertNull(userDetails.getUsername());
         assertNull(userDetails.getPassword());
-        assertFalse(userDetails.isAccountNonExpired());
-        assertFalse(userDetails.isAccountNonLocked());
-        assertFalse(userDetails.isCredentialsNonExpired());
+        assertTrue(userDetails.isAccountNonExpired());
+        assertTrue(userDetails.isAccountNonLocked());
+        assertTrue(userDetails.isCredentialsNonExpired());
 
         assertThrows(UsernameNotFoundException.class, () -> {
             appUserService.loadUserByUsername("");
         });
     }
 
-}
+}

src/test/java/de/bonndan/nivio/appuser/AppUserTest.java

@@ -10,136 +10,187 @@ class AppUserTest {
 
     @Test
     void isEnabled() {
+        // when
         appUser.setEnabled(true);
+        // then
         assertEquals(true, appUser.getEnabled());
     }
 
     @Test
     void getId() {
+        // when
         appUser.setId(1L);
+        // then
         assertEquals(1L, appUser.getId());
     }
 
     @Test
     void getName() {
+        // when
         appUser.setName("name");
+        // then
         assertEquals("name", appUser.getName());
     }
 
     @Test
     void getAlias() {
+        // when
         appUser.setAlias("alias");
+        // then
         assertEquals("alias", appUser.getAlias());
     }
 
     @Test
     void getEmail() {
+        // when
         appUser.setEmail("email");
+        // then
         assertEquals("email", appUser.getEmail());
     }
 
     @Test
     void getAvatarUrl() {
+        // when
         appUser.setAvatarUrl("avatarUrl");
+        // then
         assertEquals("avatarUrl", appUser.getAvatarUrl());
     }
 
     @Test
     void getAppUserRole() {
+        // when
         appUser.setAppUserRole(AppUserRole.USER);
+        // then
         assertEquals(AppUserRole.USER, appUser.getAppUserRole());
     }
 
     @Test
     void getExternalId() {
+        // when
         appUser.setExternalId("123");
+        // then
         assertEquals("123", appUser.getExternalId());
     }
 
     @Test
     void getIdp() {
+        // when
         appUser.setIdp("github");
+        // then
         assertEquals("github", appUser.getIdp());
     }
 
     @Test
     void getLocked() {
+        // when
         appUser.setLocked(false);
+        // then
         assertEquals(false, appUser.getLocked());
     }
 
     @Test
     void getEnabled() {
+        // when
         appUser.setEnabled(true);
+        // then
         assertEquals(true, appUser.getEnabled());
     }
 
     @Test
     void setId() {
+        // given
         Long id = 1L;
+        // when
         appUser.setId(id);
+        // then
         assertEquals(id, appUser.getId());
     }
 
     @Test
     void setName() {
+        // given
         String name = "name";
+        // when
         appUser.setName(name);
+        // then
         assertEquals(name, appUser.getName());
     }
 
     @Test
     void setAlias() {
+        // given
         String alias = "login";
+        // when
         appUser.setAlias(alias);
+        // then
         assertEquals(alias, appUser.getAlias());
     }
 
     @Test
     void setEmail() {
+        // given
         String email = "email";
+        // when
         appUser.setEmail(email);
+        // then
         assertEquals(email, appUser.getEmail());
     }
 
     @Test
     void setAvatarUrl() {
+        // given
         String avatarUrl = "avatarUrl";
+        // when
         appUser.setAvatarUrl(avatarUrl);
+        // then
         assertEquals(avatarUrl, appUser.getAvatarUrl());
     }
 
     @Test
     void setAppUserRole() {
+        // when
         appUser.setAppUserRole(AppUserRole.USER);
+        // then
         assertEquals(AppUserRole.USER, appUser.getAppUserRole());
     }
 
     @Test
     void setLocked() {
+        // given
         Boolean locked = false;
+        // when
         appUser.setLocked(locked);
+        // then
         assertEquals(locked, appUser.getLocked());
     }
 
     @Test
     void setEnabled() {
+        // given
         Boolean enabled = true;
+        // when
         appUser.setEnabled(enabled);
+        // then
         assertEquals(enabled, appUser.getEnabled());
     }
 
     @Test
     void setExternalId() {
+        // given
         String externalId = "123";
+        // when
         appUser.setExternalId(externalId);
+        // then
         assertEquals(externalId, appUser.getExternalId());
     }
 
     @Test
     void setIdp() {
+        // given
         String idp = "github";
+        // when
         appUser.setIdp(idp);
+        // then
         assertEquals(idp, appUser.getIdp());
     }
 
@@ -154,13 +205,16 @@ void setIdp() {
 
     @Test
     void isAccountNonLocked() {
+        // given
         Boolean locked = false;
+        // when
         appUser.setLocked(locked);
+        // then
         assertEquals(!locked, appUser.isAccountNonLocked()); }
 
     @Test
     void isCredentialsNonExpired() { assertTrue(appUser.isCredentialsNonExpired()); }
 
     @Test
     void testIsEnabled() { assertTrue(appUser.isEnabled()); }
-}
+}