owtf · viyatb · Aug 21, 2021 · Mar 24, 2021 · Apr 6, 2021 · Jun 9, 2021
diff --git a/docs/images/forgot_password.png b/docs/images/forgot_password.png
diff --git a/docs/images/login.png b/docs/images/login.png
diff --git a/docs/usage/authentication.rst b/docs/usage/authentication.rst
@@ -44,7 +44,7 @@ In case user forgets his password, he can follow the steps shown below to reset
 .. figure:: /images/forgot_password.png
     :align: center
 
-    Provide the email of the account for which you want to reset password
+    Provide the username/email of the account for which you want to reset password
 
 .. figure:: /images/otp_sent.png
     :align: center

diff --git a/owtf/api/handlers/auth.py b/owtf/api/handlers/auth.py
@@ -464,7 +464,7 @@ def post(self):
             response = {"status": "success", "message": "Otp Send Successful"}
             self.success(response)
         else:
-            err = {"status": "fail", "message": "Email/Username doesn't exist"}
+            err = {"status": "fail", "message": "Username / Email doesn't exist"}
             self.success(err)
 
 
@@ -510,7 +510,7 @@ def post(self):
             else:
                 self.success({"status": "fail", "message": "Invalid OTP"})
         else:
-            err = {"status": "fail", "message": "Email doesn't exist"}
+            err = {"status": "fail", "message": "Username / Email doesn't exist"}
             self.success(err)
 
 

diff --git a/owtf/api/handlers/config.py b/owtf/api/handlers/config.py
@@ -7,12 +7,10 @@
 from owtf.lib import exceptions
 from owtf.lib.exceptions import APIError
 from owtf.managers.config import get_all_config_dicts, update_config_val
-from owtf.api.handlers.jwtauth import jwtauth
 
 __all__ = ["ConfigurationHandler"]
 
 
-@jwtauth
 class ConfigurationHandler(APIRequestHandler):
     """Update framework settings and tool paths."""
 

diff --git a/owtf/models/user_login_token.py b/owtf/models/user_login_token.py
@@ -3,18 +3,19 @@
 ~~~~~~~~~~~~~~~~
 
 """
-from sqlalchemy import Column, Integer, String, ForeignKey, DateTime
+from sqlalchemy import Column, Integer, String, ForeignKey, DateTime, UniqueConstraint
 from owtf.db.model_base import Model
 import uuid
 from datetime import datetime, timedelta
 from owtf.settings import JWT_EXP_DELTA_SECONDS
+from owtf.models.user import User
 
 
 class UserLoginToken(Model):
     __tablename__ = "user_login_tokens"
 
     id = Column(Integer, primary_key=True, autoincrement=True)
-    user_id = Column(Integer, ForeignKey("users.id"))
+    user_id = Column(Integer, ForeignKey(User.id))
     token = Column(String, nullable=False)
 
     @classmethod

diff --git a/owtf/webapp/src/containers/Dashboard/GithubReport.js b/owtf/webapp/src/containers/Dashboard/GithubReport.js
@@ -48,7 +48,6 @@ export default class GithubReport extends React.Component {
 
   render() {
     const errorData = this.props.errors;
-    console.log("errorData", errorData);
     return (
       <Pane data-test="githubReportComponent">
         <Button

diff --git a/owtf/webapp/src/containers/Dashboard/__snapshots__/Dashboard.test.js.snap b/owtf/webapp/src/containers/Dashboard/__snapshots__/Dashboard.test.js.snap
@@ -208,7 +208,7 @@ exports[`Dashboard component Testing Worker panel component Testing worker compo
   >
     <img
       className="workerpanel-labelimg"
-      src="/static/b0ac8b98e2b251549cd044fe7d5d7edd.png"
+      src={Object {}}
     />
     <withTheme(Paragraph)
       margin={10}

diff --git a/owtf/webapp/src/containers/Dashboard/api.js b/owtf/webapp/src/containers/Dashboard/api.js
@@ -1,29 +1,40 @@
 import Request from "../../utils/request";
 import { API_BASE_URL } from "../../utils/constants";
 
-const options = {
-  headers: {
-    "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
-    Authorization: "Bearer " + localStorage.getItem("token")
-  }
-};
-
 export function getErrorsAPI() {
   const requestURL = `${API_BASE_URL}errors/`;
   // Call our request helper (see 'utils/request')
+  const options = {
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+      Authorization: "Bearer " + localStorage.getItem("token")
+    }
+  };
   const request = new Request(requestURL, options);
   return request.get.bind(request);
 }
 
 export function postErrorAPI() {
   const requestURL = `${API_BASE_URL}errors/`;
+  const options = {
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+      Authorization: "Bearer " + localStorage.getItem("token")
+    }
+  };
   const request = new Request(requestURL, options);
   return request.post.bind(request);
 }
 
 export function deleteErrorAPI(action) {
   const error_id = action.error_id.toString();
   const requestURL = `${API_BASE_URL}errors/${error_id}/`;
+  const options = {
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+      Authorization: "Bearer " + localStorage.getItem("token")
+    }
+  };
   const req_options = {
     responseAs: "text",
     ...options
@@ -35,13 +46,25 @@ export function deleteErrorAPI(action) {
 export function getSeverityAPI() {
   const requestURL = `${API_BASE_URL}dashboard/severitypanel/`;
   // Call our request helper (see 'utils/request')
+  const options = {
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+      Authorization: "Bearer " + localStorage.getItem("token")
+    }
+  };
   const request = new Request(requestURL, options);
   return request.get.bind(request);
 }
 
 export function getTargetSeverityAPI() {
   const requestURL = `${API_BASE_URL}targets/severitychart/`;
   // Call our request helper (see 'utils/request')
+  const options = {
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+      Authorization: "Bearer " + localStorage.getItem("token")
+    }
+  };
   const request = new Request(requestURL, options);
   return request.get.bind(request);
 }
diff --git a/owtf/webapp/src/containers/EmailVerification/api.js b/owtf/webapp/src/containers/EmailVerification/api.js
@@ -1,24 +1,20 @@
 import Request from "../../utils/request";
 import { API_BASE_URL } from "../../utils/constants";
 
+const options = {
+  headers: {
+    "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+  }
+};
+
 export function confirmEmailGenerateAPI() {
   const requestURL = `${API_BASE_URL}generate/confirm_email/`;
-  const options = {
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
-    }
-  };
   const request = new Request(requestURL, options);
   return request.post.bind(request);
 }
 
 export function verifyEmailGenerateAPI(link) {
   const requestURL = `${API_BASE_URL}verify/confirm_email/` + link;
-  const options = {
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
-    }
-  };
   const request = new Request(requestURL, options);
   return request.get.bind(request);
 }