feat(jans-auth-server): remove ox properties name (#3285)

JanssenProject · Dec 12, 2022 · f70b207 · f70b207
1 parent cd11750
commit f70b207
Show file tree

Hide file tree

Showing 20 changed files with 101 additions and 101 deletions.
diff --git a/...server/client/src/test/java/io/jans/as/client/client/assertbuilders/JwtAssertBuilder.java b/...server/client/src/test/java/io/jans/as/client/client/assertbuilders/JwtAssertBuilder.java
@@ -24,7 +24,7 @@ public class JwtAssertBuilder extends BaseAssertBuilder {
     private Jwt jwt;
     private boolean notNullAccesTokenHash;
     private boolean notNullAuthenticationTime;
-    private boolean notNullOxOpenIDConnectVersion;
+    private boolean notNullJansOpenIDConnectVersion;
     private boolean notNullAuthenticationContextClassReference;
     private boolean notNullAuthenticationMethodReferences;
     private boolean notNullClaimsAddressdata;
@@ -42,7 +42,7 @@ public JwtAssertBuilder(Jwt jwt) {
         this.jwt = jwt;
         this.notNullAccesTokenHash = false;
         this.notNullAuthenticationTime = false;
-        this.notNullOxOpenIDConnectVersion = false;
+        this.notNullJansOpenIDConnectVersion = false;
         this.notNullAuthenticationContextClassReference = false;
         this.notNullAuthenticationMethodReferences = false;
         this.claimsPresence = null;
@@ -65,8 +65,8 @@ public JwtAssertBuilder notNullAuthenticationTime() {
         return this;
     }
 
-    public JwtAssertBuilder notNullOxOpenIDConnectVersion() {
-        this.notNullOxOpenIDConnectVersion = true;
+    public JwtAssertBuilder notNullJansOpenIDConnectVersion() {
+        this.notNullJansOpenIDConnectVersion = true;
         return this;
     }
 
@@ -177,8 +177,8 @@ public void check() {
             assertNotNullClaim(JwtClaimName.AUTHENTICATION_TIME);
         if (notNullAccesTokenHash)
             assertNotNullClaim(JwtClaimName.ACCESS_TOKEN_HASH);
-        if (notNullOxOpenIDConnectVersion)
-            assertNotNullClaim(JwtClaimName.OX_OPENID_CONNECT_VERSION);
+        if (notNullJansOpenIDConnectVersion)
+            assertNotNullClaim(JwtClaimName.JANS_OPENID_CONNECT_VERSION);
         if (notNullAuthenticationContextClassReference)
             assertNotNullClaim(JwtClaimName.AUTHENTICATION_CONTEXT_CLASS_REFERENCE);
         if (notNullAuthenticationMethodReferences)

diff --git a/...rver/client/src/test/java/io/jans/as/client/ws/rs/ApplicationTypeRestrictionHttpTest.java b/...rver/client/src/test/java/io/jans/as/client/ws/rs/ApplicationTypeRestrictionHttpTest.java
@@ -239,7 +239,7 @@ public void applicationTypeNativeSubjectTypePublic(
         // 5. Validate id_token 
         AssertBuilder.jwtParse(idToken)
                 .validateSignatureRSA(jwksUri, SignatureAlgorithm.RS256)
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .notNullAuthenticationTime()
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .check();
@@ -361,7 +361,7 @@ public void applicationTypeNativeSubjectTypePairwise(
         // 5. Validate id_token 
         AssertBuilder.jwtParse(idToken)
                 .validateSignatureRSA(jwksUri, SignatureAlgorithm.RS256)
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .notNullAuthenticationTime()
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .check();

diff --git a/...th-server/client/src/test/java/io/jans/as/client/ws/rs/AuthorizationCodeFlowHttpTest.java b/...th-server/client/src/test/java/io/jans/as/client/ws/rs/AuthorizationCodeFlowHttpTest.java
@@ -106,7 +106,7 @@ public void authorizationCodeFlow(
                 .validateSignatureRSAClientEngine(jwksUri, SignatureAlgorithm.RS256)
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .notNullAuthenticationContextClassReference()
                 .notNullAuthenticationMethodReferences()
                 .check();
@@ -200,7 +200,7 @@ public void authorizationCodeFlowNegativeTest(
         AssertBuilder.jwtParse(idToken)
                 .validateSignatureRSAClientEngine(jwksUri, SignatureAlgorithm.RS256)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .check();
 
@@ -265,7 +265,7 @@ public void authorizationCodeWithNotAllowedScopeFlow(
         AssertBuilder.jwt(jwt)
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .notNullAuthenticationContextClassReference()
                 .notNullAuthenticationMethodReferences()
                 .check();
@@ -329,7 +329,7 @@ public void authorizationCodeDynamicScopeFlow(
         // 3. Validate id_token
         AssertBuilder.jwtParse(idToken)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .check();
 
@@ -433,7 +433,7 @@ public void authorizationCodeFlowWithOptionalNonce(
         AssertBuilder.jwt(jwt)
                 .validateSignatureRSAClientEngine(jwksUri, SignatureAlgorithm.RS256)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .claimsPresence(JwtClaimName.NONCE, JwtClaimName.CODE_HASH)
                 .check();
         assertEquals(jwt.getClaims().getClaimAsString(JwtClaimName.NONCE), nonce);
@@ -619,7 +619,7 @@ public void authorizationCodeFlowLoginHint(
         AssertBuilder.jwtParse(idToken)
                 .validateSignatureRSAClientEngine(jwksUri, SignatureAlgorithm.RS256)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .check();
 
@@ -708,7 +708,7 @@ public void retainClaimAuthorizationCodeFlow(final String userId, final String u
         AssertBuilder.jwt(jwt)
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .notNullAuthenticationContextClassReference()
                 .notNullAuthenticationMethodReferences()
                 .check();

diff --git a/...-server/client/src/test/java/io/jans/as/client/ws/rs/AuthorizeRestWebServiceHttpTest.java b/...-server/client/src/test/java/io/jans/as/client/ws/rs/AuthorizeRestWebServiceHttpTest.java
@@ -623,7 +623,7 @@ public void requestAuthorizationTokenIdToken(
                 .accessToken(accessToken)
                 .claimsPresence(JwtClaimName.ACCESS_TOKEN_HASH)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .notNullAuthenticationContextClassReference()
                 .notNullAuthenticationMethodReferences()
                 .check();
@@ -692,7 +692,7 @@ public void requestAuthorizationTokenIdTokenUserBasicAuth(
                 .accessToken(accessToken)
                 .claimsPresence(JwtClaimName.ACCESS_TOKEN_HASH)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .notNullAuthenticationContextClassReference()
                 .notNullAuthenticationMethodReferences()
                 .check();
@@ -764,7 +764,7 @@ public void requestAuthorizationCodeIdToken(
                 .authorizationCode(code)
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .notNullAuthenticationContextClassReference()
                 .notNullAuthenticationMethodReferences()
                 .check();
@@ -836,7 +836,7 @@ public void requestAuthorizationCodeIdTokenUserBasicAuth(
                 .authorizationCode(code)
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .notNullAuthenticationContextClassReference()
                 .notNullAuthenticationMethodReferences()
                 .check();
@@ -1028,7 +1028,7 @@ public void requestAuthorizationTokenCodeIdToken(
                 .accessToken(accessToken)
                 .claimsPresence(JwtClaimName.CODE_HASH, JwtClaimName.ACCESS_TOKEN_HASH)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .notNullAuthenticationContextClassReference()
                 .notNullAuthenticationMethodReferences()
                 .check();
@@ -1105,7 +1105,7 @@ public void requestAuthorizationTokenCodeIdTokenUserBasicAuth(
                 .accessToken(accessToken)
                 .claimsPresence(JwtClaimName.CODE_HASH, JwtClaimName.ACCESS_TOKEN_HASH)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .notNullAuthenticationContextClassReference()
                 .notNullAuthenticationMethodReferences()
                 .check();
@@ -2459,7 +2459,7 @@ public void requestAuthorizationAccessTokenSubjectTypePublic(
                 .validateSignatureRSA(jwksUri, SignatureAlgorithm.RS256)
                 .claimsPresence(JwtClaimName.ACCESS_TOKEN_HASH)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .notNullAuthenticationContextClassReference()
                 .notNullAuthenticationMethodReferences()
                 .check();

diff --git a/...-auth-server/client/src/test/java/io/jans/as/client/ws/rs/ClientLanguageMetadataTest.java b/...-auth-server/client/src/test/java/io/jans/as/client/ws/rs/ClientLanguageMetadataTest.java
@@ -126,7 +126,7 @@ public void authorizationCodeFlow(
                 .validateSignatureRSAClientEngine(jwksUri, SignatureAlgorithm.RS256)
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .notNullAuthenticationContextClassReference()
                 .notNullAuthenticationMethodReferences()
                 .check();

diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/ClientSecretBasicTest.java b/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/ClientSecretBasicTest.java
@@ -167,7 +167,7 @@ public void authorizationCodeFlow(
         AssertBuilder.jwtParse(idToken)
                 .validateSignatureRSA(jwksUri, SignatureAlgorithm.RS256)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .check();
 

diff --git a/.../client/src/test/java/io/jans/as/client/ws/rs/EnableClientToRestrictJavascriptOrigin.java b/.../client/src/test/java/io/jans/as/client/ws/rs/EnableClientToRestrictJavascriptOrigin.java
@@ -123,7 +123,7 @@ public void enableClientToRestrictJavascriptOrigin(
         // 4. Validate id_token
         AssertBuilder.jwtParse(idToken)
                 .validateSignatureRSA(jwksUri, SignatureAlgorithm.RS256)
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .check();
 

diff --git a/...th-server/client/src/test/java/io/jans/as/client/ws/rs/TokenEncryptionHttpDeprecated.java b/...th-server/client/src/test/java/io/jans/as/client/ws/rs/TokenEncryptionHttpDeprecated.java
@@ -102,7 +102,7 @@ public void requestIdTokenAlgRSAOAEPEncA256GCM(
 
             Jwe jwe = Jwe.parse(idToken, privateKey, null);
             AssertBuilder.jwe(jwe)
-                    .claimsPresence(JwtClaimName.OX_OPENID_CONNECT_VERSION)
+                    .claimsPresence(JwtClaimName.JANS_OPENID_CONNECT_VERSION)
                     .check();
         } catch (Exception ex) {
             fail(ex.getMessage(), ex);
@@ -170,7 +170,7 @@ public void requestIdTokenAlgRSA15EncA128CBCPLUSHS256(
 
             Jwe jwe = Jwe.parse(idToken, privateKey, null);
             AssertBuilder.jwe(jwe)
-                    .claimsPresence(JwtClaimName.OX_OPENID_CONNECT_VERSION)
+                    .claimsPresence(JwtClaimName.JANS_OPENID_CONNECT_VERSION)
                     .check();
         } catch (Exception ex) {
             fail(ex.getMessage(), ex);
@@ -238,7 +238,7 @@ public void requestIdTokenAlgRSA15EncA256CBCPLUSHS512(
 
             Jwe jwe = Jwe.parse(idToken, privateKey, null);
             AssertBuilder.jwe(jwe)
-                    .claimsPresence(JwtClaimName.OX_OPENID_CONNECT_VERSION)
+                    .claimsPresence(JwtClaimName.JANS_OPENID_CONNECT_VERSION)
                     .check();
         } catch (Exception ex) {
             fail(ex.getMessage(), ex);
@@ -300,7 +300,7 @@ public void requestIdTokenAlgA128KWEncA128GCM(
             // 3. Read Encrypted ID Token
             Jwe jwe = Jwe.parse(idToken, null, clientSecret.getBytes(StandardCharsets.UTF_8));
             AssertBuilder.jwe(jwe)
-                    .claimsPresence(JwtClaimName.OX_OPENID_CONNECT_VERSION)
+                    .claimsPresence(JwtClaimName.JANS_OPENID_CONNECT_VERSION)
                     .check();
         } catch (Exception ex) {
             fail(ex.getMessage(), ex);
@@ -362,7 +362,7 @@ public void requestIdTokenAlgA256KWEncA256GCM(
             // 3. Read Encrypted ID Token
             Jwe jwe = Jwe.parse(idToken, null, clientSecret.getBytes(StandardCharsets.UTF_8));
             AssertBuilder.jwe(jwe)
-                    .claimsPresence(JwtClaimName.OX_OPENID_CONNECT_VERSION)
+                    .claimsPresence(JwtClaimName.JANS_OPENID_CONNECT_VERSION)
                     .check();
         } catch (Exception ex) {
             fail(ex.getMessage(), ex);

diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/TokenRevocationTest.java b/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/TokenRevocationTest.java
@@ -158,7 +158,7 @@ public void requestTokenRevocation1(
         AssertBuilder.jwtParse(idToken)
                 .validateSignatureRSA(jwksUri, SignatureAlgorithm.RS256)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .check();
 
@@ -289,7 +289,7 @@ public void requestTokenRevocation2(
         AssertBuilder.jwtParse(idToken)
                 .validateSignatureRSA(jwksUri, SignatureAlgorithm.RS256)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .check();
 
@@ -392,7 +392,7 @@ public void requestTokenRevocation3(
         AssertBuilder.jwtParse(idToken)
                 .validateSignatureRSA(jwksUri, SignatureAlgorithm.RS256)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .check();
 
@@ -504,7 +504,7 @@ public void requestTokenRevocationOptionalTokenTypeHint(
         AssertBuilder.jwtParse(idToken)
                 .validateSignatureRSA(jwksUri, SignatureAlgorithm.RS256)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .check();
 

diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/ValidateIdTokenHashesTest.java b/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/ValidateIdTokenHashesTest.java
@@ -102,7 +102,7 @@ public void validateIdTokenHashes(
                 .accessToken(accessToken)
                 .state(state)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .notNullAuthenticationContextClassReference()
                 .notNullAuthenticationMethodReferences()
                 .check();
@@ -134,7 +134,7 @@ public void validateIdTokenHashes(
                 .accessToken(accessToken2)
                 .claimsNoPresence(JwtClaimName.STATE_HASH)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .notNullAuthenticationContextClassReference()
                 .notNullAuthenticationMethodReferences()
                 .check();

diff --git a/...ver/client/src/test/java/io/jans/as/client/ws/rs/deviceauthz/DeviceAuthzFlowHttpTest.java b/...ver/client/src/test/java/io/jans/as/client/ws/rs/deviceauthz/DeviceAuthzFlowHttpTest.java
@@ -106,7 +106,7 @@ public void deviceAuthzFlow(final String userId, final String userSecret) throws
         // 5. Validate id_token
         AssertBuilder.jwtParse(idToken)
                 .validateSignatureRSAClientEngine(jwksUri, SignatureAlgorithm.RS256)
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .check();
 
         // 6. Request new access token using the refresh token.
@@ -330,7 +330,7 @@ public void deviceAuthzFlowWithCompleteVerificationUri(final String userId, fina
         // 5. Validate id_token
         AssertBuilder.jwtParse(idToken)
                 .validateSignatureRSAClientEngine(jwksUri, SignatureAlgorithm.RS256)
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .check();
 
         // 6. Request new access token using the refresh token.

diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/par/ParHttpTest.java b/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/par/ParHttpTest.java
@@ -85,7 +85,7 @@ public void requestAuthorizationWithPar(final String userId, final String userSe
                 .validateSignatureRSAClientEngine(jwksUri, SignatureAlgorithm.RS256)
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .notNullAuthenticationContextClassReference()
                 .notNullAuthenticationMethodReferences()
                 .check();

diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/token/NativeSsoHttpTest.java b/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/token/NativeSsoHttpTest.java
@@ -91,7 +91,7 @@ private Pair<String, String> app1Flow(String userId, String userSecret, String r
                 .validateSignatureRSAClientEngine(jwksUri, SignatureAlgorithm.RS256)
                 .claimsPresence(JwtClaimName.CODE_HASH)
                 .notNullAuthenticationTime()
-                .notNullOxOpenIDConnectVersion()
+                .notNullJansOpenIDConnectVersion()
                 .notNullAuthenticationContextClassReference()
                 .notNullAuthenticationMethodReferences()
                 .notBlankDsHash()