Merge branch 'master' of http://git.choozmo.com:3000/choozmo/AI_Anchor_2

api/main.py

@@ -269,23 +269,34 @@ async def send_reset_pwd(user_id,email):
     code = str(time.time()).replace('.','')
     db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
     db['reset_pw_code'].insert({'code':code,'user_id':user_id,'email':email})
-    msg = '請至點擊網址以重設密碼 : https://www.choozmo.com:8887/reset_password?code='+code
+    msg = '請至點擊網址以重設密碼 : https://www.choozmo.com:8887/reset_pwd_page    通行碼為 '+ code
+    print(msg)
     msg =msg.encode(encoding='utf-8')
-    user_dict = next(iter(db.query('SELECT * FROM users where id ="'+str(user_id)+'"')))
+    print(msg)
+    print(type(user_id))
+    if int(user_id) != -1:
+        print('print at first place')
+        print(user_id)
+        user_dict = next(iter(db.query('SELECT * FROM users where id ="'+str(user_id)+'"')))
+    else:
+        user_id = util.user.get_id_by_email(email)
+        print(user_id)
+        user_dict = next(iter(db.query('SELECT * FROM users where id ="'+str(user_id)+'"')))
     mailer.send(msg, user_dict['email'])
     return {'msg':'ok'}
 
 @app.post('/reset_pwd')
 async def reset_password(req :models.reset_pwd):
     db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
+    print(req.code)
     veri_obj = next(iter(db.query('SELECT * FROM reset_pw_code where code ="'+str(req.code)+'"')))
+    print(veri_obj['user_id'])
+    user_id = util.user.get_id_by_email(veri_obj['email'])
+    print(user_id)
+    db.query('UPDATE users SET password = '+'"'+get_password_hash(req.password)+'" where id ='+str(user_id))
+    
     if veri_obj != None:
         db['reset_pw_code'].delete(code=req.code)
-    if veri_obj['user_id'] == -1:
-        val = db.query('UPDATE users SET password = '+'"'+get_password_hash(req.password)+'" where id ='+str(veri_obj['user_id']))
-    else:
-        user_id = user.get_id_by_email(veri_obj['email'])
-        val = db.query('UPDATE users SET password = '+'"'+get_password_hash(req.password)+'" where id ='+str(user_id))
     return {"msg": "ok"}
 
 @app.get("/gen_avatar")

api/static/reset_pwd.html

@@ -76,7 +76,7 @@
     <div class="content ms-auto">
       <form id="msform">
         <fieldset id='imgSrc'>
-          <h3 class="fs-subtitle" style="display: inline-block;">email<img class="ms-1" src="static/img/question.png" alt="" data-bs-toggle="tooltip" data-bs-placement="right" title="僅接受png, jpg, mp4格式"></h3><br/>
+          <h3 class="fs-subtitle" style="display: inline-block;">新密碼<img class="ms-1" src="static/img/question.png" alt="" data-bs-toggle="tooltip" data-bs-placement="right" title="僅接受png, jpg, mp4格式"></h3><br/>
           <input type="text" id='in_pwd' name='m1' class='imgsrc imgsrc1' value="" placeholder="1" /><br/>
           <h3 class="fs-subtitle" style="display: inline-block;">驗證碼<img class="ms-1" src="static/img/question.png" alt="" data-bs-toggle="tooltip" data-bs-placement="right" title="僅接受png, jpg, mp4格式"></h3><br/>
           <input type="text" id='code' name='m1' class='imgsrc imgsrc1' value="" placeholder="1" /><br/>

api/static/reset_pwd.js

@@ -1,3 +1,17 @@
+function renderXHR_data(jsonObj) {
+   XHRstring = ''
+   for (const [key, value] of Object.entries(jsonObj)) {
+     console.log(value)
+     if (typeof (value) == "object") {
+       XHRstring += (key+'=['+value.join(',')+']&')
+     }
+     else {
+       XHRstring += (key + '=' + value + '&')
+     }
+   }
+   XHRstring = XHRstring.substring(0, XHRstring.length - 1);
+   return XHRstring
+ }
 
 $(".sender").click(function () {
 
@@ -17,10 +31,9 @@ xhr.onreadystatechange = function () {
       alert('重設成功')
    }};
 
-var data = {
-  "code": code,
-  "password": pwd
-};
+
+var  dataOBJ = { "coed": code, "password": pwd}
+data = renderXHR_data(dataOBJ)
 
 xhr.send(data);
 });

api/static/reset_pwd_email.js

@@ -1,7 +1,7 @@
 
 $(".sender").click(function () {
 
-  var email = $("#in_email").val
+  var email = $("#in_email").val()
   var url = "/send_reset_pwd?user_id=-1&email="+email;
 
   var xhr = new XMLHttpRequest();