Merge pull request #4571 from nocodb/feat/reset-password-error-msg

feat(nocodb): include error message for resetting password
2 years ago · a3b7a6ab74
2 changed files with 10 additions and 2 deletions
--- a/packages/nocodb/src/lib/meta/api/userApi/ui/auth/resetPassword.ts
+++ b/packages/nocodb/src/lib/meta/api/userApi/ui/auth/resetPassword.ts
@ -86,7 +86,11 @@ export default `<!DOCTYPE html>
            });
            this.success = true;
          } catch (e) {
-            alert('Some error occured')
+            if (e.response && e.response.data && e.response.data.msg) {
              alert('Failed to reset password: ' + e.response.data.msg)
            } else {
              alert('Some error occurred')
            }
          }
        }
      }
--- a/packages/nocodb/src/lib/v1-legacy/rest/ui/auth/resetPassword.ts
+++ b/packages/nocodb/src/lib/v1-legacy/rest/ui/auth/resetPassword.ts
@ -86,7 +86,11 @@ export default `<!DOCTYPE html>
            });
            this.success = true;
          } catch (e) {
-            alert('Some error occured')
+            if (e.response && e.response.data && e.response.data.msg) {
              alert('Failed to reset password: ' + e.response.data.msg)
            } else {
              alert('Some error occurred')
            }
          }
        }
      }