diff --git 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 index 82f7162..7292a31 100644 --- 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 diff --git 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 index 6dc9fa9..6676e23 100644 --- 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 diff --git 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 index 977dbaa..063e4d6 100644 --- 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 diff --git 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 index 0232b1a..9d323ce 100644 --- 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 diff --git 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 index 07bc327..b5742fe 100644 --- 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 diff --git 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 index 1f0dc60..f1a22ca 100644 --- 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 diff --git 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 index c42ed52..47e3b76 100644 --- 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 diff --git 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 index c0323b0..93e3c8c 100644 --- 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")] ) diff --git 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 index 1f355ec..36daf38 100644 --- 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 diff --git 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 index 6e1f2e2..4a8bea0 100644 --- 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 diff --git 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 index b471826..3623a3e 100644 --- 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" } }