fix some context problems

privacyidea · Oct 2, 2023 · adca38a · adca38a
1 parent 0fd9705
commit adca38a
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 35 deletions.
diff --git a/privacyIDEA-impl/src/main/java/org/privacyidea/action/InitializePIContext.java b/privacyIDEA-impl/src/main/java/org/privacyidea/action/InitializePIContext.java
@@ -65,30 +65,29 @@ protected void doExecute(@NotNull ProfileRequestContext profileRequestContext, @
             PIServerConfigContext piServerConfigContext = new PIServerConfigContext(configParams);
             log.info("{} Create PIServerConfigContext {}", this.getLogPrefix(), piServerConfigContext);
             authenticationContext.addSubcontext(piServerConfigContext);
-            PIContext piContext;
 
             PIContext piContext = new PIContext(user);
+            log.info("{} Create PIContext {}", this.getLogPrefix(), piContext);
+            authenticationContext.addSubcontext(piContext);
+
+            PIFormContext piFormContext;
             if (otpLength != null)
             {
                 try
                 {
                     int otpLengthToInt = Integer.parseInt(otpLength);
-                    piContext = new PIContext(user, defaultMessage, otpFieldHint, otpLengthToInt);
+                    piFormContext = new PIFormContext(defaultMessage, otpFieldHint, otpLengthToInt);
                 }
                 catch (NumberFormatException e)
                 {
                     log.info("{} Config option \"otp_length\": Wrong format. Only digits allowed.", getLogPrefix());
-                    piContext = new PIContext(user, defaultMessage, otpFieldHint, null);
+                    piFormContext = new PIFormContext(defaultMessage, otpFieldHint, null);
                 }
             }
             else
             {
-                piContext = new PIContext(user, defaultMessage, otpFieldHint, null);
+                piFormContext = new PIFormContext(defaultMessage, otpFieldHint, null);
             }
-            log.info("{} Create PIContext {}", this.getLogPrefix(), piContext);
-            authenticationContext.addSubcontext(piContext);
-
-            PIFormContext piFormContext = new PIFormContext(defaultMessage, otpFieldHint);
             log.info("{} Create PIFormContext {}", this.getLogPrefix(), piFormContext);
             authenticationContext.addSubcontext(piFormContext);
         }

diff --git a/privacyIDEA-impl/src/main/java/org/privacyidea/action/PrivacyIDEAAuthenticator.java b/privacyIDEA-impl/src/main/java/org/privacyidea/action/PrivacyIDEAAuthenticator.java
@@ -74,8 +74,8 @@ else if (piContext.getMode().equals("otp"))
                 if (piResponse.error != null)
                 {
                     LOGGER.error("{} privacyIDEA server error: {}!", this.getLogPrefix(), piResponse.error.message);
-                    ActionSupport.buildEvent(profileRequestContext, "AuthenticationException");
-                    return;
+                    piContext.setFormErrorMessage(piResponse.error.message);
+                    ActionSupport.buildEvent(profileRequestContext, "reload");
                 }
 
                 if (!piResponse.multichallenge.isEmpty())

diff --git a/privacyIDEA-impl/src/main/java/org/privacyidea/context/PIContext.java b/privacyIDEA-impl/src/main/java/org/privacyidea/context/PIContext.java
@@ -1,5 +1,6 @@
 package org.privacyidea.context;
 
+import java.util.Objects;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -21,28 +22,16 @@ public class PIContext extends BaseContext
     private String origin = null;
     @Nonnull
     private String mode = "otp";
-    @Nonnull
-    private final String otpFieldHint;
-    @Nullable
-    private final Integer otpLength;
 
-    public PIContext(@Nonnull User user, @Nullable String defaultMessage, @Nullable String otpFieldHint, @Nullable Integer otpLength)
+    public PIContext(@Nonnull User user)
     {
         this.user = Constraint.isNotNull(user, "User cannot be null.");
-        this.defaultMessage = Objects.requireNonNullElse(defaultMessage, "Please enter the OTP!");
-        this.otpFieldHint = Objects.requireNonNullElse(otpFieldHint, "OTP");
-        this.otpLength = otpLength;
     }
 
     // Getters and Setters
     @Nonnull
     public String getUsername() {return user.getUsername();}
 
-    public void setMessage(String message) {this.message = message;}
-
-    @Nonnull
-    public String getMessage() {return (!message.isEmpty()) ? message : defaultMessage;}
-
     public void setTransactionID(@Nonnull String transactionID) {this.transactionID = transactionID;}
 
     @Nullable
@@ -72,10 +61,4 @@ public PIContext(@Nonnull User user, @Nullable String defaultMessage, @Nullable
     public String getFormErrorMessage() {return formErrorMessage;}
 
     public void setFormErrorMessage(@Nullable String formErrorMessage) {this.formErrorMessage = formErrorMessage;}
-
-    @Nonnull
-    public String getOtpFieldHint() {return otpFieldHint;}
-
-    @Nullable
-    public Integer getOtpLength() {return otpLength;}
 }
diff --git a/privacyIDEA-impl/src/main/java/org/privacyidea/context/PIFormContext.java b/privacyIDEA-impl/src/main/java/org/privacyidea/context/PIFormContext.java
@@ -8,15 +8,18 @@
 public class PIFormContext extends BaseContext
 {
     @Nonnull
-    private final String defaultMessage;
+    private String defaultMessage;
     private String message = "";
     @Nonnull
-    private final String otpFieldHint;
+    private String otpFieldHint;
+    @Nullable
+    private final Integer otpLength;
 
-    public PIFormContext(@Nullable String defaultMessage, @Nullable String otpFieldHint)
+    public PIFormContext(@Nullable String defaultMessage, @Nullable String otpFieldHint, @Nullable Integer otpLength)
     {
         this.defaultMessage = Objects.requireNonNullElse(defaultMessage, "Please enter the OTP!");
         this.otpFieldHint = Objects.requireNonNullElse(otpFieldHint, "OTP");
+        this.otpLength = otpLength;
     }
 
     public void setMessage(String message) {this.message = message;}
@@ -26,4 +29,7 @@ public PIFormContext(@Nullable String defaultMessage, @Nullable String otpFieldH
 
     @Nonnull
     public String getOtpFieldHint() {return otpFieldHint;}
+
+    @Nullable
+    public Integer getOtpLength() {return otpLength;}
 }
diff --git a/privacyIDEA-impl/src/main/resources/org/privacyidea/views/main.vm b/privacyIDEA-impl/src/main/resources/org/privacyidea/views/main.vm
@@ -68,8 +68,12 @@
                             <p>Hello $piContext.getUsername()!</p>
                             <br>
                             <p>$piFormContext.getMessage()</p>
-                            <br>
-                            <p>$piContext.getErrorMessage()</p>
+
+                            #set ($formErrorMsg = $piContext.getFormErrorMessage())
+                            #if ($formErrorMsg)
+                                <br>
+                                <p>$formErrorMsg</p>
+                            #end
                             <br>
                         </div>
 
@@ -85,7 +89,7 @@
                         </script>
 
                         <div class="form-element-wrapper">
-                            <input id="pi_otp_input" class="form-element form-field" name="pi_otp_input" type="password" onKeyUp="autoSubmit(this, $piContext.getOtpLength())" autofocus placeholder=$piContext.getOtpFieldHint() value="">
+                            <input id="pi_otp_input" class="form-element form-field" name="pi_otp_input" type="password" onKeyUp="autoSubmit(this, $piFormContext.getOtpLength())" autofocus placeholder=$piFormContext.getOtpFieldHint() value="">
                             <br>
                             <button class="form-element form-button" id="pi-form-submit-button" type="submit" name="_eventId_proceed">Submit</button>
                             <br><br>