hlaeja-old/hlaeja-account-registry
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update test remove role_ for user in DB

Browse Source
This commit is contained in:
Mr. Swordsteel
2025-08-02 13:06:05 +02:00
committed by swordsteel
parent 5e0ba7ed2a
commit 97b8becd08
7 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
http/account.http
View File

@@ -10,8 +10,8 @@ Content-Type: application/json
"password": "p4ssw0rd", "password": "p4ssw0rd",
"enabled": true, "enabled": true,
"roles": [ "roles": [
"ROLE_ADMIN", "ADMIN",
"ROLE_TEST" "TEST"
] ]
} }
@@ -24,7 +24,7 @@ Content-Type: application/json
"password": "pass", "password": "pass",
"enabled": true, "enabled": true,
"roles": [ "roles": [
"ROLE_TEST" "TEST"
] ]
} }
@@ -36,6 +36,6 @@ Content-Type: application/json
"username": "user", "username": "user",
"enabled": true, "enabled": true,
"roles": [ "roles": [
"ROLE_TEST" "TEST"
] ]
} }

7
sql/test/test_001-account.sql
View File

@@ -1,4 +1,5 @@
insert into public.accounts (id, created_at, updated_at, enabled, username, password, roles) insert into public.accounts (id, created_at, updated_at, enabled, username, password, roles)
values ('00000000-0000-7000-0000-000000000001'::uuid, '2000-01-01 00:00:00.000001 +00:00', '2000-01-01 00:00:01.000001 +00:00', true, 'admin', '$2a$12$KoXBoLOANMK11J4xeJHPA.Sy0FG.m8KWk7P4XFsMO.ZbFmFI2DckK', 'ROLE_ADMIN'), values ('00000000-0000-7000-0000-000000000001'::uuid, '2000-01-01 00:00:00.000001 +00:00', '2000-01-01 00:00:01.000001 +00:00', true, 'admin', '$2a$12$KoXBoLOANMK11J4xeJHPA.Sy0FG.m8KWk7P4XFsMO.ZbFmFI2DckK', 'ADMIN'),
('00000000-0000-7000-0000-000000000002'::uuid, '2000-01-01 00:00:00.000001 +00:00', '2000-01-01 00:00:01.000001 +00:00', true, 'user', '$2a$12$KoXBoLOANMK11J4xeJHPA.Sy0FG.m8KWk7P4XFsMO.ZbFmFI2DckK', 'ROLE_USER'), ('00000000-0000-7000-0000-000000000002'::uuid, '2000-01-01 00:00:00.000001 +00:00', '2000-01-01 00:00:01.000001 +00:00', true, 'user', '$2a$12$KoXBoLOANMK11J4xeJHPA.Sy0FG.m8KWk7P4XFsMO.ZbFmFI2DckK', 'USER'),
('00000000-0000-7000-0000-000000000003'::uuid, '2000-01-01 00:00:00.000001 +00:00', '2000-01-01 00:00:01.000001 +00:00', false, 'disabled', '$2a$12$KoXBoLOANMK11J4xeJHPA.Sy0FG.m8KWk7P4XFsMO.ZbFmFI2DckK', 'ROLE_USER'); ('00000000-0000-7000-0000-000000000002'::uuid, '2000-01-01 00:00:00.000001 +00:00', '2000-01-01 00:00:01.000001 +00:00', true, 'user', '$2a$12$KoXBoLOANMK11J4xeJHPA.Sy0FG.m8KWk7P4XFsMO.ZbFmFI2DckK', 'USER'),
('00000000-0000-7000-0000-000000000003'::uuid, '2000-01-01 00:00:00.000001 +00:00', '2000-01-01 00:00:01.000001 +00:00', false, 'disabled', '$2a$12$KoXBoLOANMK11J4xeJHPA.Sy0FG.m8KWk7P4XFsMO.ZbFmFI2DckK', 'USER');

10
src/main/resources/application.yml
View File

@@ -9,6 +9,8 @@ spring:
os: os:
name: "%APP_BUILD_OS_NAME%" name: "%APP_BUILD_OS_NAME%"
version: "%APP_BUILD_OS_VERSION%" version: "%APP_BUILD_OS_VERSION%"
r2dbc:
username: services
management: management:
endpoints: endpoints:
@@ -37,7 +39,6 @@ spring:
on-profile: development on-profile: development
r2dbc: r2dbc:
url: r2dbc:postgresql://localhost:5432/account_registry url: r2dbc:postgresql://localhost:5432/account_registry
username: services
password: password password: password
--- ---
@@ -50,14 +51,15 @@ spring:
on-profile: docker on-profile: docker
r2dbc: r2dbc:
url: r2dbc:postgresql://PostgreSQL:5432/account_registry url: r2dbc:postgresql://PostgreSQL:5432/account_registry
username: services
password: password password: password
--- ---
############################## ##############################
### Production environment ### ### Kubernetes environment ###
############################## ##############################
spring: spring:
config: config:
activate: activate:
on-profile: production on-profile: kubernetes
r2dbc:
url: r2dbc:postgresql://dependency-postgresql:5432/account_registry

32
src/test-integration/kotlin/ltd/hlaeja/controller/AccountEndpoint.kt
View File

@@ -57,7 +57,7 @@ class AccountEndpoint {
softly.assertThat(it.responseBody?.username).isEqualTo("admin") softly.assertThat(it.responseBody?.username).isEqualTo("admin")
softly.assertThat(it.responseBody?.enabled).isTrue softly.assertThat(it.responseBody?.enabled).isTrue
softly.assertThat(it.responseBody?.roles?.size).isEqualTo(1) softly.assertThat(it.responseBody?.roles?.size).isEqualTo(1)
softly.assertThat(it.responseBody?.roles?.get(0)).isEqualTo("ROLE_ADMIN") softly.assertThat(it.responseBody?.roles?.get(0)).isEqualTo("ADMIN")
} }
} }
@@ -97,7 +97,7 @@ class AccountEndpoint {
username = "usernameA", username = "usernameA",
password = "abc123", password = "abc123",
enabled = true, enabled = true,
roles = listOf("ROLE_USER", "ROLE_TEST"), roles = listOf("USER", "TEST"),
) )
// when // when
@@ -111,8 +111,8 @@ class AccountEndpoint {
softly.assertThat(it.responseBody?.username).isEqualTo("usernameA") softly.assertThat(it.responseBody?.username).isEqualTo("usernameA")
softly.assertThat(it.responseBody?.enabled).isTrue softly.assertThat(it.responseBody?.enabled).isTrue
softly.assertThat(it.responseBody?.roles?.size).isEqualTo(2) softly.assertThat(it.responseBody?.roles?.size).isEqualTo(2)
softly.assertThat(it.responseBody?.roles).contains("ROLE_USER") softly.assertThat(it.responseBody?.roles).contains("USER")
softly.assertThat(it.responseBody?.roles).contains("ROLE_TEST") softly.assertThat(it.responseBody?.roles).contains("TEST")
} }
} }
@@ -124,7 +124,7 @@ class AccountEndpoint {
username = "usernameB", username = "usernameB",
password = null, password = null,
enabled = false, enabled = false,
roles = listOf("ROLE_TEST"), roles = listOf("TEST"),
) )
// when // when
@@ -138,7 +138,7 @@ class AccountEndpoint {
softly.assertThat(it.responseBody?.username).isEqualTo("usernameB") softly.assertThat(it.responseBody?.username).isEqualTo("usernameB")
softly.assertThat(it.responseBody?.enabled).isFalse softly.assertThat(it.responseBody?.enabled).isFalse
softly.assertThat(it.responseBody?.roles?.size).isEqualTo(1) softly.assertThat(it.responseBody?.roles?.size).isEqualTo(1)
softly.assertThat(it.responseBody?.roles).contains("ROLE_TEST") softly.assertThat(it.responseBody?.roles).contains("TEST")
} }
} }
@@ -150,7 +150,7 @@ class AccountEndpoint {
username = "user", username = "user",
password = null, password = null,
enabled = true, enabled = true,
roles = listOf("ROLE_USER"), roles = listOf("USER"),
) )
// when // when
@@ -168,7 +168,7 @@ class AccountEndpoint {
username = "admin", username = "admin",
password = null, password = null,
enabled = true, enabled = true,
roles = listOf("ROLE_USER"), roles = listOf("USER"),
) )
// when // when
@@ -186,7 +186,7 @@ class AccountEndpoint {
username = "admin", username = "admin",
password = null, password = null,
enabled = true, enabled = true,
roles = listOf("ROLE_USER"), roles = listOf("USER"),
) )
// when // when
@@ -202,9 +202,9 @@ class AccountEndpoint {
@ParameterizedTest @ParameterizedTest
@CsvSource( @CsvSource(
"new-user, new-pass, true, 2, ROLE_USER;ROLE_TEST", "new-user, new-pass, true, 2, USER;TEST",
"admin-user, admin-pass, false, 1, ROLE_ADMIN", "admin-user, admin-pass, false, 1, ADMIN",
"test-user, test-pass, true, 1, ROLE_USER", "test-user, test-pass, true, 1, USER",
) )
fun `success added account`( fun `success added account`(
username: String, username: String,
@@ -242,8 +242,8 @@ class AccountEndpoint {
@ParameterizedTest @ParameterizedTest
@CsvSource( @CsvSource(
"'', new-pass, ROLE_TEST", "'', new-pass, TEST",
"new-user, '', ROLE_ADMIN", "new-user, '', ADMIN",
"new-user, new-pass, ''", "new-user, new-pass, ''",
) )
fun `validation fail on empty values`( fun `validation fail on empty values`(
@@ -276,7 +276,7 @@ class AccountEndpoint {
username = "user", username = "user",
password = "new-pass", password = "new-pass",
enabled = true, enabled = true,
roles = listOf("ROLE_USER", "ROLE_TEST"), roles = listOf("USER", "TEST"),
) )
// when // when
@@ -293,7 +293,7 @@ class AccountEndpoint {
username = "user", username = "user",
password = null, password = null,
enabled = true, enabled = true,
roles = listOf("ROLE_USER", "ROLE_TEST"), roles = listOf("USER", "TEST"),
) )
// when // when

2
src/test-integration/resources/authenticate/admin-token.data
View File

@@ -1 +1 @@
eyJhbGciOiJSUzI1NiJ9.eyJpZCI6IjAwMDAwMDAwLTAwMDAtNzAwMC0wMDAwLTAwMDAwMDAwMDAwMSIsInVzZXJuYW1lIjoiYWRtaW4iLCJyb2xlIjoiUk9MRV9BRE1JTiJ9.D6pK86XPWcdu1imV_y_4nAM6R4WEZvJpQ7oGaPAYe0_rg3UWdmVMa8Iw7L21bRgFoyIa7FQBwb_0AXojFVdb2mdOVDeGOwxQZAx23dwqeicOGd8yUMnuBaRSnd7z4P65KPMbbf0NOTQtho0Iv5mBAwFMJoF67sw-yntfx3cD_bfrI-Rf4oZaZsVn38Y2HJBe2sO2QI4e5_7s82ikxac416OX7PcIEgaf3IeEK1fSzSjRG_dyBGT_Jq_vAzVURsSu4ep976kI-k5ZXNE9EMxKu1S-n5c5eiaqo96ObnaSl4eWFik5q8vLhNLYIYO-bQi1xlJKnStwZqtUwlR763Gd5w eyJhbGciOiJSUzI1NiJ9.eyJpZCI6IjAwMDAwMDAwLTAwMDAtNzAwMC0wMDAwLTAwMDAwMDAwMDAwMSIsInVzZXJuYW1lIjoiYWRtaW4iLCJyb2xlIjoiQURNSU4ifQ.Z2mc__k9apWjJoZzJ3DWZuDiVN_jpisWtd0ecwrMnk1NrJ5Uw25pgrXPwn2aY0qYFAe0UGbE-4FhjUCxWLkknR0B-2_86IKHmN1A7z8lTqMRkK7qH-71uK0Y3o0kWKn117-FoSKDG-oefQE42NTwsSrzhiaEIzhUd0fsIyKuQCbDRol79rX5cU1HwOI8DHowpNEgvCLW1ogMWJDygq5GDgQI2HmV8vbnO1soFjKzvW3pz0sHWTimhAi76gl5mD_Lv_DdywcQWndwcGEoNj-SgHuKWktaG2_yzkoC9FQqWBgU7tukuycmLkbde_Oagydt2CAfPsBebu4Ac81UHGdUpw

2
src/test-integration/resources/authenticate/user-token.data
View File

@@ -1 +1 @@
eyJhbGciOiJSUzI1NiJ9.eyJpZCI6IjAwMDAwMDAwLTAwMDAtNzAwMC0wMDAwLTAwMDAwMDAwMDAwMiIsInVzZXJuYW1lIjoidXNlciIsInJvbGUiOiJST0xFX1VTRVIifQ.GvZIq0VF9xB8UY3PUGdnc6JNeUXtv4LzHJ56hWSeqUS6BXH0M_QJ5Lu9ndh9_P85CECp3eKrW4fKymGYe-NUXCtrzhr9-SSZLF6D7GRzAJ4yZjVRCOa_dgqe1RGuIZyZpli36z4NPqeBFqtHJ3Cs5rAI-WdvxGfWPgtM2kzpSJ_0zFihp9mVcZBlWP57HlN7-oKzDJWVpO2E17fWZTy-y4pdrIUsff63c256Cy8NhiAgux9aqZTdzaqp9TsXw59bRsS5d0YH7-gJuBd4xctZwgy_41BOcRk2q-nLyLZgWJs1wmCa_zaW0Fj6fjAsYvpdPNegkpIqrHJcQpGd7nE0KQ eyJhbGciOiJSUzI1NiJ9.eyJpZCI6IjAwMDAwMDAwLTAwMDAtNzAwMC0wMDAwLTAwMDAwMDAwMDAwMiIsInVzZXJuYW1lIjoidXNlciIsInJvbGUiOiJVU0VSIn0.kpmQYxhkyKsIjo9mJaysBXW0xdv8UjlmNnVsYNfBu-Tdro_0nQFVzhCcjaD6_TUhx2-3vSkvTwDtmMHsP0JC5B43K473o2zQjyHYzCNakPcNHiste9llNj12n5qUCOUMgCKb7ZztLffSIsYlSL7hyRwwmTaz73MDMYvLWAa4AgSNm8JPe3HkTkqRJ4YZ-saKO9Q0Vb9LLftB7T3b9P5kHYqzwISBsRm1rYHRRpGYs5goR2Qax1hLJBbQR4bswaeTRfl3fQ66mIr6mZqiY279wCzzueLuGyJPFzeZQYiQ2JiYRq3H2NyXCsWKCt2bK-YNwol1K3fYLPSq9kap-AGasQ

6
src/test-integration/resources/postgres/data.sql
View File

@@ -1,5 +1,5 @@
-- Test data -- Test data
insert into public.accounts (id, created_at, updated_at, enabled, username, password, roles) insert into public.accounts (id, created_at, updated_at, enabled, username, password, roles)
values ('00000000-0000-7000-0000-000000000001'::uuid, '2000-01-01 00:00:00.000001 +00:00', '2000-01-01 00:00:01.000001 +00:00', true, 'admin', '$2a$12$KoXBoLOANMK11J4xeJHPA.Sy0FG.m8KWk7P4XFsMO.ZbFmFI2DckK', 'ROLE_ADMIN'), values ('00000000-0000-7000-0000-000000000001'::uuid, '2000-01-01 00:00:00.000001 +00:00', '2000-01-01 00:00:01.000001 +00:00', true, 'admin', '$2a$12$KoXBoLOANMK11J4xeJHPA.Sy0FG.m8KWk7P4XFsMO.ZbFmFI2DckK', 'ADMIN'),
('00000000-0000-7000-0000-000000000002'::uuid, '2000-01-01 00:00:00.000001 +00:00', '2000-01-01 00:00:01.000001 +00:00', true, 'user', '$2a$12$KoXBoLOANMK11J4xeJHPA.Sy0FG.m8KWk7P4XFsMO.ZbFmFI2DckK', 'ROLE_USER'), ('00000000-0000-7000-0000-000000000002'::uuid, '2000-01-01 00:00:00.000001 +00:00', '2000-01-01 00:00:01.000001 +00:00', true, 'user', '$2a$12$KoXBoLOANMK11J4xeJHPA.Sy0FG.m8KWk7P4XFsMO.ZbFmFI2DckK', 'USER'),
('00000000-0000-7000-0000-000000000003'::uuid, '2000-01-01 00:00:00.000001 +00:00', '2000-01-01 00:00:01.000001 +00:00', false, 'disabled', '$2a$12$KoXBoLOANMK11J4xeJHPA.Sy0FG.m8KWk7P4XFsMO.ZbFmFI2DckK', 'ROLE_USER'); ('00000000-0000-7000-0000-000000000003'::uuid, '2000-01-01 00:00:00.000001 +00:00', '2000-01-01 00:00:01.000001 +00:00', false, 'disabled', '$2a$12$KoXBoLOANMK11J4xeJHPA.Sy0FG.m8KWk7P4XFsMO.ZbFmFI2DckK', 'USER');