Merge pull request #187 from CHZZK-Study/dev

[fix/redirect-uri] Google Login URI 동적으로 변경
JECT-Study · Sep 24, 2024 · ab37ece · ab37ece
2 parents 73655e1 + 85979f7
commit ab37ece
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 113 deletions.
diff --git a/k8s/dev/deployment.yaml b/k8s/dev/deployment.yaml
@@ -18,59 +18,12 @@ spec:
           image: yeseulhong/grass-diary-release:latest
           ports:
             - containerPort: 8080
-          env:
-            - name: GOOGLE_CLIENT_ID
-              valueFrom:
-                secretKeyRef:
-                  name: google-secrets
-                  key: GOOGLE_CLIENT_ID
-            - name: GOOGLE_CLIENT_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: google-secrets
-                  key: GOOGLE_CLIENT_SECRET
-            - name: JWT_ACCESS_SECRET_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: jwt-secrets
-                  key: JWT_ACCESS_SECRET_KEY
-            - name: JWT_REFRESH_SECRET_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: jwt-secrets
-                  key: JWT_REFRESH_SECRET_KEY
-            - name: DB_SERVER_URL
-              valueFrom:
-                secretKeyRef:
-                  name: db-secrets
-                  key: DB_SERVER_URL
-            - name: DB_USER_ID
-              valueFrom:
-                secretKeyRef:
-                  name: db-secrets
-                  key: DB_USER_ID
-            - name: DB_USER_PW
-              valueFrom:
-                secretKeyRef:
-                  name: db-secrets
-                  key: DB_USER_PW
-            - name: S3_ACCESS_PUBLIC_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: s3-secrets
-                  key: S3_ACCESS_PUBLIC_KEY
-            - name: S3_ACCESS_SECRET_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: s3-secrets
-                  key: S3_ACCESS_SECRET_KEY
-            - name: S3_BUCKET_NAME
-              valueFrom:
-                secretKeyRef:
-                  name: s3-secrets
-                  key: S3_BUCKET_NAME
-            - name: S3_SERVER_URL
-              valueFrom:
-                secretKeyRef:
-                  name: s3-secrets
-                  key: S3_SERVER_URL
+          envFrom:
+            - secretRef:
+                name: google-secrets
+            - secretRef:
+                name: jwt-secrets
+            - secretRef:
+                name: db-secrets
+            - secretRef:
+                name: s3-secrets
diff --git a/k8s/release/deployment.yaml b/k8s/release/deployment.yaml
@@ -18,59 +18,12 @@ spec:
           image: yeseulhong/grass-diary-release:latest
           ports:
             - containerPort: 8080
-          env:
-            - name: GOOGLE_CLIENT_ID
-              valueFrom:
-                secretKeyRef:
-                  name: google-secrets
-                  key: GOOGLE_CLIENT_ID
-            - name: GOOGLE_CLIENT_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: google-secrets
-                  key: GOOGLE_CLIENT_SECRET
-            - name: JWT_ACCESS_SECRET_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: jwt-secrets
-                  key: JWT_ACCESS_SECRET_KEY
-            - name: JWT_REFRESH_SECRET_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: jwt-secrets
-                  key: JWT_REFRESH_SECRET_KEY
-            - name: DB_SERVER_URL
-              valueFrom:
-                secretKeyRef:
-                  name: db-secrets
-                  key: DB_SERVER_URL
-            - name: DB_USER_ID
-              valueFrom:
-                secretKeyRef:
-                  name: db-secrets
-                  key: DB_USER_ID
-            - name: DB_USER_PW
-              valueFrom:
-                secretKeyRef:
-                  name: db-secrets
-                  key: DB_USER_PW
-            - name: S3_ACCESS_PUBLIC_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: s3-secrets
-                  key: S3_ACCESS_PUBLIC_KEY
-            - name: S3_ACCESS_SECRET_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: s3-secrets
-                  key: S3_ACCESS_SECRET_KEY
-            - name: S3_BUCKET_NAME
-              valueFrom:
-                secretKeyRef:
-                  name: s3-secrets
-                  key: S3_BUCKET_NAME
-            - name: S3_SERVER_URL
-              valueFrom:
-                secretKeyRef:
-                  name: s3-secrets
-                  key: S3_SERVER_URL
+          envFrom:
+            - secretRef:
+                name: google-secrets
+            - secretRef:
+                name: jwt-secrets
+            - secretRef:
+                name: db-secrets
+            - secretRef:
+                name: s3-secrets
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -13,7 +13,7 @@ spring.jpa.properties.hibernate.show_sql=true
 spring.jpa.show-sql=true
 oauth2.client.registration.google.client-id=${GOOGLE_CLIENT_ID}
 oauth2.client.registration.google.client-secret=${GOOGLE_CLIENT_SECRET}
-oauth2.client.registration.google.redirect-uri=https://release.chzzk-diary-server.shop/api/auth/code/google
+oauth2.client.registration.google.redirect-uri=${GOOGLE_REDIRECT_URI}
 oauth2.client.registration.google.authorization-grant-type=code
 oauth2.client.registration.google.scope=profile email
 oauth2.client.provider.google.authorization-uri=https://accounts.google.com/o/oauth2/v2/auth