Merge pull request #5 from isystk/feature/oauth

Google認証を追加

Author: isystk

build.gradle

@@ -76,6 +76,9 @@ subprojects {
     implementation("org.springframework.boot:spring-boot-starter-security")
     implementation("org.thymeleaf.extras:thymeleaf-extras-springsecurity5")
 
+    /* spring security oauth2 */
+    implementation("org.springframework.security:spring-security-oauth2-client")
+
     /* mysql */
     runtimeOnly("mysql:mysql-connector-java")
 

business/src/main/java/com/isystk/sample/common/FrontUrl.java

@@ -10,11 +10,12 @@ public class FrontUrl {
    **/
   public static final String TOP = "/";
   public static final String REGISTER = "/register";
-
   public static final String PASSWORD_RESET = "/password/reset";
 
   public static final String PASSWORD_RESET_CONFIG = "/password/reset/config";
 
+  public static final String AUTH_GOOGLE_CALLBACK = "/auth/google/loginSuccess";
+
   /**
    * ---- APIｓ ----
    **/

business/src/main/resources/application-common-local.yml

@@ -23,6 +23,14 @@ spring:
     multipart:
       max-file-size: 20MB
       max-request-size: 20MB
+  security:
+    oauth2:
+      client:
+        registration:
+          google:
+            client-id: "xxxxx"
+            client-secret: "xxxxx"
+            redirectUri: "http://localhost:8080/auth/google/loginSuccess"
 
 logging:
   level:

business/src/main/resources/application-common-product.yml

@@ -21,6 +21,14 @@ spring:
     multipart:
       max-file-size: 20MB
       max-request-size: 20MB
+  security:
+    oauth2:
+      client:
+        registration:
+          google:
+            client-id: "xxxxx"
+            client-secret: "xxxxx"
+            redirectUri: "https://xxxx/auth/google/loginSuccess"
 
 logging:
   level:

business/src/main/resources/application-common-staging.yml

@@ -21,6 +21,14 @@ spring:
     multipart:
       max-file-size: 20MB
       max-request-size: 20MB
+  security:
+    oauth2:
+      client:
+        registration:
+          google:
+            client-id: "xxxxx"
+            client-secret: "xxxxx"
+            redirectUri: "https://xxxx/auth/google/loginSuccess"
 
 logging:
   level:

web-admin/src/main/java/com/isystk/sample/web/admin/controller/html/login/LoginController.java renamed to web-admin/src/main/java/com/isystk/sample/web/admin/controller/html/auth/LoginController.java

@@ -1,4 +1,4 @@
-package com.isystk.sample.web.admin.controller.html.login;
+package com.isystk.sample.web.admin.controller.html.auth;
 
 import static com.isystk.sample.common.Const.*;
 

web-admin/src/main/java/com/isystk/sample/web/admin/controller/html/login/LoginForm.java renamed to web-admin/src/main/java/com/isystk/sample/web/admin/controller/html/auth/LoginForm.java

@@ -1,4 +1,4 @@
-package com.isystk.sample.web.admin.controller.html.login;
+package com.isystk.sample.web.admin.controller.html.auth;
 
 import java.io.Serializable;
 

web-front/resources/src/constants/url.ts

@@ -7,7 +7,7 @@ export const Url = {
   /** ログイン処理 */
   AUTHENTICATE: '/auth/authenticate',
   /** Googleログイン */
-  AUTH_GOOGLE: '/auth/google',
+  AUTH_GOOGLE: '/oauth2/authorization/google',
   /** ログアウト */
   LOGOUT: '/auth/logout',
   /** 会員登録 */

web-front/src/main/java/com/isystk/sample/web/front/SecurityConfig.java

@@ -82,7 +82,10 @@ protected void configure(HttpSecurity http) throws Exception {
         // ログインIDのパラメータ名
         .usernameParameter("loginId")
         // パスワードのパラメータ名
-        .passwordParameter("password").permitAll();
+        .passwordParameter("password").permitAll()
+        // OAuth 2.0 Login機能を有効化
+        .and()
+        .oauth2Login();
 
     // ログアウト処理
     http.logout().logoutRequestMatcher(new AntPathRequestMatcher(LOGOUT_URL))

web-front/src/main/java/com/isystk/sample/web/front/controller/html/IndexController.java

@@ -1,5 +1,6 @@
 package com.isystk.sample.web.front.controller.html;
 
+
 import static com.isystk.sample.common.FrontUrl.TOP;
 
 import com.isystk.sample.web.base.controller.html.AbstractHtmlController;
@@ -19,7 +20,7 @@ public String getFunctionName() {
     return "F_TOP";
   }
 
-  @GetMapping({"/", "{path:(?!^static|swagger-ui$).*}/**"})
+  @GetMapping({"/", "{path:(?!^static|oauth|swagger-ui$).*}/**"})
   public String index(Model model) {
     return "modules/index";
   }