Merge pull request #269 from Seluj78/232-reset-password-view

232 reset password view

Author: Seluj78

backend/PyMatcha/routes/api/auth/password.py

@@ -99,7 +99,7 @@ def reset_password():
 def check_token_validity():
     data = request.get_json()
     try:
-        confirm_token(data["token"], expiration=7200)
+        email, token_type = confirm_token(data["token"], expiration=7200)
     except (SignatureExpired, BadSignature) as e:
         if e == SignatureExpired:
             current_app.logger.debug("/auth/password/reset -> Signature Expired")
@@ -108,4 +108,12 @@ def check_token_validity():
             current_app.logger.debug("/auth/password/reset -> Bad Signature")
             raise BadRequestError("Bad Signature.", "Request another password reset and try again.")
     else:
+        try:
+            u = get_user(email)
+        except NotFoundError:
+            current_app.logger.debug("/auth/password/reset -> User not found")
+            raise NotFoundError("User not found.")
+        if u.previous_reset_token == data["token"]:
+            current_app.logger.debug("/auth/password/reset -> Token already used")
+            raise BadRequestError("Token already used", "Please request a new one.")
         return Success("Reset token is correct")

backend/schemas/swagger.yaml

@@ -1050,6 +1050,8 @@ paths:
                   required: true
                     example: qwERg3rtyhog23mrweof5ngib4j3ktnrvwefqjskldnakms
       responses:
+        "404":
+          $ref: '#/components/responses/NotFound'
         "400":
           $ref: '#/components/responses/BadRequest'
         "200":

frontend/package.json

@@ -11,6 +11,7 @@
     "@sentry/browser": "^5.24.2",
     "@sentry/integrations": "^5.24.2",
     "@sentry/tracing": "^5.24.2",
+    "axios": "^0.20.0",
     "core-js": "^3.6.5",
     "tailwindcss": "^1.8.10",
     "vee-validate": "^3.3.11",

frontend/src/assets/auth/error.png

@@ -115,6 +115,22 @@
         @apply items-center;
     }
 
+    .auth-sub-container-error {
+        @apply bg-red-500;
+        @apply p-4;
+        @apply flex;
+        @apply justify-center;
+        @apply text-center;
+        @apply rounded-md;
+        @apply max-w-sm;
+        @apply w-full;
+    }
+
+    .auth-sub-container-error-message {
+        @apply text-white-matcha;
+        @apply text-xl;
+    }
+
     .auth-sub-container-content-heading {
         @apply text-base;
         @apply font-bold;
@@ -150,6 +166,10 @@
         @apply mt-4;
     }
 
+    .auth-sub-container-content-submit-button:active, .auth-sub-container-content-submit-button:focus {
+        outline: none;
+    }
+
     .auth-sub-container-content-button {
         @apply bg-purple-matcha;
         @apply w-full;

frontend/src/assets/auth/refresh.png

@@ -1,17 +1,18 @@
 import Vue from 'vue';
 import { ValidationProvider, ValidationObserver, extend } from 'vee-validate/dist/vee-validate.full.esm';
+import * as Sentry from '@sentry/browser';
+import { Vue as VueIntegration } from '@sentry/integrations';
+import { Integrations } from '@sentry/tracing';
+import http from './plugins/http';
+import errorMessenger from './plugins/errorMessenger';
 import App from './App.vue';
 import router from './router';
 import store from './store';
 import validPassword from './validators/validPassword';
 import './assets/css/tailwind.css';
 
-import * as Sentry from "@sentry/browser";
-import { Vue as VueIntegration } from "@sentry/integrations";
-import { Integrations } from "@sentry/tracing";
-
 Sentry.init({
-  dsn: "https://fc31e918801742e2b1e691067496e257@o450203.ingest.sentry.io/5434440",
+  dsn: 'https://fc31e918801742e2b1e691067496e257@o450203.ingest.sentry.io/5434440',
   integrations: [
     new VueIntegration({
       Vue,
@@ -28,6 +29,9 @@ extend('validPassword', validPassword);
 
 Vue.config.productionTip = false;
 
+Vue.use(http);
+Vue.use(errorMessenger);
+
 new Vue({
   router,
   store,

frontend/src/assets/auth/success.png

@@ -0,0 +1,12 @@
+import Vue from 'vue';
+
+export default {
+  install() {
+    Vue.prototype.$errorMessenger = (error) => {
+      if (error.response && error.response.status === 404) {
+        return 'Something went wrong on our end. We will fix it soon. Please, try again later';
+      }
+      return error.response.data.error.message;
+    };
+  },
+};

frontend/src/assets/css/tailwind.css

@@ -0,0 +1,20 @@
+import Axios from 'axios';
+import Vue from 'vue';
+
+function createAxiosInstance(baseURL) {
+  return Axios.create({
+    baseURL,
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${localStorage.token}`,
+    },
+  });
+}
+
+const axiosInstance = createAxiosInstance(process.env.VUE_APP_BACKEND_BASE_URL);
+
+export default {
+  install() {
+    Vue.prototype.$http = axiosInstance;
+  },
+};