Skip to content
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
1 change: 1 addition & 0 deletions .github/workflows/deploy-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,6 @@ jobs:
export S3_BUCKET="${{ secrets[format('{0}S3_BUCKET', inputs.secret_prefix)] }}"
export S3_ENDPOINT="${{ secrets[format('{0}S3_ENDPOINT', inputs.secret_prefix)] }}"
export APPLE_CLIENT_ID="${{ secrets[format('{0}APPLE_CLIENT_ID', inputs.secret_prefix)] }}"
export GOOGLE_CLIENT_ID="${{ secrets.GOOGLE_CLIENT_ID }}"

cd ~/app && bash scripts/deploy.sh ${{ secrets.DOCKER_USERNAME }}/routee-api:${{ inputs.environment }}-${{ github.sha }}
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ services:
S3_BUCKET: ${S3_BUCKET}
S3_ENDPOINT: ${S3_ENDPOINT}
APPLE_CLIENT_ID: ${APPLE_CLIENT_ID}
GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID}
depends_on:
redis:
condition: service_healthy
Expand Down Expand Up @@ -59,6 +60,7 @@ services:
S3_BUCKET: ${S3_BUCKET}
S3_ENDPOINT: ${S3_ENDPOINT}
APPLE_CLIENT_ID: ${APPLE_CLIENT_ID}
GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID}
depends_on:
redis:
condition: service_healthy
Expand Down
4 changes: 4 additions & 0 deletions routee-app/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ oidc:
jwk-set-uri: https://appleid.apple.com/auth/keys
issuer: https://appleid.apple.com
client-id: ${APPLE_CLIENT_ID}
google:
jwk-set-uri: https://www.googleapis.com/oauth2/v3/certs
issuer: https://accounts.google.com
client-id: ${GOOGLE_CLIENT_ID}

jwt:
secret: ${JWT_SECRET}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.sopt.routee.external.api.type;

public enum OAuthProvider {
APPLE
}
APPLE,
GOOGLE
}
Loading