Merge remote-tracking branch 'origin/dev'

src/main/java/com/safeqr/app/gmail/service/GmailService.java

@@ -201,7 +201,7 @@ public class GmailService {
         String nextPageToken = null;
         UserEntity userEntity = userService.getUserByIdForGmail(userId);
         BigInteger historyId = userEntity.getGmailHistoryId();
-
+        logger.info("history id: {}", historyId);
         // Fetch history if historyId is not 0 (Default db value)
         if (historyId.compareTo(BigInteger.ZERO) != 0) {
             logger.info("HistoryId from db: {}", historyId);

src/main/resources/application.properties

@@ -1,14 +1,14 @@
 spring.application.name=SafeQR-app
-spring.profiles.active=local
-#http.port=${HTTP_PORT}
-#server.port=${SERVER_PORT}
-#server.ssl.enabled=true
-#server.ssl.key-store-type=${SERVER_SSL_KEY_STORE_TYPE}
-#server.ssl.key-store=${SERVER_SSL_KEY_STORE_LOCATION}
-#server.ssl.key-store-password=${SERVER_SSL_KEY_STORE_PASSWORD}
-#server.ssl.key-alias=${SERVER_SSL_KEY_ALIAS}
-#trust.store=${SERVER_SSL_TRUST_STORE_LOCATION}
-#trust.store.password=${SERVER_SSL_TRUST_STORE_PASSWORD}
+#spring.profiles.active=local
+http.port=${HTTP_PORT}
+server.port=${SERVER_PORT}
+server.ssl.enabled=true
+server.ssl.key-store-type=${SERVER_SSL_KEY_STORE_TYPE}
+server.ssl.key-store=${SERVER_SSL_KEY_STORE_LOCATION}
+server.ssl.key-store-password=${SERVER_SSL_KEY_STORE_PASSWORD}
+server.ssl.key-alias=${SERVER_SSL_KEY_ALIAS}
+trust.store=${SERVER_SSL_TRUST_STORE_LOCATION}
+trust.store.password=${SERVER_SSL_TRUST_STORE_PASSWORD}
 
 spring.datasource.url=${SERVER_DB_URL}
 spring.datasource.username=${SERVER_DB_USERNAME}
@@ -32,4 +32,4 @@ gmail.client.clientAuthenticationScheme=query
 gmail.client.scope=https://www.googleapis.com/auth/gmail.readonly
 gmail.resource.userInfoUri=https://www.googleapis.com/gmail/v1/users/me/profile
 gmail.resource.preferTokenInfo=true
-gmail.client.redirectUri=https://localhost/v1/gmail/callback
+gmail.client.redirectUri=https://bk5wiynzsi.execute-api.ap-southeast-1.amazonaws.com/api/v1/gmail/callback