feat: 优化授权站点登录与个人主页

Author: zhoutaoo

pom.xml

@@ -23,6 +23,8 @@
         <!--  编译   -->
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
+        <maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
+        <lombok.version>1.18.42</lombok.version>
         <!--  依赖   -->
         <bootstrap.version>5.3.3</bootstrap.version>
     </properties>
@@ -75,6 +77,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-oauth2-authorization-server</artifactId>
         </dependency>
+        <!-- Lombok annotations are used by entity, config and handler classes. -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -88,6 +96,20 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <parameters>true</parameters>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>-Duser.home=${project.build.directory}/test-home</argLine>
                 </configuration>
             </plugin>
             <!-- git commit插件 -->

src/main/java/io/github/opensabre/authorization/config/WebSecurityConfig.java

@@ -39,17 +39,19 @@ public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity httpSecurity)
         // url安全配置
         httpSecurity.authorizeHttpRequests((authorizeHttpRequests) ->
                 authorizeHttpRequests
-                        .requestMatchers("/doc.html", "/v3/**", "/webjars/**", "/assets/**", "/login")
+                        .requestMatchers("/doc.html", "/v3/**", "/webjars/**", "/assets/**", "favicon.svg", "/login")
                         .permitAll()
-                        .requestMatchers("/client**", "/oauth2/activate*", "/oauth2/consent", "/")
+                        .requestMatchers("/client**", "/oauth2/activate*", "/oauth2/consent", "/", "/profile")
                         .authenticated());
         // 表单登录处理从授权服务器过滤器链
         httpSecurity
-                .formLogin(formLogin -> formLogin.loginPage("/login"))
+                .formLogin(formLogin -> formLogin
+                        .loginPage("/login")
+                        .defaultSuccessUrl("/profile", false))
                 .userDetailsService(userDetailsService);
         // 添加BearerTokenAuthenticationFilter，将认证服务当做一个资源服务，解析请求头中的token
         httpSecurity.oauth2ResourceServer((resourceServer) -> resourceServer
                 .jwt(Customizer.withDefaults()));
         return httpSecurity.build();
     }
-}
+}

src/main/java/io/github/opensabre/authorization/rest/AuthorizationController.java

@@ -2,7 +2,11 @@
 
 import cn.hutool.core.util.StrUtil;
 import io.github.opensabre.authorization.entity.ScopeWithDescription;
+import io.github.opensabre.authorization.entity.User;
+import io.github.opensabre.authorization.service.IUserService;
 import jakarta.annotation.Resource;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
 import org.springframework.security.oauth2.core.oidc.OidcScopes;
 import org.springframework.security.oauth2.server.authorization.OAuth2AuthorizationConsent;
@@ -32,6 +36,9 @@ public class AuthorizationController {
     @Resource
     private OAuth2AuthorizationConsentService authorizationConsentService;
 
+    @Resource
+    private IUserService userService;
+
     /**
      * 登陆页面
      *
@@ -42,6 +49,28 @@ public String login() {
         return "login";
     }
 
+    /**
+     * 用户个人主页
+     *
+     * @param principal 认证信息
+     * @param model     页面model
+     * @return 用户个人主页
+     */
+    @GetMapping({"/", "/profile"})
+    public String profile(Authentication principal, Model model) {
+        User user = userService.getByUniqueId(principal.getName());
+        String displayName = user != null && StrUtil.isNotBlank(user.getName()) ? user.getName() : principal.getName();
+        Set<String> authorities = principal.getAuthorities().stream()
+                .map(GrantedAuthority::getAuthority)
+                .collect(Collectors.toSet());
+        model.addAttribute("user", user);
+        model.addAttribute("principalName", principal.getName());
+        model.addAttribute("displayName", displayName);
+        model.addAttribute("avatarText", StrUtil.subPre(displayName, 1).toUpperCase());
+        model.addAttribute("authorities", authorities);
+        return "profile";
+    }
+
     /**
      * 授权确认页面
      *
@@ -116,4 +145,4 @@ public String activated() {
     private static Set<ScopeWithDescription> withDescription(Set<String> scopes) {
         return scopes.stream().map(ScopeWithDescription::new).collect(Collectors.toSet());
     }
-}
+}