Fixed v4 metadata and added tests

Author: gmsdelmundo

src/main/java/com/uid2/operator/service/TokenUtils.java

@@ -59,7 +59,7 @@ public static byte[] getAdvertisingIdV3FromIdentityHash(IdentityScope scope, Ide
     }
 
     public static byte[] getAdvertisingIdV4(IdentityScope scope, IdentityType type, IdentityEnvironment environment, byte[] firstLevelHash, SaltEntry.KeyMaterial encryptingKey) throws Exception {
-        byte metadata = (byte) (encodeIdentityVersion(IdentityVersion.V4) | encodeIdentityScope(scope) | encodeIdentityType(type) | encodeIdentityEnvironment(environment));
+        byte metadata = encodeV4Metadata(scope, type, environment);
         return V4TokenUtils.buildAdvertisingIdV4(metadata, firstLevelHash, encryptingKey.id(), encryptingKey.key(), encryptingKey.salt());
     }
 
@@ -71,6 +71,10 @@ public static byte[] getAdvertisingIdV4FromIdentityHash(IdentityScope scope, Ide
         return getAdvertisingIdV4(scope, type, environment, getFirstLevelHashFromIdentityHash(identityString, firstLevelSalt), encryptingKey);
     }
 
+    public static byte encodeV4Metadata(IdentityScope scope, IdentityType type, IdentityEnvironment environment) {
+        return (byte) (encodeIdentityVersion(IdentityVersion.V4) | encodeIdentityScope(scope) | encodeIdentityType(type) | encodeIdentityEnvironment(environment));
+    }
+
     public static byte encodeIdentityScope(IdentityScope identityScope) {
         return (byte) (identityScope.getValue() << 4);
     }
@@ -80,10 +84,10 @@ public static byte encodeIdentityType(IdentityType identityType) {
     }
 
     public static byte encodeIdentityVersion(IdentityVersion identityVersion) {
-        return (byte) (identityVersion.getValue() << 6);
+        return (byte) (identityVersion.getValue() << 5);
     }
 
     public static byte encodeIdentityEnvironment(IdentityEnvironment identityEnvironment) {
-        return (byte) (identityEnvironment.getValue());
+        return (byte) (identityEnvironment.getValue() << 6);
     }
 }

src/test/java/com/uid2/operator/service/TokenUtilsTest.java

@@ -0,0 +1,41 @@
+package com.uid2.operator.service;
+
+import com.uid2.operator.model.IdentityEnvironment;
+import com.uid2.operator.model.IdentityScope;
+import com.uid2.operator.model.IdentityType;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class TokenUtilsTest {
+    @ParameterizedTest
+    @MethodSource("v4Metadata")
+    void testEncodeV4Metadata(IdentityScope scope, IdentityType type, IdentityEnvironment environment, byte expectedMetadata) {
+        byte metadata = TokenUtils.encodeV4Metadata(scope, type, environment);
+
+        assertEquals(expectedMetadata, metadata);
+    }
+
+    private static Stream<Arguments> v4Metadata() {
+        return Stream.of(
+                Arguments.of(IdentityScope.UID2, IdentityType.Email, IdentityEnvironment.TEST, (byte) 0b00100000),
+                Arguments.of(IdentityScope.UID2, IdentityType.Phone, IdentityEnvironment.TEST, (byte) 0b00100100),
+                Arguments.of(IdentityScope.EUID, IdentityType.Email, IdentityEnvironment.TEST, (byte) 0b00110000),
+                Arguments.of(IdentityScope.EUID, IdentityType.Phone, IdentityEnvironment.TEST, (byte) 0b00110100),
+
+                Arguments.of(IdentityScope.UID2, IdentityType.Email, IdentityEnvironment.INTEG, (byte) 0b01100000),
+                Arguments.of(IdentityScope.UID2, IdentityType.Phone, IdentityEnvironment.INTEG, (byte) 0b01100100),
+                Arguments.of(IdentityScope.EUID, IdentityType.Email, IdentityEnvironment.INTEG, (byte) 0b01110000),
+                Arguments.of(IdentityScope.EUID, IdentityType.Phone, IdentityEnvironment.INTEG, (byte) 0b01110100),
+
+                Arguments.of(IdentityScope.UID2, IdentityType.Email, IdentityEnvironment.PROD, (byte) 0b10100000),
+                Arguments.of(IdentityScope.UID2, IdentityType.Phone, IdentityEnvironment.PROD, (byte) 0b10100100),
+                Arguments.of(IdentityScope.EUID, IdentityType.Email, IdentityEnvironment.PROD, (byte) 0b10110000),
+                Arguments.of(IdentityScope.EUID, IdentityType.Phone, IdentityEnvironment.PROD, (byte) 0b10110100)
+        );
+    }
+}