UID2-1223 support advertising token v4 (#142)

* Use `Uid2Base64UrlCoder` from shared

* Use `TokenVersion` from shared

Author: cYKatherine

pom.xml

@@ -19,7 +19,7 @@
         <!-- check micrometer.version vertx-micrometer-metrics consumes before bumping up -->
         <micrometer.version>1.1.0</micrometer.version>
         <enclave-api.version>1.1.0</enclave-api.version>
-        <uid2-shared.version>2.5.3-2dde11c9cd</uid2-shared.version>
+        <uid2-shared.version>2.7.0-3e279acefa</uid2-shared.version>
         <image.version>${project.version}</image.version>
     </properties>
 

src/main/java/com/uid2/operator/model/AdvertisingToken.java

@@ -1,6 +1,7 @@
 package com.uid2.operator.model;
 
 import java.time.Instant;
+import com.uid2.shared.model.TokenVersion;
 
 public class AdvertisingToken extends VersionedToken {
     public final OperatorIdentity operatorIdentity;

src/main/java/com/uid2/operator/model/RefreshToken.java

@@ -1,6 +1,7 @@
 package com.uid2.operator.model;
 
 import java.time.Instant;
+import com.uid2.shared.model.TokenVersion;
 
 public class RefreshToken extends VersionedToken {
     public final OperatorIdentity operatorIdentity;

src/main/java/com/uid2/operator/model/TokenVersion.java

@@ -1,6 +1,8 @@
 package com.uid2.operator.model;
 
 import java.time.Instant;
+import com.uid2.shared.model.TokenVersion;
+
 
 public class UserToken extends VersionedToken {
     public final OperatorIdentity operatorIdentity;

src/main/java/com/uid2/operator/model/UserToken.java

@@ -2,6 +2,8 @@
 
 import java.time.Instant;
 import java.util.Objects;
+import com.uid2.shared.model.TokenVersion;
+
 
 public abstract class VersionedToken {
     public final TokenVersion version;

src/main/java/com/uid2/operator/model/VersionedToken.java

@@ -4,9 +4,11 @@
 import com.uid2.operator.model.*;
 import com.uid2.shared.store.IKeyStore;
 import com.uid2.shared.model.EncryptionKey;
+import com.uid2.shared.encryption.Uid2Base64UrlCoder;
 import com.uid2.shared.encryption.AesCbc;
 import com.uid2.shared.encryption.AesGcm;
 import io.vertx.core.buffer.Buffer;
+import com.uid2.shared.model.TokenVersion;
 
 import java.time.Instant;
 import java.util.Base64;

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

@@ -4,6 +4,7 @@
 import com.uid2.shared.model.SaltEntry;
 import com.uid2.operator.store.IOptOutStore;
 import com.uid2.shared.store.ISaltProvider;
+import com.uid2.shared.model.TokenVersion;
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Future;
 import io.vertx.core.Handler;

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

@@ -1,6 +1,6 @@
 package com.uid2.operator;
 
-import com.uid2.operator.model.TokenVersion;
+import com.uid2.shared.model.TokenVersion;
 import org.junit.jupiter.api.Test;
 
 import com.uid2.operator.model.IdentityScope;