Changeset 2058533

Timestamp:

03/27/2019 07:56:14 PM (7 years ago)

Author:

rleon.uy

Message:

WP-17 The plugin shows invalid username / password when the password is blocked

WP-16 Improve feedback when you are blocked in wordpress

Location:

cyclos/trunk

Files:

• cyclos-common.php (modified) (2 diffs)
• cyclos-public.php (modified) (8 diffs)
• stylesheet.css (modified) (2 diffs)

cyclos/trunk/cyclos-common.php

@@ -56 +56 @@
         CyclosKey::add($result, 'errorInaccessibleChannel', 'Error message: inaccessible channel', 'Access denied. The channel used to connect to the server is not allowed or misconfigured');
         CyclosKey::add($result, 'errorInaccessiblePrincipal', 'Error message: inaccessible principal', 'You cannot use your {principal} in this channel');
-        CyclosKey::add($result, 'errorIndefinitelyBlocked', 'Error message: password indefinitely blocked', 'Your password has been disabled by exceeding the maximum of tries.\nPlease, contact the administration');
-        CyclosKey::add($result, 'errorTemporarilyBlocked', 'Error message: password temporarily blocked', 'Your password has been blocked by exceeding the maximum of tries');
+        CyclosKey::add($result, "errorUserBlocked", 'Error message: user blocked', 'Your access has been blocked. Please, contact the administration.');
+        CyclosKey::add($result, "errorUserDisabled", 'Error message: user disabled', 'Your user account has been disabled. Please, contact the administration.');
+        CyclosKey::add($result, "errorUserPending", 'Error message: pending user', 'Your user account is pending for activation. Please, contact the administration for more information.');
         CyclosKey::add($result, "errorLogin", 'Error message: invalid login', 'Invalid username / password');
-        CyclosKey::add($result, 'errorInvalidPassword', 'Error message: password invalid', 'The given user / password are incorrect. Please, try again');
+        CyclosKey::add($result, 'errorPasswordIndefinitelyBlocked', 'Error message: password indefinitely blocked', 'Your password has been disabled by exceeding the maximum of tries.\nPlease, contact the administration');
+        CyclosKey::add($result, 'errorPasswordTemporarilyBlocked', 'Error message: password temporarily blocked', 'Your password has been blocked by exceeding the maximum of tries');
+        CyclosKey::add($result, 'errorInvalidPassword', 'Error message: password invalid', 'The given password is incorrect. Please, try again');
         CyclosKey::add($result, "errorInvalidAccessClient", "Error message: invalid access client", "The current access client is not correctly configured");
         CyclosKey::add($result, 'errorOperatorWithPendingAgreements', 'Error message: operator pending agreements', 'A required agreement needs to be accepted by your manager before you can login');        
@@ -157 +160 @@
                 // Likely a connection error (no REST API found)
                 $property = 'errorConnection';
-            }                   
-        } elseif (property_path_exists($e, 'error->code')) {        
+            }       
+        } elseif (property_path_exists($e, 'error->code')) {                    
             // Conflict, forbidden or other errors which contains a 'code' attribute            
-            $property = 'error'.ucwords($e->error->code);           
+            if($e->error->code = 'login') {
+                // Handle login error
+                if(property_exists($e->error, 'passwordStatus')) {
+                    // Password errors
+                    $property = 'errorPassword'.ucwords($e->error->passwordStatus);
+                } else if(property_exists($e->error, 'userStatus')) {
+                    // User errors
+                    $property = 'errorUser'.ucwords($e->error->userStatus);
+                }
+            }
+            if($property == NULL) {
+                $property = 'error'.ucwords($e->error->code);
+            }
         } 
     }

cyclos/trunk/cyclos-public.php

@@ -61 +61 @@
     $authService = new Cyclos\AuthService();
 
-    $out = '';
+    $out = '<div id="alert" style="display: none;">
+             <span class="closebtn" onclick="this.parentElement.style.display=\'none\';">&times;</span> 
+             <strong>Notice</strong> <span id="alertMessage"></span></div>';
+    
     $returnToValue = '';
 
@@ -146 +149 @@
         $out = $out . '
         <script>
-            jQuery(document).ready(function($) {
+            jQuery(document).ready(function($) {                
         ';
         $out = $out . '
-                $(".cyclosLoginForm").submit(function(event) {
+                
+                /**
+                 * Shows a notification with type Error, Warning, Info
+                 */
+                function showNotification(message, type) {                  
+                    $("#alertMessage").html(message);
+                    $("#alert").show();                 
+                    $("#alert").attr( "class", "alert"+type);
+            
+                     
+                }
+                
+                function hideNotification() {
+                    $("#alertMessage").html("");
+                    $("#alert").hide();
+                }
+                
+                $(".cyclosLoginForm").submit(function(event) {
                     var submitEnabled = true;
                     if (submitEnabled) {
+                        hideNotification();
                         var principal = this.cyclosPrincipal.value.trim();
                         var password = this.cyclosPassword.value.trim();
@@ -170 +191 @@
                                     if (response.redirectUrl) {
                                         location.href = response.redirectUrl;                                        
-                                    } else {
-                                        alert(response.errorMessage || "Invalid data received from server");
-                                        submitEnabled = true;
+                                    } else {                                        
+                                        showNotification(response.errorMessage || "Invalid data received from server", "Error");
+                                        submitEnabled = true;
                                     }
                                 })
@@ -198 +219 @@
                 function showLogin() {
                     if (submitEnabled) {
+                        hideNotification();
                         $(".cyclosLoginForm").trigger("reset");
                         $(".cyclosLoginContainer").show();
@@ -206 +228 @@
                 
                 function showForgotPassword() {
-                    if (submitEnabled) {
-                        $(".cyclosForgotPasswordForm").trigger("reset");
+                    if (submitEnabled) {
+                        hideNotification();
+                        $(".cyclosForgotPasswordForm").trigger("reset");
                         $(".cyclosLoginContainer").hide();
                         $(".cyclosForgotContainer").show();
@@ -235 +258 @@
                 $(".cyclosForgotPasswordForm").submit(function(event) {
                     if (submitEnabled) {
+                        
+                        hideNotification(); 
+                            
                         var email = this.cyclosEmail.value.trim();
                         var captchaText = this.cyclosCaptcha.value.trim();
@@ -252 +278 @@
                                     response = response || {};
                                     if (response.errorMessage) {
-                                        alert(response.errorMessage || "Invalid data received from server");
+                                        showNotification(response.errorMessage || "Invalid data received from server", "Error");
                                     } else {
                                         captchaId = null;
                                         showLogin();
-                                        alert("' . $t->forgotDone . '".replace("{email}", email));
+                                        showNotification("' . $t->forgotDone . '".replace("{email}", email), "Error");
                                     }
                                 })
@@ -308 +334 @@
                     sanitize_text_field($_POST['password']),
                     $_SERVER['REMOTE_ADDR']);       
-    } catch (\Exception $e) {       
+    } catch (\Exception $e) {       
         $errorMessage = handleError($e);
     }

cyclos/trunk/stylesheet.css

@@ -51 +51 @@
 }
 
-.cyclosFormBox a:hover {
+.cyclosFormBox a:hover,
+.closebtn:hover {
     color: #9cb7c3;
 }
@@ -89 +90 @@
     margin: 7px 0 -5px;
 }
+
+#alert {  
+    padding: 5px 10px;    
+    color: #ffffff;
+    width: 250px;
+    margin: auto;
+    font-family: "Open sans",Helvetica,Arial,Verdana,sans-serif;
+    font-size: 15px;
+    position: relative;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+}
+
+.alertError {
+    background-color: #b00020;
+}
+
+#alert strong {
+    display: block;
+}
+
+#alertMessage {
+    display: inline-block;
+    line-height: 18px;
+}
+
+.closebtn {
+    margin-left: 10px;
+    color: white;
+    font-weight: bold;
+    position: absolute;
+    font-size: 22px;
+    cursor: pointer;
+    transition: 0.3s;
+    vertical-align: middle;
+    line-height: 35px;
+    right: 10px;
+    top: 0px;
+}