Update tests to use only "admin" role

Author: culka

src/integration-test/kotlin/fi/hsl/jore4/auth/Constants.kt

@@ -195,16 +195,14 @@ object Constants {
     """
 
     const val RO_USER_EXT_PERMISSION_ID = "0123456789ABCDE"
-    const val RO_USER_EXT_PERMISSION_EXT_ID = "read-only"
+    const val RO_USER_EXT_PERMISSION_EXT_ID = "admin"
     const val RO_USER_SUB = "60643ec68823e65ee44a9050"
     const val RO_USER_FIRST_NAME = "Rita"
     const val RO_USER_LAST_NAME = "Readonly"
     const val RO_USER_FULL_NAME = "$RO_USER_FIRST_NAME Roswita $RO_USER_LAST_NAME"
 
     const val RW_USER_EXT_PERMISSION_1_ID = "123456789ABCDEFGH"
-    const val RW_USER_EXT_PERMISSION_1_EXT_ID = "RO"
-    const val RW_USER_EXT_PERMISSION_2_ID = "23456789ABCDEFGHIJ"
-    const val RW_USER_EXT_PERMISSION_2_EXT_ID = "read-and-write"
+    const val RW_USER_EXT_PERMISSION_1_EXT_ID = "admin"
     const val RW_USER_SUB = "13643ec68823e65ee4479432"
     const val RW_USER_FIRST_NAME = "Alicia"
     const val RW_USER_LAST_NAME = "Admin"

src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/HasuraApiControllerTest.kt

@@ -38,8 +38,7 @@ class HasuraApiControllerTest(
     )
     private val rwUserInfoContent = MockOIDCProvider.createUserInfoResponseContent(
         Constants.RW_USER_SUB, Constants.RW_USER_FIRST_NAME, Constants.RW_USER_LAST_NAME, Constants.RW_USER_FULL_NAME,
-        Pair(Constants.RW_USER_EXT_PERMISSION_1_ID, Constants.RW_USER_EXT_PERMISSION_1_EXT_ID),
-        Pair(Constants.RW_USER_EXT_PERMISSION_2_ID, Constants.RW_USER_EXT_PERMISSION_2_EXT_ID)
+        Pair(Constants.RW_USER_EXT_PERMISSION_1_ID, Constants.RW_USER_EXT_PERMISSION_1_EXT_ID)
     )
 
     @BeforeEach
@@ -130,10 +129,10 @@ class HasuraApiControllerTest(
                 UserTokenSet(BearerAccessToken(accessToken), RefreshToken(Constants.OIDC_REFRESH_TOKEN))
             )
 
-            requestBuilder.webhook(session, Constants.RW_USER_EXT_PERMISSION_2_EXT_ID)
+            requestBuilder.webhook(session, Constants.RW_USER_EXT_PERMISSION_1_EXT_ID)
                 .andExpect(status().isOk)
                 .andExpect(jsonPath("$.X-Hasura-User-Id").value(Constants.RW_USER_SUB))
-                .andExpect(jsonPath("$.X-Hasura-Role").value(Constants.RW_USER_EXT_PERMISSION_2_EXT_ID))
+                .andExpect(jsonPath("$.X-Hasura-Role").value(Constants.RW_USER_EXT_PERMISSION_1_EXT_ID))
                 .andExpect(jsonPath("$.Cache-Control").value(HasuraAuthService.CACHE_CONTROL_SPEC))
         }
     }

src/integration-test/kotlin/fi/hsl/jore4/auth/apipublic/v1/UserInfoApiControllerTest.kt

@@ -24,8 +24,6 @@ import fi.hsl.jore4.auth.Constants.RO_USER_LAST_NAME
 import fi.hsl.jore4.auth.Constants.RO_USER_SUB
 import fi.hsl.jore4.auth.Constants.RW_USER_EXT_PERMISSION_1_EXT_ID
 import fi.hsl.jore4.auth.Constants.RW_USER_EXT_PERMISSION_1_ID
-import fi.hsl.jore4.auth.Constants.RW_USER_EXT_PERMISSION_2_EXT_ID
-import fi.hsl.jore4.auth.Constants.RW_USER_EXT_PERMISSION_2_ID
 import fi.hsl.jore4.auth.Constants.RW_USER_FIRST_NAME
 import fi.hsl.jore4.auth.Constants.RW_USER_FULL_NAME
 import fi.hsl.jore4.auth.Constants.RW_USER_LAST_NAME
@@ -339,8 +337,7 @@ class UserInfoApiControllerTest(
                 val newAccessToken = createJwtAccessToken()
                 val userInfoContent = MockOIDCProvider.createUserInfoResponseContent(
                     RW_USER_SUB, RW_USER_FIRST_NAME, RW_USER_LAST_NAME, RW_USER_FULL_NAME,
-                    Pair(RW_USER_EXT_PERMISSION_1_ID, RW_USER_EXT_PERMISSION_1_EXT_ID),
-                    Pair(RW_USER_EXT_PERMISSION_2_ID, RW_USER_EXT_PERMISSION_2_EXT_ID)
+                    Pair(RW_USER_EXT_PERMISSION_1_ID, RW_USER_EXT_PERMISSION_1_EXT_ID)
                 )
 
                 with(MockOIDCProvider) {
@@ -361,9 +358,8 @@ class UserInfoApiControllerTest(
                     .andExpect(jsonPath("$.fullName").value(RW_USER_FULL_NAME))
                     .andExpect(jsonPath("$.givenName").value(RW_USER_FIRST_NAME))
                     .andExpect(jsonPath("$.familyName").value(RW_USER_LAST_NAME))
-                    .andExpect(jsonPath("$.permissions.length()").value(2))
+                    .andExpect(jsonPath("$.permissions.length()").value(1))
                     .andExpect(jsonPath("$.permissions[0]").value(RW_USER_EXT_PERMISSION_1_EXT_ID))
-                    .andExpect(jsonPath("$.permissions[1]").value(RW_USER_EXT_PERMISSION_2_EXT_ID))
             }
         }
     }