fix oracle reset password issue

Author: mgckind

easyweb/static/des_components/des-login/des-login-reset.html

@@ -58,6 +58,7 @@
     </paper-card>
   </div>
 <paper-toast class="toast-position" id="toastSignUp" text="Form Submitted!" duration="2000"> </paper-toast>
+<paper-toast class="toast-position" id="toastSignUpError" text="ERROR: Check your form" duration="2000"> </paper-toast>
 </template>
 
 <script>
@@ -121,17 +122,19 @@
           'url': this.randomurl
       };
       form2.generateRequest();
-      document.getElementById("toastSignUp").show();
+      //document.getElementById("toastSignUp").show();
     },
     afterNewPasswordForm: function(e){
      var _self = this;
      document.getElementById('LoginSpinnerReset').active = false;
      _self.data = e.detail.response;
      console.log(_self.data.msg);
          if (_self.data.errno == '0') {
+      document.getElementById("toastSignUp").show();
      window.location.href = "/easyweb/logout/";
       }
       else {
+      document.getElementById("toastSignUpError").show();
       var button = document.getElementById('NewPassButton');
       button.disabled = false;
      this.error = _self.data.msg;

easyweb/static/elements/elements-built.html

@@ -47608,6 +47608,7 @@ <h2>Terms of Service</h2>
     </paper-card>
   </div>
 <paper-toast class="toast-position" id="toastSignUp" text="Form Submitted!" duration="2000"> </paper-toast>
+<paper-toast class="toast-position" id="toastSignUpError" text="ERROR: Check your form" duration="2000"> </paper-toast>
 </template>
 
 <script>
@@ -47671,17 +47672,19 @@ <h2>Terms of Service</h2>
           'url': this.randomurl
       };
       form2.generateRequest();
-      document.getElementById("toastSignUp").show();
+      //document.getElementById("toastSignUp").show();
     },
     afterNewPasswordForm: function(e){
      var _self = this;
      document.getElementById('LoginSpinnerReset').active = false;
      _self.data = e.detail.response;
      console.log(_self.data.msg);
          if (_self.data.errno == '0') {
+      document.getElementById("toastSignUp").show();
      window.location.href = "/easyweb/logout/";
       }
       else {
+      document.getElementById("toastSignUpError").show();
       var button = document.getElementById('NewPassButton');
       button.disabled = false;
      this.error = _self.data.msg;

login_public.py

@@ -85,6 +85,7 @@ def post(self):
         print('Reset Password')
         app_log.info('Reset Password')
         check, url, checkuser = db_utils.create_reset_url(email)
+        print(url)
         if check:
             email_utils.send_reset(email, checkuser, url)
             app_log.info('{},{},{}'.format(email, url, checkuser))
@@ -103,9 +104,12 @@ def put(self):
         if username == username2:
             print('valid', valid)
             if valid:
-                db_utils.update_password(username, password)
-                db_utils.unlock_user(username)
-                self.write(json.dumps({'msg': 'Password updated', 'errno': '0'}))
+                check, msg = db_utils.update_password(username, password)
+                if check:
+                    db_utils.unlock_user(username)
+                    self.write(json.dumps({'msg': 'Password updated', 'errno': '0'}))
+                else:
+                    self.write(json.dumps({'msg': msg + '. Try again', 'errno': '1'}))
             else:
                 msg = 'Password minimum length is 6.'
                 self.write(json.dumps({'msg': msg, 'errno': '1'}))

oracle/db_utils.py

@@ -134,11 +134,18 @@ def delete_url(url):
 def update_password(username, password):
     con = ea.connect('desdr')
     qlock = "ALTER USER {0} IDENTIFIED BY {1}".format(username, password)
-    con.query_and_print(qlock, suc_arg='Password Changed')
-    delete_old = "DELETE FROM DES_ADMIN.RESET_URL WHERE USERNAME = '{}'".format(username)
-    con.query_and_print(delete_old, suc_arg='Delete used Url')
+    valid = False
+    try:
+        con.cur.execute(qlock)
+        valid = True
+        msg = 'ok'
+    except Exception as e:
+        msg = str(e)
+    if valid:
+        delete_old = "DELETE FROM DES_ADMIN.RESET_URL WHERE USERNAME = '{}'".format(username)
+        con.query_and_print(delete_old, suc_arg='Delete used Url')
     con.close()
-    return True
+    return valid, msg
 
 
 def update_info(username, firstname, lastname, email, user_manager='', pass_manager=''):