Merge pull request #456 from /issues/455-PowerAuthClientException-NPE

Fix #455: PowerAuthClientException#getPowerAuthError is nullable
wultra · Oct 20, 2023 · 6be94f8 · 6be94f8
2 parents 214c6f3 + ee22456
commit 6be94f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -87,8 +87,9 @@
         <spring-boot.version>3.1.4</spring-boot.version>
         <commons-text.version>1.10.0</commons-text.version>
         <bcprov.version>1.76</bcprov.version>
+
         <wultra-core.version>1.7.0</wultra-core.version>
-        <powerauth.version>1.5.0</powerauth.version>
+        <powerauth.version>1.6.0-SNAPSHOT</powerauth.version>
         <powerauth-crypto.version>1.5.1</powerauth-crypto.version>
     </properties>
 

diff --git a/...rc/main/java/io/getlime/security/powerauth/rest/api/spring/service/ActivationService.java b/...rc/main/java/io/getlime/security/powerauth/rest/api/spring/service/ActivationService.java
@@ -469,7 +469,7 @@ public ActivationLayer1Response createActivation(ActivationLayer1Request request
                 }
             }
         } catch (PowerAuthClientException ex) {
-            if (ex.getPowerAuthError() instanceof final PowerAuthErrorRecovery errorRecovery) {
+            if (ex.getPowerAuthError().orElse(null) instanceof final PowerAuthErrorRecovery errorRecovery) {
                 logger.debug("Invalid recovery code, current PUK index: {}", errorRecovery.getCurrentRecoveryPukIndex());
                 throw new PowerAuthRecoveryException(ex.getMessage(), "INVALID_RECOVERY_CODE", errorRecovery.getCurrentRecoveryPukIndex());
             }