[#141] add principalExtractor

pom.xml

@@ -62,6 +62,14 @@
             <artifactId>spring-boot-starter-oauth2-client</artifactId>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/org.springframework.security.oauth.boot/spring-security-oauth2-autoconfigure -->
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+            <version>2.6.2</version>
+        </dependency>
+
+
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>

src/main/java/de/bonndan/nivio/Application.java

@@ -20,7 +20,7 @@ public static void main(String[] args) {
     @Bean
     CommandLineRunner commandLineRunner(AppUserRepository userRepository) {
         return args -> {
-            AppUser mary = new AppUser("Mary", "mary88", "[email protected]", "secret123", AppUserRole.USER, false, true );
+            AppUser mary = new AppUser("Mary", "mary88", "[email protected]", "avatarURL", AppUserRole.USER, false, true );
             userRepository.save(mary);
         };
     }

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

@@ -1,6 +1,9 @@
 package de.bonndan.nivio.appuser;
 
-import lombok.*;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -48,11 +51,11 @@ public class AppUser implements UserDetails {
 
 
     @Column(
-            name = "user_name",
+            name = "alias",
             nullable = false,
             columnDefinition = "TEXT"
     )
-    private String userName;
+    private String alias;
 
     @Column(
             name = "email",
@@ -62,11 +65,11 @@ public class AppUser implements UserDetails {
     private String email;
 
     @Column(
-            name = "password",
+            name = "avatar_url",
             nullable = false,
             columnDefinition = "TEXT"
     )
-    private String password;
+    private String avatarUrl;
 
 
     @Column(
@@ -83,14 +86,14 @@ public class AppUser implements UserDetails {
     public AppUser(String name,
                    String userName,
                    String email,
-                   String password,
+                   String avatarUrl,
                    AppUserRole appUserRole,
                    Boolean locked,
                    Boolean enabled) {
         this.name = name;
-        this.userName = userName;
+        this.alias = userName;
         this.email = email;
-        this.password = password;
+        this.avatarUrl = avatarUrl;
         this.appUserRole = appUserRole;
         this.locked = locked;
         this.enabled = enabled;
@@ -105,12 +108,12 @@ public Collection<? extends GrantedAuthority> getAuthorities() {
 
     @Override
     public String getPassword() {
-        return password;
+        return null;
     }
 
     @Override
     public String getUsername() {
-        return userName;
+        return alias;
     }
 
     @Override

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

@@ -1,9 +1,9 @@
 package de.bonndan.nivio.security;
 
 import de.bonndan.nivio.appuser.AppUserService;
-import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.security.oauth2.resource.PrincipalExtractor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
@@ -30,7 +30,6 @@
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
     private final AppUserService appUserService;
-    private final BCryptPasswordEncoder bCryptPasswordEncoder;
 
     public static final String LOGIN_MODE_REQUIRED = "required";
     public static final String LOGIN_MODE_OPTIONAL = "optional";
@@ -44,9 +43,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
     private final AuthConfigProperties properties;
 
-    public SecurityConfig(AppUserService appUserService, BCryptPasswordEncoder bCryptPasswordEncoder, AuthConfigProperties properties) {
+    public SecurityConfig(AppUserService appUserService, AuthConfigProperties properties) {
         this.appUserService = appUserService;
-        this.bCryptPasswordEncoder = bCryptPasswordEncoder;
         this.properties = properties;
     }
 
@@ -158,19 +156,23 @@ public void writeHeaders(HttpServletRequest request, HttpServletResponse respons
 
     }
 
-
-    @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.authenticationProvider(daoAuthenticationProvider());
-    }
-
-    @Bean
-    public DaoAuthenticationProvider daoAuthenticationProvider() {
-        DaoAuthenticationProvider provider =
-                new DaoAuthenticationProvider();
-        provider.setPasswordEncoder(bCryptPasswordEncoder);
-        provider.setUserDetailsService(appUserService);
-
-        return provider;
-    }
-}
+//    @Bean
+//    public PrincipalExtractor githubPrincipalExtractor() {
+//        return new GithubPrincipalExtractor();
+//    }
+//
+//    @Override
+//    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+//        auth.authenticationProvider(daoAuthenticationProvider());
+//    }
+//
+//    @Bean
+//    public DaoAuthenticationProvider daoAuthenticationProvider() {
+//        DaoAuthenticationProvider provider =
+//                new DaoAuthenticationProvider();
+//        provider.setUserDetailsService(appUserService);
+//
+//        return provider;
+//    }
+
+}

src/main/resources/data/user.lock.db

@@ -1,6 +1,6 @@
 #FileLock
-#Wed Jan 12 13:55:06 CET 2022
-server=localhost\:60731
+#Mon Jan 17 11:50:05 CET 2022
+server=localhost\:63786
 hostName=localhost
 method=file
-id=17e4e5b329af9f5f04f04ca0df6000cc4546139b105
+id=17e67a88907a1f2058e2af25fc3d93fc44265973b37