From b71fb123095837fb5eb2a3e3a4b33776b864abc4 Mon Sep 17 00:00:00 2001 From: HongGit Date: Tue, 9 Jul 2024 23:01:41 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[FIX/#41]=20=EA=B5=AC=EA=B8=80=20=EC=9C=A0?= =?UTF-8?q?=EC=A0=80=20=EC=83=9D=EC=84=B1=20=EC=8B=9C=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EA=B2=BD=EB=A1=9C=20=EB=A1=9C=EA=B9=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/external/googlemeet/GoogleMeetConfig.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/sopt/seonyakServer/global/common/external/googlemeet/GoogleMeetConfig.java b/src/main/java/org/sopt/seonyakServer/global/common/external/googlemeet/GoogleMeetConfig.java index 9f72d6d..5fb43bf 100644 --- a/src/main/java/org/sopt/seonyakServer/global/common/external/googlemeet/GoogleMeetConfig.java +++ b/src/main/java/org/sopt/seonyakServer/global/common/external/googlemeet/GoogleMeetConfig.java @@ -15,6 +15,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; +import lombok.extern.slf4j.Slf4j; import org.sopt.seonyakServer.global.exception.enums.ErrorType; import org.sopt.seonyakServer.global.exception.model.CustomException; import org.springframework.beans.factory.annotation.Value; @@ -22,6 +23,7 @@ import org.springframework.context.annotation.Configuration; @Configuration +@Slf4j public class GoogleMeetConfig { @Value("${google.credentials.file.path}") @@ -71,11 +73,12 @@ public void delete(String id) throws IOException { @Bean public UserAuthorizer userAuthorizer(TokenStore tokenStore) throws IOException { + log.info("credentials path: " + credentialsFilePath); Path credentialsPath = Paths.get(credentialsFilePath); + if (!Files.exists(credentialsPath)) { + throw new CustomException(ErrorType.NOT_FOUND_CREDENTIALS_JSON_ERROR); + } try (InputStream in = Files.newInputStream(credentialsPath)) { - if (in == null) { - throw new CustomException(ErrorType.NOT_FOUND_CREDENTIALS_JSON_ERROR); - } ClientId clientId = ClientId.fromStream(in); return UserAuthorizer.newBuilder() .setClientId(clientId) From 2b82e9fc2bc09b4fc8b5654bb429faf4c88ef1b3 Mon Sep 17 00:00:00 2001 From: HongGit Date: Tue, 9 Jul 2024 23:07:34 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[FIX/#41]=20application.yml=20=EC=A0=88?= =?UTF-8?q?=EB=8C=80=EA=B2=BD=EB=A1=9C=20=EB=A1=9C=EA=B9=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/DOCKER-CD.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/DOCKER-CD.yml b/.github/workflows/DOCKER-CD.yml index 2e60ba7..6129f4d 100644 --- a/.github/workflows/DOCKER-CD.yml +++ b/.github/workflows/DOCKER-CD.yml @@ -26,6 +26,8 @@ jobs: touch ./application.yml echo "${{ secrets.CD_APPLICATION }}" > ./application.yml cat ./application.yml + echo "Absolute path of application.yml:" + echo "$(pwd)/application.yml" working-directory: ${{ env.working-directory }} - name: Configure AWS credentials