EFRS-1286: Added changes to the expiration column change set in order to remove old tokens that do not have an expiration column

Author: VolodymyrBushko

java/admin/src/main/java/com/exadel/frs/system/security/CustomJdbcTokenStore.java

@@ -22,8 +22,8 @@ public class CustomJdbcTokenStore extends JdbcTokenStore {
 
     private static final String INSERT_ACCESS_TOKEN_WITH_EXPIRATION_SQL = "insert into oauth_access_token (token_id, token, authentication_id, user_name, client_id, authentication, refresh_token, expiration) values (?, ?, ?, ?, ?, ?, ?,?)";
     private static final String INSERT_REFRESH_TOKEN_WITH_EXPIRATION_SQL = "insert into oauth_refresh_token (token_id, token, authentication, expiration) values (?, ?, ?, ?)";
-    private static final String REMOVE_EXPIRED_ACCESS_TOKENS_SQL = "delete from oauth_access_token where expiration is null or expiration < ?";
-    private static final String REMOVE_EXPIRED_REFRESH_TOKENS_SQL = "delete from oauth_refresh_token where expiration is null or expiration < ?";
+    private static final String REMOVE_EXPIRED_ACCESS_TOKENS_SQL = "delete from oauth_access_token where expiration < ?";
+    private static final String REMOVE_EXPIRED_REFRESH_TOKENS_SQL = "delete from oauth_refresh_token where expiration < ?";
 
     private final JdbcTemplate jdbcTemplate;
     private final AuthenticationKeyGenerator authenticationKeyGenerator;

java/admin/src/main/resources/db/changelog/db.changelog-0.2.4.yaml

@@ -3,6 +3,12 @@ databaseChangeLog:
       id: expand-oauth_access_token-and-oauth_refresh_token-with-expiration-column
       author: Volodymyr Bushko
       changes:
+        # delete all old tokens that do not have an expiration column
+        - delete:
+            tableName: oauth_access_token
+        - delete:
+            tableName: oauth_refresh_token
+        # add an expiration column
         - addColumn:
             tableName: oauth_access_token
             columns:
@@ -15,3 +21,10 @@ databaseChangeLog:
               - column:
                   name: expiration
                   type: timestamp
+        # add a non-null constraint to the expiration column
+        - addNotNullConstraint:
+            tableName: oauth_access_token
+            columnName: expiration
+        - addNotNullConstraint:
+            tableName: oauth_refresh_token
+            columnName: expiration

java/api/src/test/resources/db/changelog/db.changelog-0.2.4.yaml

@@ -3,6 +3,12 @@ databaseChangeLog:
       id: expand-oauth_access_token-and-oauth_refresh_token-with-expiration-column
       author: Volodymyr Bushko
       changes:
+        # delete all old tokens that do not have an expiration column
+        - delete:
+            tableName: oauth_access_token
+        - delete:
+            tableName: oauth_refresh_token
+        # add an expiration column
         - addColumn:
             tableName: oauth_access_token
             columns:
@@ -15,3 +21,10 @@ databaseChangeLog:
               - column:
                   name: expiration
                   type: timestamp
+        # add a non-null constraint to the expiration column
+        - addNotNullConstraint:
+            tableName: oauth_access_token
+            columnName: expiration
+        - addNotNullConstraint:
+            tableName: oauth_refresh_token
+            columnName: expiration