fix migrations, refresh token

2021-06-27 10:23:26 +03:00 · 2021-06-27 10:23:26 +03:00 · bf53ebf369
parent 7366a93808
commit bf53ebf369
11 changed files with 39 additions and 38 deletions
--- a/auth-core/src/main/resources/auth/db/changelog/core/202105011900__create_table__devices.yml
+++ b/auth-core/src/main/resources/auth/db/changelog/core/202105011900__create_table__devices.yml
@ -3,10 +3,10 @@ databaseChangeLog:
      id: 202105011900__create_table__devices
      author: touchin
      preConditions:
-        onFail: MARK_RAN
-        not:
-            tableExists:
-              tableName: devices
+        - onFail: MARK_RAN
+          not:
+              tableExists:
+                tableName: devices
      changes:
        - createTable:
            tableName: devices
--- a/auth-core/src/main/resources/auth/db/changelog/core/202105052300__create_table__users.yml
+++ b/auth-core/src/main/resources/auth/db/changelog/core/202105052300__create_table__users.yml
@ -3,10 +3,10 @@ databaseChangeLog:
      id: 202105052300__create_table__users
      author: touchin
      preConditions:
-        onFail: MARK_RAN
-        not:
-            tableExists:
-              tableName: users
+        - onFail: MARK_RAN
+          not:
+              tableExists:
+                tableName: users
      changes:
        - createTable:
            tableName: users
--- a/auth-core/src/main/resources/auth/db/changelog/core/202105052310__create_table__user_accounts.yml
+++ b/auth-core/src/main/resources/auth/db/changelog/core/202105052310__create_table__user_accounts.yml
@ -3,10 +3,10 @@ databaseChangeLog:
      id: 202105052310__create_table__user_accounts
      author: touchin
      preConditions:
-        onFail: MARK_RAN
-        not:
-            tableExists:
-              tableName: user_accounts
+        - onFail: MARK_RAN
+          not:
+              tableExists:
+                tableName: user_accounts
      changes:
        - createTable:
            tableName: user_accounts
--- a/auth-core/src/main/resources/auth/db/changelog/core/202105052331__create_table__devices_users.yml
+++ b/auth-core/src/main/resources/auth/db/changelog/core/202105052331__create_table__devices_users.yml
@ -3,10 +3,10 @@ databaseChangeLog:
      id: 202105052331__create_table__devices_users
      author: touchin
      preConditions:
-        onFail: MARK_RAN
-        not:
-          tableExists:
-            tableName: devices_users
+        - onFail: MARK_RAN
+          not:
+            tableExists:
+              tableName: devices_users
      changes:
        - createTable:
            tableName: devices_users
--- a/auth-core/src/main/resources/auth/db/changelog/core/202105081411__create_table__scopes.yml
+++ b/auth-core/src/main/resources/auth/db/changelog/core/202105081411__create_table__scopes.yml
@ -3,10 +3,10 @@ databaseChangeLog:
      id: 202105081411__create_table__scopes
      author: touchin
      preConditions:
-        onFail: MARK_RAN
-        not:
-          tableExists:
-            tableName: scopes
+        - onFail: MARK_RAN
+          not:
+            tableExists:
+              tableName: scopes
      changes:
        - createTable:
            tableName: scopes
--- a/auth-core/src/main/resources/auth/db/changelog/core/202105081431__create_table__scope_groups.yml
+++ b/auth-core/src/main/resources/auth/db/changelog/core/202105081431__create_table__scope_groups.yml
@ -3,10 +3,10 @@ databaseChangeLog:
      id: 202105081431__create_table__scope_groups
      author: touchin
      preConditions:
-        onFail: MARK_RAN
-        not:
-          tableExists:
-            tableName: scope_groups
+        - onFail: MARK_RAN
+          not:
+            tableExists:
+              tableName: scope_groups
      changes:
        - createTable:
            tableName: scope_groups
--- a/auth-core/src/main/resources/auth/db/changelog/core/202105081531__create_table__users_scopes.yml
+++ b/auth-core/src/main/resources/auth/db/changelog/core/202105081531__create_table__users_scopes.yml
@ -3,10 +3,10 @@ databaseChangeLog:
      id: 202105081531__create_table__users_scopes
      author: touchin
      preConditions:
-        onFail: MARK_RAN
-        not:
-          tableExists:
-            tableName: users_scopes
+        - onFail: MARK_RAN
+          not:
+            tableExists:
+              tableName: users_scopes
      changes:
        - createTable:
            tableName: users_scopes
--- a/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/models/RefreshTokenEntity.kt
+++ b/auth-jwt-core/src/main/kotlin/ru/touchin/auth/core/tokens/refresh/models/RefreshTokenEntity.kt
@ -36,6 +36,7 @@ class RefreshTokenEntity : AuditableUuidIdEntity() {
    @ManyToMany
    @JoinTable(
        name = "refresh_token_scopes",
+        schema = SCHEMA,
        joinColumns = [JoinColumn(name = "refresh_token_id")],
        inverseJoinColumns = [JoinColumn(name = "scope_name")]
    )
--- a/auth-jwt-core/src/main/resources/auth/db/changelog/core/202105201851__create_table__refresh_tokens.yml
+++ b/auth-jwt-core/src/main/resources/auth/db/changelog/core/202105201851__create_table__refresh_tokens.yml
@ -3,10 +3,10 @@ databaseChangeLog:
      id: 202105201851__create_table__refresh_tokens
      author: touchin
      preConditions:
-        onFail: MARK_RAN
-        not:
-          tableExists:
-            tableName: refresh_tokens
+        - onFail: MARK_RAN
+          not:
+            tableExists:
+              tableName: refresh_tokens
      changes:
        - createTable:
            tableName: refresh_tokens
--- a/auth-jwt-core/src/main/resources/auth/db/changelog/core/202105201901__create_table__refresh_token_scopes.yml
+++ b/auth-jwt-core/src/main/resources/auth/db/changelog/core/202105201901__create_table__refresh_token_scopes.yml
@ -3,10 +3,10 @@ databaseChangeLog:
      id: 202105201901__create_table__refresh_token_scopes
      author: touchin
      preConditions:
-        onFail: MARK_RAN
-        not:
-          tableExists:
-            tableName: refresh_token_scopes
+        - onFail: MARK_RAN
+          not:
+            tableExists:
+              tableName: refresh_token_scopes
      changes:
        - createTable:
            tableName: refresh_token_scopes
--- a/common-spring-security-jpa/src/main/kotlin/ru/touchin/common/spring/security/auditor/SecurityAuditorAware.kt
+++ b/common-spring-security-jpa/src/main/kotlin/ru/touchin/common/spring/security/auditor/SecurityAuditorAware.kt
@ -26,11 +26,11 @@ class SecurityAuditorAware(

                Optional.ofNullable(result)
            }
-            .or { Optional.of(UNKNOWN_USER) }
+            .or { Optional.of(API_USER) }
    }

    companion object {
-        const val UNKNOWN_USER = "unknownUser"
+        const val API_USER = "api"
    }

 }