Misc fixes during oauth testing

aq-ikhwa-tech · aq-ikhwa-tech · commit e3ae0022ccfb · 2024-02-19T20:53:51.000+05:00
diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/CookieHelper.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/util/CookieHelper.java
@@ -27,7 +27,7 @@ public class CookieHelper {
     @Autowired
     private CommonConfig commonConfig;
 
-    public void saveCookie(String token, ServerWebExchange exchange, Integer accessTokenExpiryEpoch) {
+    public void saveCookie(String token, ServerWebExchange exchange, Long accessTokenExpiryEpoch) {
         boolean isUsingHttps = Optional.ofNullable(getRefererURI(exchange.getRequest()))
                 .map(a -> "https".equalsIgnoreCase(a.getScheme()))
                 .orElse(false);
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java
@@ -141,9 +141,9 @@ public Mono<Void> loginOrRegister(AuthUser authUser, ServerWebExchange exchange,
                 // save token and set cookie
                 .delayUntil(user -> {
                     String token = CookieHelper.generateCookieToken();
-                    Integer accessTokenExpiryEpoch;
-                    if(authUser.getAuthToken() != null && authUser.getAuthToken().getExpireIn() != 0) {
-                        accessTokenExpiryEpoch = authUser.getAuthToken().getExpireIn();
+                    Long accessTokenExpiryEpoch;
+                    if(authUser.toAuthConnection().getAuthConnectionAuthToken() != null) {
+                        accessTokenExpiryEpoch = authUser.toAuthConnection().getAuthConnectionAuthToken().getExpireAt();
                     } else {
                         accessTokenExpiryEpoch = null;
                     }
