Merge pull request #64 from 0-wook/develop

update
ClustProject · Feb 15, 2024 · f06d5d8 · f06d5d8
2 parents 9a759c9 + 0ca2af9
commit f06d5d8
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 8 deletions.
diff --git a/app/admin-server/src/main/java/kr/co/automl/global/config/security/SecurityConfig.java b/app/admin-server/src/main/java/kr/co/automl/global/config/security/SecurityConfig.java
@@ -43,6 +43,6 @@ protected void configure(HttpSecurity http) throws Exception {
                 .userService(customOAuth2UserService)
                 .and()
                 // .defaultSuccessUrl("http://localhost:3000/home"); // local settings
-                .defaultSuccessUrl("/home");
+                .defaultSuccessUrl("/home"); // prod settings
     }
 }
diff --git a/app/admin-server/src/main/resources/application.yml b/app/admin-server/src/main/resources/application.yml
@@ -58,7 +58,7 @@ spring:
             scope: profile, email
             client-id: ${GOOGLE_OAUTH2_CLIENT_ID}
             client-secret: ${GOOGLE_OAUTH2_CLIENT_SECRET}
-            redirect-uri: "https://admin.wsautoml.com/login/oauth2/code/google"
+            redirect-uri: "https://admin.wsautoml.com/login/oauth2/code/google" # prod settings // local settings에서는 주석 처리 할 것
 
   session:
     store-type: jdbc
@@ -80,7 +80,7 @@ spring:
   config:
     activate:
       # on-profile: local # local settings
-      on-profile: prod
+      on-profile: prod # prod settings
 
   datasource:
     url: jdbc:mariadb://${DATABASE_URL}:3306/automl

diff --git a/app/admin-server/src/main/resources/example.application-local-env.yml b/app/admin-server/src/main/resources/example.application-local-env.yml
@@ -15,3 +15,25 @@ spring:
             scope: profile, email
             client-id: # 여기에 입력
             client-secret: # 여기에 입력
+
+cloud:
+  aws:
+    credentials:
+      accessKey: # 여기에 입력
+      secretKey: # 여기에 입력
+    s3:
+      bucketName: # 여기에 입력
+      secondBucketName: # 여기에 입력
+spring:
+  security:
+    oauth2:
+      client:
+        registration:
+          google:
+            scope: profile, email
+            client-id: # 여기에 입력
+            client-secret: # 여기에 입력
+  datasource:
+    url: # 여기에 입력
+    username: # 여기에 입력
+    password: # 여기에 입력
diff --git a/app/admin-web/src/components/presentational/LoginCard.jsx b/app/admin-web/src/components/presentational/LoginCard.jsx
@@ -41,7 +41,7 @@ export default function LoginCard() {
             // } // local settings
             onClick={() =>
               (window.location.href = "/oauth2/authorization/google")
-            }
+            } // prod settings
           />
         </Box>
       </CardContent>

diff --git a/app/user-server/src/main/java/kr/co/automl/global/config/security/SecurityConfig.java b/app/user-server/src/main/java/kr/co/automl/global/config/security/SecurityConfig.java
@@ -43,7 +43,7 @@ protected void configure(HttpSecurity http) throws Exception {
                 .userInfoEndpoint()
                 .userService(customOAuth2UserService)
                 .and()
-                .defaultSuccessUrl("/");
+                .defaultSuccessUrl("/"); // prod settings
         // .defaultSuccessUrl("http://localhost:3000"); // local settings
     }
 }
diff --git a/app/user-server/src/main/resources/application.yml b/app/user-server/src/main/resources/application.yml
@@ -55,7 +55,7 @@ spring:
             scope: profile, email
             client-id: ${GOOGLE_OAUTH2_CLIENT_ID}
             client-secret: ${GOOGLE_OAUTH2_CLIENT_SECRET}
-            redirect-uri: "https://wsautoml.com/login/oauth2/code/google"
+            redirect-uri: "https://wsautoml.com/login/oauth2/code/google" # prod settings // local settings에서는 주석 처리 할 것
 
 logging:
   level:
@@ -72,7 +72,7 @@ spring:
   config:
     activate:
       # on-profile: local # local settings
-      on-profile: prod
+      on-profile: prod # prod settings
 
   datasource:
     url: jdbc:mariadb://${DATABASE_URL}:3306/automl

diff --git a/app/user-server/src/main/resources/example.application-local-env.yml b/app/user-server/src/main/resources/example.application-local-env.yml
@@ -0,0 +1,21 @@
+cloud:
+  aws:
+    credentials:
+      accessKey: # 여기에 입력
+      secretKey: # 여기에 입력
+    s3:
+      bucketName: # 여기에 입력
+      secondBucketName: # 여기에 입력
+spring:
+  datasource:
+    url: # 여기에 입력
+    username: # 여기에 입력
+    password: # 여기에 입력
+  security:
+    oauth2:
+      client:
+        registration:
+          google:
+            scope: profile, email
+            client-id: # 여기에 입력
+            client-secret: # 여기에 입력
diff --git a/app/user-web/src/components/presentational/LoginCard.jsx b/app/user-web/src/components/presentational/LoginCard.jsx
@@ -40,7 +40,7 @@ export default function LoginCard() {
             // } // local settings
             onClick={() =>
               (window.location.href = "/oauth2/authorization/google")
-            }
+            } // prod settings
           />
         </Box>
       </CardContent>