AbstractAuthenticationModuleType.name fix in the tests

Evolveum · May 19, 2023 · 9e99582 · 9e99582
1 parent 526e7c3
commit 9e99582
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 29 deletions.
diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-default.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-default.xml
@@ -12,11 +12,11 @@
     <authentication>
         <modules>
             <loginForm>
-                <name>internalLoginForm</name>
+                <identifier>internalLoginForm</identifier>
                 <description>Internal username/password authentication, default user password, login form</description>
             </loginForm>
             <httpBasic>
-                <name>internalBasic</name>
+                <identifier>internalBasic</identifier>
                 <description>Internal username/password authentication, using HTTP basic auth</description>
             </httpBasic>
         </modules>

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-disabled.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-disabled.xml
@@ -12,11 +12,11 @@
     <authentication>
         <modules>
             <loginForm>
-                <name>internalLoginForm</name>
+                <identifier>internalLoginForm</identifier>
                 <description>Internal username/password authentication, default user password, login form</description>
             </loginForm>
             <httpBasic>
-                <name>internalBasic</name>
+                <identifier>internalBasic</identifier>
                 <description>Internal username/password authentication, using HTTP basic auth</description>
             </httpBasic>
         </modules>

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-enabled.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-enabled.xml
@@ -12,11 +12,11 @@
     <authentication>
         <modules>
             <loginForm>
-                <name>internalLoginForm</name>
+                <identifier>internalLoginForm</identifier>
                 <description>Internal username/password authentication, default user password, login form</description>
             </loginForm>
             <httpBasic>
-                <name>internalBasic</name>
+                <identifier>internalBasic</identifier>
                 <description>Internal username/password authentication, using HTTP basic auth</description>
             </httpBasic>
         </modules>

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-issuer-uri.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-issuer-uri.xml
@@ -12,12 +12,11 @@
     <authentication>
         <modules>
             <loginForm>
-                <name>internalLoginForm</name>
+                <identifier>internalLoginForm</identifier>
                 <description>Internal username/password authentication, default user password, login form</description>
             </loginForm>
             <oidc>
-
-                <name>oidcResourceServer</name>
+                <identifier>oidcResourceServer</identifier>
                 <resourceServer>
                     <issuerUri>https://keycloak.lab.evolveum.com/auth/realms/test</issuerUri>
                     <nameOfUsernameClaim>preferred_username</nameOfUsernameClaim>

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-jws-uri-wrong-alg.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-jws-uri-wrong-alg.xml
@@ -12,11 +12,11 @@
     <authentication>
         <modules>
             <loginForm>
-                <name>internalLoginForm</name>
+                <identifier>internalLoginForm</identifier>
                 <description>Internal username/password authentication, default user password, login form</description>
             </loginForm>
             <oidc>
-                <name>oidcResourceServer</name>
+                <identifier>oidcResourceServer</identifier>
                 <resourceServer>
                     <jwkSetUri>https://keycloak.lab.evolveum.com/auth/realms/test/protocol/openid-connect/certs</jwkSetUri>
                     <trustedAlgorithm>PS384</trustedAlgorithm>

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-jws-uri.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-jws-uri.xml
@@ -12,11 +12,11 @@
     <authentication>
         <modules>
             <loginForm>
-                <name>internalLoginForm</name>
+                <identifier>internalLoginForm</identifier>
                 <description>Internal username/password authentication, default user password, login form</description>
             </loginForm>
             <oidc>
-                <name>oidcResourceServer</name>
+                <identifier>oidcResourceServer</identifier>
                 <resourceServer>
                     <jwkSetUri>https://keycloak.lab.evolveum.com/auth/realms/test/protocol/openid-connect/certs</jwkSetUri>
                     <nameOfUsernameClaim>preferred_username</nameOfUsernameClaim>

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-public-key-wrong-alg.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-public-key-wrong-alg.xml
@@ -12,11 +12,11 @@
     <authentication>
         <modules>
             <loginForm>
-                <name>internalLoginForm</name>
+                <identifier>internalLoginForm</identifier>
                 <description>Internal username/password authentication, default user password, login form</description>
             </loginForm>
             <oidc>
-                <name>oidcResourceServer</name>
+                <identifier>oidcResourceServer</identifier>
                 <resourceServer>
                     <trustingAsymmetricCertificate>
                         <clearValue>MIIClzCCAX8CBgF+TkjEqzANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDAR0ZXN0MB4XDTIyMDExMjEyMzMxOFoXDTMyMDExMjEyMzQ1OFowDzENMAsGA1UEAwwEdGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN0prZaeDeXQycO3X73ZzB+7zVdu+WOu9WfTd9QtJaulXfKbNaWgkYn8MnwMmNXEquTDctPP2F0oZ3jnavPl7AamZaRcN+ZkWnY+jVEG3Xlmv4Psu82Pmy6TltclnXWg2nnHx29+9wlPjF4H3svru6wtXTeNbSUfnowpt3iOM7QKa4g/cBIihkD3dxJ0cUFwqy3scqXCCL6awkER77tfF5n7bPczjQ3E9BJCgsumcbH13Y4PHeq9zUOA/x7HgzyFUFQUWljlQQEASBtkZsKz9PGewSE61yFzCqx3o6+Z+WvM0lEk7vxN0ah3mTpIJdDz6xC5psX2Ef5OsDuy0WnH990CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAJKb00wJeDzXJU+wpaR/B33BTVp4xlXmQmC4Lh8DCW9OCICVn6ngiSQtGuhFRQnHAzjaegGxj+oB6GHHMI1QapuVdJ83ZsUw20spwBxptrqklIGgtB4OsWU3P2QZvwF06zUGjRCA8ZuO64TFsULzB2mYzNFT7KNG1UO4Z8h5g7NuX1a0abHrHK9Yzx6eYNMwS+SCbVwG2ww3zrLXw10Jx3VUdkdPA2R/mkVCS/FEv44UJAwN/bG9E7RNA/AoCVF8qPxx8cx5oE0R5IEIA5vKKoW/iEN3+D2ye66mwpqyFK2zCZsCWocq8IWydq+umPSFsG24tj0NUmznzSULoBJ4KiA==</clearValue>

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-public-key.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-public-key.xml
@@ -12,11 +12,11 @@
     <authentication>
         <modules>
             <loginForm>
-                <name>internalLoginForm</name>
+                <identifier>internalLoginForm</identifier>
                 <description>Internal username/password authentication, default user password, login form</description>
             </loginForm>
             <oidc>
-                <name>oidcResourceServer</name>
+                <identifier>oidcResourceServer</identifier>
                 <resourceServer>
                     <trustingAsymmetricCertificate>
                         <clearValue>MIIClzCCAX8CBgF+TkjEqzANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDAR0ZXN0MB4XDTIyMDExMjEyMzMxOFoXDTMyMDExMjEyMzQ1OFowDzENMAsGA1UEAwwEdGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN0prZaeDeXQycO3X73ZzB+7zVdu+WOu9WfTd9QtJaulXfKbNaWgkYn8MnwMmNXEquTDctPP2F0oZ3jnavPl7AamZaRcN+ZkWnY+jVEG3Xlmv4Psu82Pmy6TltclnXWg2nnHx29+9wlPjF4H3svru6wtXTeNbSUfnowpt3iOM7QKa4g/cBIihkD3dxJ0cUFwqy3scqXCCL6awkER77tfF5n7bPczjQ3E9BJCgsumcbH13Y4PHeq9zUOA/x7HgzyFUFQUWljlQQEASBtkZsKz9PGewSE61yFzCqx3o6+Z+WvM0lEk7vxN0ah3mTpIJdDz6xC5psX2Ef5OsDuy0WnH990CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAJKb00wJeDzXJU+wpaR/B33BTVp4xlXmQmC4Lh8DCW9OCICVn6ngiSQtGuhFRQnHAzjaegGxj+oB6GHHMI1QapuVdJ83ZsUw20spwBxptrqklIGgtB4OsWU3P2QZvwF06zUGjRCA8ZuO64TFsULzB2mYzNFT7KNG1UO4Z8h5g7NuX1a0abHrHK9Yzx6eYNMwS+SCbVwG2ww3zrLXw10Jx3VUdkdPA2R/mkVCS/FEv44UJAwN/bG9E7RNA/AoCVF8qPxx8cx5oE0R5IEIA5vKKoW/iEN3+D2ye66mwpqyFK2zCZsCWocq8IWydq+umPSFsG24tj0NUmznzSULoBJ4KiA==</clearValue>

diff --git a/...g/rest/src/test/resources/authentication/repo/security-policy-symmetric-key-wrong-alg.xml b/...g/rest/src/test/resources/authentication/repo/security-policy-symmetric-key-wrong-alg.xml
@@ -12,11 +12,11 @@
     <authentication>
         <modules>
             <loginForm>
-                <name>internalLoginForm</name>
+                <identifier>internalLoginForm</identifier>
                 <description>Internal username/password authentication, default user password, login form</description>
             </loginForm>
             <oidc>
-                <name>oidcResourceServer</name>
+                <identifier>oidcResourceServer</identifier>
                 <resourceServer>
                     <trustedAlgorithm>HS384</trustedAlgorithm>
                     <singleSymmetricKey>

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-symmetric-key.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-symmetric-key.xml
@@ -12,11 +12,11 @@
     <authentication>
         <modules>
             <loginForm>
-                <name>internalLoginForm</name>
+                <identifier>internalLoginForm</identifier>
                 <description>Internal username/password authentication, default user password, login form</description>
             </loginForm>
             <oidc>
-                <name>oidcResourceServer</name>
+                <identifier>oidcResourceServer</identifier>
                 <resourceServer>
                     <singleSymmetricKey>
                         <clearValue>aRpjWIG4mI-SMG6KuEIX5PWT8o-_onPnh8OWoF_3-aMqgYM3ef4JLrHbk0lbQm91L-Mx0YSBFSHqPiAy6WQV9Q</clearValue>

diff --git a/testing/rest/src/test/resources/authentication/repo/security-policy-unsuccessful.xml b/testing/rest/src/test/resources/authentication/repo/security-policy-unsuccessful.xml
@@ -12,11 +12,11 @@
     <authentication>
         <modules>
             <loginForm>
-                <name>internalLoginForm</name>
+                <identifier>internalLoginForm</identifier>
                 <description>Internal username/password authentication, default user password, login form</description>
             </loginForm>
             <httpBasic>
-                <name>internalBasic</name>
+                <identifier>internalBasic</identifier>
                 <description>Internal username/password authentication, using HTTP basic auth</description>
             </httpBasic>
         </modules>

diff --git a/testing/rest/src/test/resources/repo/security-policy-no-history.xml b/testing/rest/src/test/resources/repo/security-policy-no-history.xml
@@ -12,15 +12,15 @@
     <authentication>
         <modules>
             <loginForm>
-                <name>internalLoginForm</name>
+                <identifier>internalLoginForm</identifier>
                 <description>Internal username/password authentication, default user password, login form</description>
             </loginForm>
             <httpBasic>
-                <name>internalBasic</name>
+                <identifier>internalBasic</identifier>
                 <description>Internal username/password authentication, using HTTP basic auth</description>
             </httpBasic>
             <httpSecQ>
-                <name>httpSecQ</name>
+                <identifier>httpSecQ</identifier>
                 <description>
                     Special "HTTP SecQ" authentication based on security question answers.
                     It is used for REST service.

diff --git a/testing/rest/src/test/resources/repo/security-policy.xml b/testing/rest/src/test/resources/repo/security-policy.xml
@@ -12,15 +12,15 @@
     <authentication>
         <modules>
             <loginForm>
-                <name>internalLoginForm</name>
+                <identifier>internalLoginForm</identifier>
                 <description>Internal username/password authentication, default user password, login form</description>
             </loginForm>
             <httpBasic>
-                <name>internalBasic</name>
+                <identifier>internalBasic</identifier>
                 <description>Internal username/password authentication, using HTTP basic auth</description>
             </httpBasic>
             <httpSecQ>
-                <name>httpSecQ</name>
+                <identifier>httpSecQ</identifier>
                 <description>
                     Special "HTTP SecQ" authentication based on security question answers.
                     It is used for REST service.