diff --git a/.github/workflows/deploy-common.yml b/.github/workflows/deploy-common.yml index 1190662a..b680e33a 100644 --- a/.github/workflows/deploy-common.yml +++ b/.github/workflows/deploy-common.yml @@ -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 }} diff --git a/docker-compose.yml b/docker-compose.yml index 72fcfff6..8b2e5549 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 @@ -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 diff --git a/routee-app/src/main/resources/application.yml b/routee-app/src/main/resources/application.yml index 9cca9580..b38d0659 100644 --- a/routee-app/src/main/resources/application.yml +++ b/routee-app/src/main/resources/application.yml @@ -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} diff --git a/routee-external/src/main/java/org/sopt/routee/external/api/type/OAuthProvider.java b/routee-external/src/main/java/org/sopt/routee/external/api/type/OAuthProvider.java index 3dea0b49..fbe65f2a 100644 --- a/routee-external/src/main/java/org/sopt/routee/external/api/type/OAuthProvider.java +++ b/routee-external/src/main/java/org/sopt/routee/external/api/type/OAuthProvider.java @@ -1,5 +1,6 @@ package org.sopt.routee.external.api.type; public enum OAuthProvider { - APPLE -} \ No newline at end of file + APPLE, + GOOGLE +}