Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix/redirect-uri] Google Login URI 동적으로 변경 #187

Merged
merged 4 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 9 additions & 56 deletions k8s/dev/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
65 changes: 9 additions & 56 deletions k8s/release/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading