From 16124f76177f6fcb38b13c04c148a1630776b6fc Mon Sep 17 00:00:00 2001
From: Aaron Lee <longyklee@gmail.com>
Date: Sun, 3 Oct 2021 14:03:54 +0800
Subject: [PATCH] Change error message representation

---
 app.py                                        | 38 +++++++++++--------
 .../{iforgot.html => forgotPassword.html}     |  2 +-
 templates/login.html                          |  2 +-
 3 files changed, 25 insertions(+), 17 deletions(-)
 rename templates/{iforgot.html => forgotPassword.html} (97%)

diff --git a/app.py b/app.py
index 521b560..7c7fc22 100644
--- a/app.py
+++ b/app.py
@@ -91,7 +91,7 @@ def index():
                         'reCAPTCHA 錯誤，請稍後再試一次<br>reCAPTCHA Failed. Please try again later.')
                     return redirect('/')
             except Exception as e:
-                print("Error:", email, str(e), flush=True)
+                print("Error*Login:", email, str(e), flush=True)
                 flash(
                     '帳號或密碼錯誤，請重新輸入<br>Incorrect username or password')
                 return redirect('/')
@@ -131,8 +131,10 @@ def selSubUser():
                     'reCAPTCHA 錯誤，請稍後再試一次<br>reCAPTCHA Failed. Please try again later.')
                 return redirect('/select')
         except Exception as e:
-            print("Error:", data, str(e), flush=True)
-            flash(str(e))
+            print("Error*select:", session['email'], str(json.loads(e.args[1])[
+                  'error']['message']), flush=True)
+            flash(str(json.loads(e.args[1])[
+                  'error']['message']))
             return redirect('/select')
 
 
@@ -185,21 +187,23 @@ def chgPassword():
                             data, usr['idToken'])
                     except:
                         pass
-                print("Error:", oldEmail, str(e), flush=True)
-                flash(str(e))
+                print("Error*chgPassword:", oldEmail, str(json.loads(e.args[1])[
+                    'error']['message']), flush=True)
+                flash(str(json.loads(e.args[1])[
+                    'error']['message']))
                 return redirect('/chgPassword')
 
 
-@app.route('/iforgot', methods=['GET', 'POST'])
-def iforgot():
+@app.route('/forgotPassword', methods=['GET', 'POST'])
+def forgotPassword():
     if request.method == 'GET':
-        return render_template('iforgot.html')
+        return render_template('forgotPassword.html')
     elif request.method == 'POST':
         email = request.form['username']
         try:
             if (verify_recaptcha("")):
                 auth.send_password_reset_email(email)
-                print("iforgot email sent:", email, flush=True)
+                print("forgotPassword email sent:", email, flush=True)
                 flash(
                     '重置密碼信件已寄出，請至信箱收取<br>Password reset email has been sent to your email. Please check your email.')
                 return redirect('/')
@@ -207,11 +211,13 @@ def iforgot():
                 print("ReC Error:", email, flush=True)
                 flash(
                     'reCAPTCHA 錯誤，請稍後再試一次<br>reCAPTCHA Failed. Please try again later.')
-                return redirect('/iforgot')
+                return redirect('/forgotPassword')
         except Exception as e:
-            print("Error:", email, str(e), flush=True)
-            flash(str(e))
-            return redirect('/iforgot')
+            print("Error*forgotPassword:", email, str(json.loads(e.args[1])[
+                  'error']['message']), flush=True)
+            flash(str(json.loads(e.args[1])[
+                  'error']['message']))
+            return redirect('/forgotPassword')
 
 
 @app.route('/resetPassword', methods=['GET', 'POST'])
@@ -234,8 +240,10 @@ def resetPassword():
                     'reCAPTCHA 錯誤，請稍後再試一次<br>reCAPTCHA Failed. Please try again later.')
                 return redirect('/resetPassword')
         except Exception as e:
-            print("Error:", str(e), flush=True)
-            flash(str(e))
+            print("Error*resetPassword:", session['oobCode'], str(json.loads(e.args[1])[
+                  'error']['message']), flush=True)
+            flash(str(json.loads(e.args[1])[
+                  'error']['message']))
             return redirect('/resetPassword')
 
 
diff --git a/templates/iforgot.html b/templates/forgotPassword.html
similarity index 97%
rename from templates/iforgot.html
rename to templates/forgotPassword.html
index 7a667fe..b7142d3 100644
--- a/templates/iforgot.html
+++ b/templates/forgotPassword.html
@@ -29,7 +29,7 @@
         <div class="row">
             <div class="col"></div>
             <div class="col-md-5">
-                <form action="/iforgot" id="forgotPassword_sel" method="post">
+                <form action="/forgotPassword" id="forgotPassword_sel" method="post">
                     <div class="form-group row" style="margin-bottom: 10px;">
                         <div class="col-3 center"><label for="username" style="font-size: 19px">Username 帳號: </label>
                         </div>
diff --git a/templates/login.html b/templates/login.html
index b70c199..d3176a0 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -45,7 +45,7 @@
                     <button class="btn btn-primary btn-block g-recaptcha" onclick="loadingAnimation()">Login
                         登入</button>
                 </form>
-                <a href="/iforgot">Forgot Password 忘記密碼</a>
+                <a href="/forgotPassword">Forgot Password 忘記密碼</a>
                 <div class="disclaimer" hidden="hidden">
                     This site is protected by reCAPTCHA and the Google
                     <a target="_blank" href="https://policies.google.com/privacy">Privacy Policy</a> and