From ee22456c76b79a08ce6a4fbc801f5d9bbe67eab0 Mon Sep 17 00:00:00 2001
From: Lubos Racansky <lubos.racansky@gmail.com>
Date: Thu, 19 Oct 2023 15:02:27 +0200
Subject: [PATCH] Fix #455: PowerAuthClientException#getPowerAuthError is
 nullable

---
 pom.xml                                                        | 3 ++-
 .../powerauth/rest/api/spring/service/ActivationService.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 24807c6e..e3c8f5c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,8 +86,9 @@
         <spring-boot.version>3.1.3</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/powerauth-restful-security-spring/src/main/java/io/getlime/security/powerauth/rest/api/spring/service/ActivationService.java b/powerauth-restful-security-spring/src/main/java/io/getlime/security/powerauth/rest/api/spring/service/ActivationService.java
index 1d2b9cf0..f5a2a95c 100644
--- a/powerauth-restful-security-spring/src/main/java/io/getlime/security/powerauth/rest/api/spring/service/ActivationService.java
+++ b/powerauth-restful-security-spring/src/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());
             }