diff --git a/resources/postgres/init-backup-user.sh b/resources/postgres/init-backup-user.sh index 6fd240141..46fae5371 100644 --- a/resources/postgres/init-backup-user.sh +++ b/resources/postgres/init-backup-user.sh @@ -6,6 +6,7 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E GRANT CONNECT ON DATABASE $POSTGRES_DB TO $POSTGRES_BACKUP_USER; GRANT USAGE ON SCHEMA public TO $POSTGRES_BACKUP_USER; ALTER DEFAULT PRIVILEGES IN SCHEMA public - GRANT SELECT ON TABLES TO $POSTGRES_BACKUP_USER - GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO $POSTGRES_BACKUP_USER; + GRANT SELECT ON TABLES TO $POSTGRES_BACKUP_USER; + ALTER DEFAULT PRIVILEGES IN SCHEMA public + GRANT SELECT ON SEQUENCES TO $POSTGRES_BACKUP_USER; EOSQL diff --git a/user-management/keycloak-gateway/src/main/kotlin/co/nilin/opex/auth/gateway/data/UserProfileInfo.kt b/user-management/keycloak-gateway/src/main/kotlin/co/nilin/opex/auth/gateway/data/UserProfileInfo.kt index 94ab954a0..ca0cb02bd 100644 --- a/user-management/keycloak-gateway/src/main/kotlin/co/nilin/opex/auth/gateway/data/UserProfileInfo.kt +++ b/user-management/keycloak-gateway/src/main/kotlin/co/nilin/opex/auth/gateway/data/UserProfileInfo.kt @@ -4,13 +4,13 @@ class UserProfileInfo { var firstNameEn: String? = null var lastNameEn: String? = null - var firstNameFa: String? = null - var lastNameFa: String? = null - var birthday: String? = null - var birthdayAlt: String? = null - var nationalID: String? = null - var passport: String? = null - var phoneNumber: String? = null + var firstName: String? = null + var lastName: String? = null + var birthdayJ: String? = null + var birthdayG: String? = null + var nationalId: String? = null + var passportNumber: String? = null + var mobile: String? = null var telephone: String? = null var postalCode: String? = null var residence: String? = null @@ -35,13 +35,13 @@ class UserProfileInfo { ) { this.firstNameEn = firstNameEn this.lastNameEn = lastNameEn - this.firstNameFa = firstNameFa - this.lastNameFa = lastNameFa - this.birthday = birthday - this.birthdayAlt = birthdayJalali - this.nationalID = nationalID - this.passport = passport - this.phoneNumber = phoneNumber + this.firstName = firstNameFa + this.lastName = lastNameFa + this.birthdayJ = birthday + this.birthdayG = birthdayJalali + this.nationalId = nationalID + this.passportNumber = passport + this.mobile = phoneNumber this.telephone = homeNumber this.postalCode = postalCode this.residence = address diff --git a/user-management/keycloak-gateway/src/main/kotlin/co/nilin/opex/auth/gateway/extension/UserProfileResource.kt b/user-management/keycloak-gateway/src/main/kotlin/co/nilin/opex/auth/gateway/extension/UserProfileResource.kt index f090b7620..2ebfb37af 100644 --- a/user-management/keycloak-gateway/src/main/kotlin/co/nilin/opex/auth/gateway/extension/UserProfileResource.kt +++ b/user-management/keycloak-gateway/src/main/kotlin/co/nilin/opex/auth/gateway/extension/UserProfileResource.kt @@ -5,7 +5,6 @@ import co.nilin.opex.auth.gateway.data.UserProfileInfo import co.nilin.opex.auth.gateway.utils.ErrorHandler import co.nilin.opex.auth.gateway.utils.ResourceAuthenticator import co.nilin.opex.utility.error.data.OpexError -import co.nilin.opex.utility.error.data.OpexException import org.jboss.resteasy.plugins.providers.multipart.InputPart import org.keycloak.models.KeycloakSession import org.keycloak.models.UserModel @@ -53,13 +52,13 @@ class UserProfileResource(private val session: KeycloakSession) : RealmResourceP with(request) { firstNameEn?.let { user.setSingleAttribute("firstNameEn", it) } lastNameEn?.let { user.setSingleAttribute("lastNameEn", it) } - firstNameFa?.let { user.setSingleAttribute("firstNameFa", it) } - lastNameFa?.let { user.setSingleAttribute("lastNameFa", it) } - birthday?.let { user.setSingleAttribute("birthday", it) } - birthdayAlt?.let { user.setSingleAttribute("birthdayAlt", it) } - nationalID?.let { user.setSingleAttribute("nationalID", it) } - passport?.let { user.setSingleAttribute("passport", it) } - phoneNumber?.let { user.setSingleAttribute("phoneNumber", it) } + firstName?.let { user.setSingleAttribute("firstName", it) } + lastName?.let { user.setSingleAttribute("lastName", it) } + birthdayJ?.let { user.setSingleAttribute("birthdayJ", it) } + birthdayG?.let { user.setSingleAttribute("birthdayG", it) } + nationalId?.let { user.setSingleAttribute("nationalId", it) } + passportNumber?.let { user.setSingleAttribute("passportNumber", it) } + mobile?.let { user.setSingleAttribute("mobile", it) } telephone?.let { user.setSingleAttribute("telephone", it) } postalCode?.let { user.setSingleAttribute("postalCode", it) } residence?.let { user.setSingleAttribute("residence", it) }