deploy: Fix getAuthOriginFromOriginHeader

codekatabattle-polimi · Feb 14, 2024 · 3ddbb32 · 3ddbb32
1 parent 317273d
commit 3ddbb32
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/IT/codekatabattle/src/main/java/it/polimi/codekatabattle/models/oauth/OAuthAccessToken.java b/IT/codekatabattle/src/main/java/it/polimi/codekatabattle/models/oauth/OAuthAccessToken.java
@@ -4,4 +4,6 @@ public class OAuthAccessToken {
     public String access_token;
     public String token_type;
     public String scope;
+
+    public String error;
 }
diff --git a/IT/codekatabattle/src/main/java/it/polimi/codekatabattle/services/impl/AuthServiceImpl.java b/IT/codekatabattle/src/main/java/it/polimi/codekatabattle/services/impl/AuthServiceImpl.java
@@ -10,6 +10,8 @@
 import org.apache.tomcat.util.codec.binary.Base64;
 import org.kohsuke.github.GitHub;
 import org.kohsuke.github.GitHubBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -42,6 +44,8 @@ public class AuthServiceImpl implements AuthService {
     @Value("${ckb.test}")
     private Boolean isTest;
 
+    Logger logger = LoggerFactory.getLogger(AuthServiceImpl.class);
+
     private OAuthConfig getOAuthConfig(AuthOrigin authOrigin) {
         final HashMap<AuthOrigin, OAuthConfig> oauthConfigMap = new HashMap<>() {{
             put(AuthOrigin.SWAGGER, new OAuthConfig(swaggerClientId, swaggerClientSecret));
@@ -65,6 +69,7 @@ public OAuthAccessToken handleOAuthCallback(String code, AuthOrigin authOrigin)
             throw new OAuthException("Failed to obtain access token from GitHub");
         }
         if (response.getBody() == null || response.getBody().access_token == null) {
+            logger.error("Error from GitHub: " + response.getBody().error);
             throw new OAuthException("Invalid response body");
         }
 
@@ -117,6 +122,9 @@ public AuthOrigin getAuthOriginFromOriginHeader(String origin) {
         if (origin.contains("localhost:5173")) {
             return AuthOrigin.FRONTEND;
         }
+        if (origin.contains("codekatabattle.onrender.com")) {
+            return AuthOrigin.FRONTEND;
+        }
 
         return AuthOrigin.SWAGGER;
     }

diff --git a/IT/codekatabattle/src/main/resources/application.properties b/IT/codekatabattle/src/main/resources/application.properties
@@ -8,7 +8,6 @@ spring.datasource.hikari.maximumPoolSize=500
 spring.datasource.hikari.connectionTimeout=30000
 spring.datasource.hikari.idleTimeout=600000
 spring.datasource.hikari.maxLifetime=1800000
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 
 # The ddl-auto property is used to automatically create the database schema
 # Usually, in production, a migration tool like Liquibase or Flyway is used to manage the database schema