Merge pull request #138 from wultra/issues/merge-upstream

Merge upstream

Dockerfile

@@ -1,4 +1,4 @@
-FROM ibm-semeru-runtimes:open-17.0.9_9-jre
+FROM ibm-semeru-runtimes:open-21.0.1_12-jre
 LABEL maintainer="[email protected]"
 
 # Prepare environment variables

docs/Migration-Instructions.md

@@ -2,6 +2,7 @@
 
 This page contains PowerAuth Enrollment Server migration instructions.
 
+- [PowerAuth Enrollment Server 1.7.0](./PowerAuth-Enrollment-Server-1.7.0.md)
 - [PowerAuth Enrollment Server 1.6.0](./PowerAuth-Enrollment-Server-1.6.0.md)
 - [PowerAuth Enrollment Server 1.5.0](./PowerAuth-Enrollment-Server-1.5.0.md)
 - [PowerAuth Enrollment Server 1.4.0](./PowerAuth-Enrollment-Server-1.4.0.md)

docs/PowerAuth-Enrollment-Server-1.7.0.md

@@ -0,0 +1,12 @@
+# Migration from 1.6.x to 1.7.x
+
+This guide contains instructions for migration from PowerAuth Enrollment Server version `1.6.x` to version `1.7.0`.
+
+
+## REST API
+
+
+### Register for Push Messages (Token)
+
+The endpoint `POST /api/push/device/register/token` now strictly validates `platform` against values `ios`, `android` or `huawei`.
+If you use the PowerAuth SDK, you should not be affected.

enrollment-server-api-model/src/main/java/com/wultra/app/enrollmentserver/api/model/enrollment/request/PushRegisterRequest.java

@@ -40,19 +40,22 @@ public class PushRegisterRequest {
     private Platform platform;
 
     /**
-     * The push token is the value received from APNS or FCM services without any modification.
+     * The push token is the value received from APNS, FCM, or HMS services without any modification.
      */
     @NotBlank
     @ToString.Exclude
-    @Schema(description = "The push token is the value received from APNS or FCM services without any modification.")
+    @Schema(description = "The push token is the value received from APNS, FCM, or HMS services without any modification.")
     private String token;
 
     public enum Platform {
         @JsonProperty("ios")
         IOS,
 
         @JsonProperty("android")
-        ANDROID
+        ANDROID,
+
+        @JsonProperty("huawei")
+        HUAWEI
     }
 
 }

enrollment-server/src/main/java/com/wultra/app/enrollmentserver/impl/service/PushRegistrationService.java

@@ -94,6 +94,7 @@ private static MobilePlatform convert(final PushRegisterRequest.Platform source)
         return switch (source) {
             case IOS -> MobilePlatform.IOS;
             case ANDROID -> MobilePlatform.ANDROID;
+            case HUAWEI -> MobilePlatform.HUAWEI;
         };
     }