Controlling TOTP Authetication

Throttling TOTP
Merge pull request #50 from xi/cleanup
2021-06-24 18:42:33 +03:00 · 2021-06-23 20:43:31 +03:00 · 2021-06-23 19:50:11 +03:00 · 2021-06-23 12:15:50 +02:00 · 2021-06-23 12:15:50 +02:00 · 2021-06-23 12:15:49 +02:00
75 changed files with 1646 additions and 1736 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -0,0 +1,13 @@
+on: [push]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: python
+      run: |
+        sudo apt-get install python3
+    - name: lint
+      run: |
+        pip install black
+        black --check --exclude migrations mfa/ example/ setup.py
--- a/.gitignore
+++ b/.gitignore
@@ -104,4 +104,3 @@ venv.bak/

 # mypy
 .mypy_cache/
-example/test_db
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,54 +1,12 @@
 # Change Log
-## 3.0 (Unreleased)
-* Updated to fido2==1.1.0
-* Removed: CBOR and exchange is done in JSON now
-* Added: the following settings 
-  * `MFA_FIDO2_RESIDENT_KEY`: Defaults to `Discouraged` which was the old behaviour
-  * `MFA_FIDO2_AUTHENTICATOR_ATTACHMENT`: If you like to have a PLATFORM Authenticator, Defaults to NONE
-  * `MFA_FIDO2_USER_VERIFICATION`:  If you need User Verification 
-  * `MFA_FIDO2_ATTESTATION_PREFERENCE`: If you like to have an Attention
-* Added: ConditionalUI support (check example)
-
-## 2.6.1
-* Fix: CVE-2022-42731: related to the possibility of registration replay attack.
-  Thanks to 'SSE (Secure Systems Engineering)'
-
-## 2.5.1
-* Fix: CVE-2022-42731: related to the possibility of registration replay attack.
-  Thanks to 'SSE (Secure Systems Engineering)' 
-
-## 2.6.0
-   * Adding Backup Recovery Codes (Recovery) as a method.
-     Thanks to @Spitfireap for work, and  @peterthomassen for guidance.
-   * Added: `RECOVERY_ITERATION` to set the number of iteration when hashing recovery token
-   * Added: `MFA_ENFORCE_RECOVERY_METHOD` to enforce the user to enroll in the recovery code method once, they add any other method,
-   * Added: `MFA_ALWAYS_GO_TO_LAST_METHOD` to the settings which redirects the user automatically to the last used method when logging in
-   * Added: `MFA_RENAME_METHODS` to be able to rename the methods for the user.
-   * Fix: Alot of CSS fixes for the example application
-
-## 2.5.0
-
-   * Fixed: issue in the 'Authorize' button don't show on Firefox and Chrome on iOS.
-     Note: It seems Firefox doesn't support WebAuthn on iOS
-   * Fixed: Support for bootstrap5
-     Thanks to @ezrajrice
-   * Upgraded to fido2==1.0.0
-  
-## 2.4.0
-
-   * Fixed: issue in the 'Authorize' button don't show on Safari Mobile.
-   * Upgrade to FIDO2 0.9.2, to fix issue with Windows 11.
-   * Fixed: Minor Typos.
-

 ## 2.3.0
-   * Fixed: A missing import Thanks @AndreasDickow
-   * Fixed: `MFA.html` now call `{{block.super}}` for head and content blocks, thanks @mnelson4
-   * Added: #55 introduced `mfa_base.html` which will be extended by `MFA.html` for better styling 
+   * Some code cleanup thanks to @xi
+   * Added: MFA_TOTP_FAILURE_WINDOW & MFA_TOTP_FAILURE_LIMIT

 ## 2.2.0
   * Added: MFA_REDIRECT_AFTER_REGISTRATION settings parameter
-   * Fixed: Deprecation error for NULBooleanField
+   * Fixed: Deprecation error for NullBooleanField

 ## 2.1.2
  * Fixed: Getting timestamp on Python 3.7 as ("%s") is raising an exception
--- a/EXAMPLE.md
+++ b/EXAMPLE.md
@@ -4,15 +4,5 @@
 `virtualenv venv`
 1. activate env `source venv/bin/activate`
 1. install requirements `pip install -r requirements.txt`
-1. cd to example project `cd example`
 1. migrate `python manage.py migrate`
-1. create super user `python manage.py createsuperuser`
-1. start the server `python manage.py runserver`
-
-# Notes for SSL
-
-To test FIDO2 you need to use HTTPS, after the above steps are done:
-
-1. stop the server
-1. install requirements `pip install -r example-ssl-requirements.txt`
-1. start the ssl server `python manage.py runsslserver`
+1. create super user 'python manage.py createsuperuser'
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # django-mfa2
-A Django app that handles MFA, it supports TOTP, U2F, FIDO2 U2F (Web Authn), Email Tokens , Trusted  Devices and backup codes.
+A Django app that handles MFA, it supports TOTP, U2F, FIDO2 U2F (Web Authn), Email Tokens , and Trusted Devices

-[![Works with PassKeys](https://github.com/mkalioby/django-mfa2/raw/master/img/Works%20with%20PassKeys-black.png)](https://fidoalliance.org/passkeys/)
+![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)
 ### Pip Stats
 [![PyPI version](https://badge.fury.io/py/django-mfa2.svg)](https://badge.fury.io/py/django-mfa2)
 [![Downloads Count](https://static.pepy.tech/personalized-badge/django-mfa2?period=total&units=international_system&left_color=black&right_color=green&left_text=Downloads)](https://pepy.tech/project/django-mfa2)
@@ -17,12 +17,10 @@ Web Authencation API (WebAuthn) is state-of-the art techology that is expected t

 For FIDO2, the following are supported
 * **security keys** (Firefox 60+, Chrome 67+, Edge 18+, Safari 13 on Mac OS, Chrome on Andriod, Safari on iOS 13.3+),
- * **Windows Hello** (Firefox 67+, Chrome 72+ , Edge),
+ * **Windows Hello** (Firefox 67+, Chrome 72+ , Edge) ,
 * **Apple's Touch ID/Face ID** (Chrome 70+ on Mac OS X, Safari on macOS Big Sur, Safari on iOS 14.0+ ),
 * **android-safetynet** (Chrome 70+, Firefox 68+)
 * **NFC devices using PCSC** (Not Tested, but as supported in fido2)
- * **Soft Tokens** 
-    * [krypt.co](https://krypt.co/): Login by a notification on your phone.

 In English :), It allows you to verify the user by security keys on PC, Laptops or Mobiles, Windows Hello (Fingerprint, PIN) on Windows 10 Build 1903+ (May 2019 Update) Touch/Face ID on Macbooks (Chrome, Safari), Touch/Face ID on iPhone and iPad and Fingerprint/Face/Iris/PIN on Android Phones.

@@ -39,7 +37,7 @@ Depends on
 * ua-parser
 * user-agents
 * python-jose
-* fido2==1.0.0
+* fido2==0.9.0

 # Installation
 1. using pip
@@ -63,13 +61,12 @@ Depends on
   'mfa',
   '......')
   ```
-2. Collect Static Files
+1. Collect Static Files
 `python manage.py collectstatic`
-3. Add the following settings to your file
+1. Add the following settings to your file

   ```python
-   from django.conf.global_settings import PASSWORD_HASHERS as DEFAULT_PASSWORD_HASHERS #Preferably at the same place where you import your other modules
-   MFA_UNALLOWED_METHODS=()   # Methods that shouldn't be allowed for the user e.g ('TOTP','U2F',)
+   MFA_UNALLOWED_METHODS=()   # Methods that shouldn't be allowed for the user
   MFA_LOGIN_CALLBACK=""      # A function that should be called by username to login the user in session
   MFA_RECHECK=True           # Allow random rechecking of the user
   MFA_REDIRECT_AFTER_REGISTRATION="mfa_home"   # Allows Changing the page after successful registeration
@@ -77,23 +74,17 @@ Depends on
   MFA_RECHECK_MIN=10         # Minimum interval in seconds
   MFA_RECHECK_MAX=30         # Maximum in seconds
   MFA_QUICKLOGIN=True        # Allow quick login for returning users by provide only their 2FA
-   MFA_ALWAYS_GO_TO_LAST_METHOD = False # Always redirect the user to the last method used to save a click (Added in 2.6.0).
-   MFA_RENAME_METHODS={} #Rename the methods in a more user-friendly way e.g {"RECOVERY":"Backup Codes"} (Added in 2.6.0)
   MFA_HIDE_DISABLE=('FIDO2',)     # Can the user disable his key (Added in 1.2.0).
   MFA_OWNED_BY_ENTERPRISE = FALSE  # Who owns security keys
-   PASSWORD_HASHERS = DEFAULT_PASSWORD_HASHERS # Comment if PASSWORD_HASHER already set in your settings.py
-   PASSWORD_HASHERS += ['mfa.recovery.Hash'] 
-   RECOVERY_ITERATION = 350000 #Number of iteration for recovery code, higher is more secure, but uses more resources for generation and check...

   TOKEN_ISSUER_NAME="PROJECT_NAME"      #TOTP Issuer name
+   MFA_TOTP_FAILURE_LIMIT = 3            # Allowed TOTP Failures / user
+   MFA_TOTP_FAILURE_WINDOW = 5           # The number of minutes to check failed logins against.
   
   U2F_APPID="https://localhost"    #URL For U2F
-   FIDO_SERVER_ID=u"localehost"      # Server rp id for FIDO2, it is the full domain of your project
+   FIDO_SERVER_ID=u"localehost"      # Server rp id for FIDO2, it the full domain of your project
   FIDO_SERVER_NAME=u"PROJECT_NAME"
-   MFA_FIDO2_RESIDENT_KEY = mfa.ResidentKey.DISCOURAGED  # Resident Key allows a special User Handle
-   MFA_FIDO2_AUTHENTICATOR_ATTACHMENT = None  # Let the user choose
-   MFA_FIDO2_USER_VERIFICATION = None         # Verify User Presence
-   MFA_FIDO2_ATTESTATION_PREFERENCE = mfa.AttestationPreference.NONE
+   FIDO_LOGIN_URL=BASE_URL
   ```
   **Method Names**
   * U2F
@@ -101,18 +92,15 @@ Depends on
   * TOTP
   * Trusted_Devices
   * Email
-   * RECOVERY

   **Notes**:
    * Starting version 1.1, ~~FIDO_LOGIN_URL~~ isn't required for FIDO2 anymore.
    * Starting version 1.7.0, Key owners can be specified.
    * Starting version 2.2.0
        * Added: `MFA_SUCCESS_REGISTRATION_MSG` & `MFA_REDIRECT_AFTER_REGISTRATION`
-    * Starting version 2.6.0
-        * Added: `MFA_ALWAYS_GO_TO_LAST_METHOD`, `MFA_RENAME_METHODS`, `MFA_ENFORCE_RECOVERY_METHOD` & `RECOVERY_ITERATION`
-    * Starting version 3.0
-        * Added: `MFA_FIDO2_RESIDENT_KEY`, `MFA_FIDO2_AUTHENTICATOR_ATTACHMENT`, `MFA_FIDO2_USER_VERIFICATION`, `MFA_FIDO2_ATTESTATION_PREFERENCE`
-4. Break your login function
+   * Starting version 2.3.0
+       * Added: `MFA_TOTP_FAILURE_LIMIT` & `MFA_TOTP_FAILURE_WINDOW`
+1. Break your login function

   Usually your login function will check for username and password, log the user in if the username and password are correct and create the user session, to support mfa, this has to change

@@ -122,75 +110,78 @@ Depends on
          * if user doesn't have mfa then call your function to create the user session

   ```python
+    from mfa.helpers import has_mfa
+
    def login(request):  # this function handles the login form POST
       user = auth.authenticate(username=username, password=password)
       if user is not None:  # if the user object exist
-            from mfa.helpers import has_mfa
-            res =  has_mfa(username = username,request=request) # has_mfa returns false or HttpResponseRedirect
+            res =  has_mfa(username=username, request=request)  # has_mfa returns false or HttpResponseRedirect
            if res:
                return res
-            return log_user_in(request,username=user.username) 
-            #log_user_in is a function that handles creatung user session, it should be in the setting file as MFA_CALLBACK
+            return log_user_in(request, username=user.username)
+            # log_user_in is a function that handles creating user session, it should be in the setting file as MFA_CALLBACK
     ```
-5. Add mfa to urls.py
+1. Add mfa to urls.py
   ```python
   import mfa
   import mfa.TrustedDevice
-   urls_patterns= [
+
+   urls_patterns = [
       '...',
       url(r'^mfa/', include('mfa.urls')),
       url(r'devices/add$', mfa.TrustedDevice.add,name="mfa_add_new_trusted_device"),  # This short link to add new trusted device
       '....',
   ]
   ```
-6. Provide `mfa_auth_base.html` in your templates with block called 'head' and 'content', The template will be included during the user login, the template shall be close to the login template.
+1. Provide `mfa_auth_base.html` in your templates with block called 'head' and 'content'
+    The template will be included during the user login.
    If you will use Email Token method, then you have to provide template named `mfa_email_token_template.html` that will content the format of the email with parameter named `user` and `otp`.
-7. To match the look and feel of your project, MFA includes `base.html` but it needs blocks named `head` & `content` to added its content to it.
-   **Note:** Starting v2.3.0, a new template `mfa_base.html` is introduced, this template is used by `MFA.html` so you can control the styling better and current `mfa_base.html` extends `base.html`
-8. Somewhere in your app, add a link to 'mfa_home'
+1. To match the look and feel of your project, MFA includes `base.html` but it needs blocks named `head` & `content` to added its content to it.
+1. Somewhere in your app, add a link to 'mfa_home'
 ```<li><a href="{% url 'mfa_home' %}">Security</a> </li>```

-
-For Example, See 'example' app and look at EXAMPLE.md to see how to set it up.
+For Example, See https://github.com/mkalioby/AutoDeploy/commit/5f1d94b1804e0aa33c79e9e8530ce849d9eb78cc in AutDeploy Project

 # Going Passwordless

 To be able to go passwordless for returning users, create a cookie  named 'base_username' containing username as shown in snippet below
 ```python
-    response = render(request, 'Dashboard.html', context))
-    if request.session.get("mfa",{}).get("verified",False)  and getattr(settings,"MFA_QUICKLOGIN",False):
-        if request.session["mfa"]["method"]!="Trusted Device":
-            response.set_cookie("base_username", request.user.username, path="/",max_age = 15*24*60*60)
-    return response
+response = render(request, 'Dashboard.html', context))
+if request.session.get("mfa", {}).get("verified", False) and getattr(settings, "MFA_QUICKLOGIN", False):
+    if request.session["mfa"]["method"] != "Trusted Device":
+        response.set_cookie("base_username", request.user.username, path="/", max_age=15 * 24 * 60 * 60)
+return response
 ```

 Second, update the GET part of your login view
 ```python
-    if "mfa" in settings.INSTALLED_APPS and getattr(settings,"MFA_QUICKLOGIN",False) and request.COOKIES.get('base_username'):
+from mfa.helpers import has_mfa
+
+if "mfa" in settings.INSTALLED_APPS and getattr(settings, "MFA_QUICKLOGIN", False) and request.COOKIES.get('base_username'):
    username=request.COOKIES.get('base_username')
-        from mfa.helpers import has_mfa
-        res =  has_mfa(username = username,request=request,)
-        if res: return res
-        ## continue and return the form.
+    res = has_mfa(username=username, request=request)
+    if res:
+        return res
+    # continue and return the form.
 ```
 # Checking MFA on Client Side

 Sometimes you like to verify that the user is still there so simple you can ask django-mfa2 to check that for you

 ```html
-    {% include 'mfa_check.html' %}
+{% include 'mfa_check.html' %}
 ```
 ````js
 function success_func() {
-  //logic if mfa check succeeds
+  // logic if mfa check succeeds
 }
 function fail_func() {
-  //logic if mfa check fails
+  // logic if mfa check fails
 }
 function some_func() {
-    recheck_mfa(success_func,fail_func,MUST_BE_MFA)
-    //MUST_BE_MFA true or false, if the user must has with MFA
-  }
+  recheck_mfa(success_func, fail_func, MUST_BE_MFA)
+  // MUST_BE_MFA true or false, if the user must has with MFA
+}

 ````

@@ -200,11 +191,6 @@ function some_func() {
 * [swainn](https://github.com/swainn)
 * [unramk](https://github.com/unramk)
 * [willingham](https://github.com/willingham)
-* [AndreasDickow](https://github.com/AndreasDickow)
-* [mnelson4](https://github.com/mnelson4)
-* [ezrajrice](https://github.com/ezrajrice)
-* [Spitfireap](https://github.com/Spitfireap)
-* [peterthomassen](https://github.com/peterthomassen)


 # Security contact information
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -48,7 +48,7 @@
    '....',
    ]
    ```
-1. Provide `mfa_auth_base.html` in your templaes with block called 'head' and 'content'
+1. Provide `mfa_auth_base.html` in your templates with block called 'head' and 'content'
    The template will be included during the user login.
    If you will use Email Token method, then you have to provide template named `mfa_email_token_template.html` that will content the format of the email with parameter named `user` and `otp`.
 1. To match the look and feel of your project, MFA includes `base.html` but it needs blocks named `head` & `content` to added its content to it.
--- a/example/example-ssl-requirements.txt
+++ b/example/example-ssl-requirements.txt
@@ -1 +0,0 @@
-django-sslserver
--- a/example/example/auth.py
+++ b/example/example/auth.py
@@ -1,30 +1,36 @@
-from django.shortcuts import render
-from django.http import HttpResponseRedirect
-from django.urls import reverse
-from django.contrib.auth import authenticate,login,logout
+from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.models import User
+from django.http import HttpResponseRedirect
+from django.shortcuts import render
+from django.urls import reverse
+
+from mfa.helpers import has_mfa
+
+
 def loginView(request):
-    context={}
-    if request.method=="POST":
-        username=request.POST["username"]
-        password=request.POST["password"]
-        user=authenticate(username=username,password=password)
+    context = {}
+    if request.method == "POST":
+        username = request.POST["username"]
+        password = request.POST["password"]
+        user = authenticate(username=username, password=password)
        if user:
-            from mfa.helpers import has_mfa
-            res = has_mfa(username = username, request = request)  # has_mfa returns false or HttpResponseRedirect
+            res = has_mfa(
+                username=username, request=request
+            )  # has_mfa returns false or HttpResponseRedirect
            if res:
                return res
-            return create_session(request,user.username)
-        context["invalid"]=True
+            return create_session(request, user.username)
+        context["invalid"] = True
    return render(request, "login.html", context)

-def create_session(request,username):
-    user=User.objects.get(username=username)
-    user.backend='django.contrib.auth.backends.ModelBackend'
+
+def create_session(request, username):
+    user = User.objects.get(username=username)
+    user.backend = "django.contrib.auth.backends.ModelBackend"
    login(request, user)
-    return HttpResponseRedirect(reverse('home'))
+    return HttpResponseRedirect(reverse("home"))


 def logoutView(request):
    logout(request)
-    return  render(request,"logout.html",{})
+    return render(request, "logout.html", {})
--- a/example/example/settings.py
+++ b/example/example/settings.py
@@ -11,9 +11,6 @@ https://docs.djangoproject.com/en/2.0/ref/settings/
 """

 import os
-from django.conf.global_settings import PASSWORD_HASHERS as DEFAULT_PASSWORD_HASHERS
-
-import mfa

 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -23,65 +20,65 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 # See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/

 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '#9)q!_i3@pr-^3oda(e^3$x!kq3b4f33#5l@+=+&vuz+p6gb3g'
+SECRET_KEY = "#9)q!_i3@pr-^3oda(e^3$x!kq3b4f33#5l@+=+&vuz+p6gb3g"

 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True

-ALLOWED_HOSTS = ['*']
+ALLOWED_HOSTS = []


 # Application definition

 INSTALLED_APPS = [
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'mfa',
-    'sslserver'
+    "django.contrib.admin",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.messages",
+    "django.contrib.staticfiles",
+    "mfa",
+    "sslserver",
 ]

 MIDDLEWARE = [
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    "django.middleware.security.SecurityMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]

-ROOT_URLCONF = 'example.urls'
+ROOT_URLCONF = "example.urls"

 TEMPLATES = [
    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [os.path.join(BASE_DIR ,'example','templates' )],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [os.path.join(BASE_DIR, "example", "templates")],
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.contrib.messages.context_processors.messages",
            ],
        },
    },
 ]

-WSGI_APPLICATION = 'example.wsgi.application'
+WSGI_APPLICATION = "example.wsgi.application"


 # Database
 # https://docs.djangoproject.com/en/2.0/ref/settings/#databases

 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'test_db',
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3",
+        "NAME": "test_db",
    }
 }

@@ -89,28 +86,28 @@ DATABASES = {
 # Password validation
 # https://docs.djangoproject.com/en/2.0/ref/settings/#auth-password-validators

-AUTH_PASSWORD_VALIDATORS = [
-    {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    },
-]
+# AUTH_PASSWORD_VALIDATORS = [
+#     {
+#         "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
+#     },
+#     {
+#         "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
+#     },
+#     {
+#         "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
+#     },
+#     {
+#         "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
+#     },
+# ]


 # Internationalization
 # https://docs.djangoproject.com/en/2.0/topics/i18n/

-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = "en-us"

-TIME_ZONE = 'UTC'
+TIME_ZONE = "UTC"

 USE_I18N = True

@@ -122,41 +119,33 @@ USE_TZ = True
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/2.0/howto/static-files/

-STATIC_URL = '/static/'
-#STATIC_ROOT=(os.path.join(BASE_DIR,'static'))
-STATICFILES_DIRS=[os.path.join(BASE_DIR,'static')]
-LOGIN_URL="/auth/login"
+STATIC_URL = "/static/"
+# STATIC_ROOT=(os.path.join(BASE_DIR,'static'))
+STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]
+LOGIN_URL = "/auth/login"

-EMAIL_FROM='Test App'
-EMAIL_HOST="smtp.gmail.com"
-EMAIL_PORT=587
-EMAIL_HOST_USER=""
-EMAIL_HOST_PASSWORD=''
-EMAIL_USE_TLS=True
+EMAIL_FROM = "Test App"
+EMAIL_HOST = "smtp.gmail.com"
+EMAIL_PORT = 587
+EMAIL_HOST_USER = ""
+EMAIL_HOST_PASSWORD = ""
+EMAIL_USE_TLS = True


+MFA_UNALLOWED_METHODS = ()  # Methods that shouldn't be allowed for the user
+MFA_LOGIN_CALLBACK = "example.auth.create_session"  # A function that should be called by username to login the user in session
+MFA_RECHECK = True  # Allow random rechecking of the user
+MFA_RECHECK_MIN = 10  # Minimum interval in seconds
+MFA_RECHECK_MAX = 30  # Maximum in seconds
+MFA_QUICKLOGIN = True  # Allow quick login for returning users by provide only their 2FA
+MFA_HIDE_DISABLE = ("",)  # Can the user disable his key (Added in 1.2.0).
+MFA_REDIRECT_AFTER_REGISTRATION = "registered"
+MFA_SUCCESS_REGISTRATION_MSG = "Go to Home"

-MFA_UNALLOWED_METHODS=()   # Methods that shouldn't be allowed for the user
-MFA_LOGIN_CALLBACK="example.auth.create_session"      # A function that should be called by username to login the user in session
-MFA_RECHECK=True           # Allow random rechecking of the user
-MFA_RECHECK_MIN=10         # Minimum interval in seconds
-MFA_RECHECK_MAX=30         # Maximum in seconds
-MFA_QUICKLOGIN=True        # Allow quick login for returning users by provide only their 2FA
-MFA_HIDE_DISABLE=('',)     # Can the user disable his key (Added in 1.2.0).
-MFA_REDIRECT_AFTER_REGISTRATION="registered"
-MFA_SUCCESS_REGISTRATION_MSG="Go to Home"
-MFA_ALWAYS_GO_TO_LAST_METHOD = True
-MFA_ENFORCE_RECOVERY_METHOD = True
-MFA_FIDO2_RESIDENT_KEY = mfa.ResidentKey.REQUIRED  # Resident Key allows a special User Handle
-MFA_FIDO2_AUTHENTICATOR_ATTACHMENT = None  # Let the user choose
-MFA_FIDO2_USER_VERIFICATION = None         # Verify User Presence
-MFA_FIDO2_ATTESTATION_PREFERENCE = mfa.AttestationPreference.NONE
-MFA_RENAME_METHODS = {"RECOVERY":"Backup Codes","FIDO2":"Biometric Authentication"}
-PASSWORD_HASHERS = DEFAULT_PASSWORD_HASHERS #Comment if PASSWORD_HASHER already set
-PASSWORD_HASHERS += ['mfa.recovery.Hash']
-RECOVERY_ITERATION = 1 #Number of iteration for recovery code, higher is more secure, but uses more resources for generation and check...
-TOKEN_ISSUER_NAME="PROJECT_NAME"      #TOTP Issuer name
+TOKEN_ISSUER_NAME = "PROJECT_NAME"  # TOTP Issuer name

-U2F_APPID="https://localhost:9000"    #URL For U2F
-FIDO_SERVER_ID="localhost"      # Server rp id for FIDO2, it the full domain of your project
-FIDO_SERVER_NAME="TestApp"
+U2F_APPID = "https://localhost"  # URL For U2F
+FIDO_SERVER_ID = (
+    u"localhost"  # Server rp id for FIDO2, it the full domain of your project
+)
+FIDO_SERVER_NAME = u"PROJECT_NAME"
--- a/example/example/templates/base.html
+++ b/example/example/templates/base.html
@@ -10,7 +10,7 @@
  <meta name="description" content="">
  <meta name="author" content="">

-  <title>Django-mfa2 Example</title>
+  <title>SB Admin - Blank Page</title>

  <!-- Custom fonts for this template-->
  <link href="{% static 'vendor/fontawesome-free/css/all.min.css'%}" rel="stylesheet" type="text/css">
@@ -36,7 +36,7 @@

    <!-- Navbar Search -->
    <form class="d-none d-md-inline-block form-inline ml-auto mr-0 mr-md-3 my-2 my-md-0">
-      <div class="input-group mb-3">
+      <div class="input-group">
        <input type="text" class="form-control" placeholder="Search for..." aria-label="Search" aria-describedby="basic-addon2">
        <div class="input-group-append">
          <button class="btn btn-primary" type="button">
--- a/example/example/templates/blank.html
+++ b/example/example/templates/blank.html
@@ -34,7 +34,7 @@

    <!-- Navbar Search -->
    <form class="d-none d-md-inline-block form-inline ml-auto mr-0 mr-md-3 my-2 my-md-0">
-      <div class="input-group mb-3">
+      <div class="input-group">
        <input type="text" class="form-control" placeholder="Search for..." aria-label="Search" aria-describedby="basic-addon2">
        <div class="input-group-append">
          <button class="btn btn-primary" type="button">
--- a/example/example/templates/login.html
+++ b/example/example/templates/login.html
@@ -44,9 +44,7 @@
            </div>
          </div>

-          <button class="btn btn-primary btn-block" type="submit">Login</button><br/>
-
-            <button class="btn btn-primary btn-block" type="button" onclick="authen()">Login By Security Key</button>
+          <button class="btn btn-primary btn-block" type="submit">Login</button>
        </form>
      </div>
    </div>
@@ -58,7 +56,7 @@

  <!-- Core plugin JavaScript-->
  <script src="{% static 'vendor/jquery-easing/jquery.easing.min.js'%}"></script>
-    {% include 'FIDO2/Auth_JS.html'%}
+
 </body>

 </html>
--- a/example/example/templates/mfa_auth_base.html
+++ b/example/example/templates/mfa_auth_base.html
@@ -28,7 +28,6 @@
      <div class="card-header">Login</div>
      <div class="card-body">
    {% block content %}
-
  {% endblock %}
  </div>
   </div>
--- a/example/example/urls.py
+++ b/example/example/urls.py
@@ -14,14 +14,15 @@ Including another URLconf
    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.urls import path,re_path,include
-from . import views,auth
-urlpatterns = [
-    path('admin/', admin.site.urls),
-    path('mfa/', include('mfa.urls')),
-    path('auth/login',auth.loginView,name="login"),
-    path('auth/logout',auth.logoutView,name="logout"),
+from django.urls import include, path

-    re_path('^$',views.home,name='home'),
-    path('registered/',views.registered,name='registered')
+from . import auth, views
+
+urlpatterns = [
+    path("admin/", admin.site.urls),
+    path("mfa/", include("mfa.urls")),
+    path("auth/login/", auth.loginView, name="login"),
+    path("auth/logout/", auth.logoutView, name="logout"),
+    path("", views.home, name="home"),
+    path("registered/", views.registered, name="registered"),
 ]
--- a/example/example/views.py
+++ b/example/example/views.py
@@ -1,11 +1,12 @@
-from django.shortcuts import render
 from django.contrib.auth.decorators import login_required
+from django.shortcuts import render


@login_required()
 def home(request):
-    return render(request,"home.html",{})
+    return render(request, "home.html", {})
+

@login_required()
 def registered(request):
-    return render(request,"home.html",{"registered":True})
+    return render(request, "home.html", {"registered": True})
--- a/example/requiremnts.txt
+++ b/example/requiremnts.txt
@@ -0,0 +1,2 @@
+django >= 2.2
+django_ssl
--- a/PassKeys-black.png
+++ b/PassKeys-black.png
--- a/mfa/ApproveLogin.py
+++ b/mfa/ApproveLogin.py
--- a/mfa/Common.py
+++ b/mfa/Common.py
@@ -1,19 +1,22 @@
 from django.conf import settings
 from django.core.mail import EmailMessage
-try:
-    from django.urls import reverse
-except:
-    from django.core.urlresolver import reverse
+from django.urls import reverse

-def send(to,subject,body):
+
+def send(to, subject, body):
    from_email_address = settings.EMAIL_HOST_USER
-    if '@' not in from_email_address:
+    if "@" not in from_email_address:
        from_email_address = settings.DEFAULT_FROM_EMAIL
    From = "%s <%s>" % (settings.EMAIL_FROM, from_email_address)
-    email = EmailMessage(subject,body,From,to)
+    email = EmailMessage(subject, body, From, to)
    email.content_subtype = "html"
    return email.send(False)

+
 def get_redirect_url():
-    return {"redirect_html": reverse(getattr(settings, 'MFA_REDIRECT_AFTER_REGISTRATION', 'mfa_home')),
-            "reg_success_msg":getattr(settings,"MFA_SUCCESS_REGISTRATION_MSG")}
+    return {
+        "redirect_html": reverse(
+            getattr(settings, "MFA_REDIRECT_AFTER_REGISTRATION", "mfa_home")
+        ),
+        "reg_success_msg": getattr(settings, "MFA_SUCCESS_REGISTRATION_MSG"),
+    }
--- a/mfa/Email.py
+++ b/mfa/Email.py
@@ -1,72 +1,90 @@
-from django.shortcuts import render
-from django.views.decorators.cache import never_cache
-from django.template.context_processors import csrf
-import datetime,random
+import datetime
+import random
 from random import randint
-from .models import *
-#from django.template.context import RequestContext
-from .views import login
-from .Common import send

-def sendEmail(request,username,secret):
+from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.http import HttpResponseRedirect
+from django.shortcuts import render
+from django.template.context_processors import csrf
+from django.urls import reverse
+from django.utils import timezone
+from django.views.decorators.cache import never_cache
+
+from .Common import send
+from .models import UserKey
+from .views import login
+
+
+def send_email(request, username, secret):
    """Send Email to the user after rendering `mfa_email_token_template`"""
-    from django.contrib.auth import get_user_model
    User = get_user_model()
-    key = getattr(User, 'USERNAME_FIELD', 'username')
+    key = getattr(User, "USERNAME_FIELD", "username")
    kwargs = {key: username}
    user = User.objects.get(**kwargs)
-    res=render(request,"mfa_email_token_template.html",{"request":request,"user":user,'otp':secret})
-    return send([user.email],"OTP", res.content.decode())
+    res = render(
+        request,
+        "mfa_email_token_template.html",
+        {"request": request, "user": user, "otp": secret},
+    )
+    return send([user.email], "OTP", res.content.decode())
+

@never_cache
 def start(request):
    """Start adding email as a 2nd factor"""
    context = csrf(request)
    if request.method == "POST":
-        if request.session["email_secret"] == request.POST["otp"]:  #if successful
-            uk=User_Keys()
-            uk.username=request.user.username
-            uk.key_type="Email"
-            uk.enabled=1
+        if request.session["email_secret"] == request.POST["otp"]:  # if successful
+            uk = UserKey()
+            uk.username = request.user.username
+            uk.key_type = "Email"
+            uk.enabled = 1
            uk.save()
-            from django.http import HttpResponseRedirect
-            try:
-                from django.core.urlresolvers import reverse
-            except:
-                from django.urls import reverse
-            if getattr(settings, 'MFA_ENFORCE_RECOVERY_METHOD', False) and not User_Keys.objects.filter(
-                    key_type="RECOVERY", username=request.user.username).exists():
-                request.session["mfa_reg"] = {"method": "Email",
-                                              "name": getattr(settings, "MFA_RENAME_METHODS", {}).get("Email", "Email")}
-            else:
-                return HttpResponseRedirect(reverse(getattr(settings,'MFA_REDIRECT_AFTER_REGISTRATION','mfa_home')))
+            return HttpResponseRedirect(
+                reverse(
+                    getattr(settings, "MFA_REDIRECT_AFTER_REGISTRATION", "mfa_home")
+                )
+            )
        context["invalid"] = True
    else:
-        request.session["email_secret"] = str(randint(0,100000))  #generate a random integer
-
-        if sendEmail(request, request.user.username, request.session["email_secret"]):
+        request.session["email_secret"] = str(
+            randint(0, 100000)
+        )  # generate a random integer
+        if send_email(request, request.user.username, request.session["email_secret"]):
            context["sent"] = True
-    return render(request,"Email/Add.html", context)
+    return render(request, "Email/Add.html", context)
+
+
@never_cache
 def auth(request):
    """Authenticating the user by email."""
-    context=csrf(request)
-    if request.method=="POST":
-        if request.session["email_secret"]==request.POST["otp"].strip():
-            uk = User_Keys.objects.get(username=request.session["base_username"], key_type="Email")
-            mfa = {"verified": True, "method": "Email","id":uk.id}
+    context = csrf(request)
+    if request.method == "POST":
+        if request.session["email_secret"] == request.POST["otp"].strip():
+            uk = UserKey.objects.get(
+                username=request.session["base_username"], key_type="Email"
+            )
+            mfa = {"verified": True, "method": "Email", "id": uk.id}
            if getattr(settings, "MFA_RECHECK", False):
-                mfa["next_check"] = datetime.datetime.timestamp(datetime.datetime.now() + datetime.timedelta(
-                    seconds = random.randint(settings.MFA_RECHECK_MIN, settings.MFA_RECHECK_MAX)))
+                mfa["next_check"] = datetime.datetime.timestamp(
+                    datetime.datetime.now()
+                    + datetime.timedelta(
+                        seconds=random.randint(
+                            settings.MFA_RECHECK_MIN, settings.MFA_RECHECK_MAX
+                        )
+                    )
+                )
            request.session["mfa"] = mfa

-            from django.utils import timezone
-            uk.last_used=timezone.now()
+            uk.last_used = timezone.now()
            uk.save()
            return login(request)
-        context["invalid"]=True
+        context["invalid"] = True
    else:
        request.session["email_secret"] = str(randint(0, 100000))
-        if sendEmail(request, request.session["base_username"], request.session["email_secret"]):
+        if send_email(
+            request, request.session["base_username"], request.session["email_secret"]
+        ):
            context["sent"] = True
-    return render(request,"Email/Auth.html", context)
+    return render(request, "Email/Auth.html", context)
--- a/mfa/FIDO2.py
+++ b/mfa/FIDO2.py
@@ -1,29 +1,25 @@
-from fido2.client import Fido2Client
-from fido2.server import Fido2Server, PublicKeyCredentialRpEntity
-from fido2.webauthn import AttestationObject, AuthenticatorData, CollectedClientData, RegistrationResponse
-from django.template.context_processors import csrf
-from django.views.decorators.csrf import csrf_exempt
-from django.shortcuts import render
-# from django.template.context import RequestContext
-import simplejson
-from fido2 import cbor
-from django.http import HttpResponse
-from django.conf import settings
-from .models import *
-from fido2.utils import websafe_decode, websafe_encode
-from fido2.webauthn import AttestedCredentialData
-from .views import login, reset_cookie
 import datetime
-from .Common import get_redirect_url
-from django.utils import timezone
-import fido2.features
-from django.http import JsonResponse
+import random
+import time
+import traceback
+
+from django.conf import settings
+from django.http import HttpResponse, JsonResponse
+from django.shortcuts import render
+from django.template.context_processors import csrf
+from django.utils import timezone
+from django.views.decorators.csrf import csrf_exempt
+from fido2 import cbor
+from fido2.client import ClientData
+from fido2.ctap2 import AttestationObject, AttestedCredentialData, AuthenticatorData
+from fido2.server import Fido2Server, PublicKeyCredentialRpEntity
+from fido2.utils import websafe_decode, websafe_encode
+
+from .Common import get_redirect_url
+from .models import UserKey
+from .views import login, reset_cookie
+

-def enable_json_mapping():
-    try:
-        fido2.features.webauthn_json_mapping.enabled = True
-    except:
-        pass
 def recheck(request):
    """Starts FIDO2 recheck"""
    context = csrf(request)
@@ -32,84 +28,74 @@ def recheck(request):
    return render(request, "FIDO2/recheck.html", context)


-def getServer():
+def get_server():
    """Get Server Info from settings and returns a Fido2Server"""
-    from mfa import AttestationPreference
-    rp = PublicKeyCredentialRpEntity(id=settings.FIDO_SERVER_ID, name=settings.FIDO_SERVER_NAME)
-    attestation= getattr(settings,'MFA_FIDO2_ATTESTATION_PREFERENCE', AttestationPreference.NONE )
-    return Fido2Server(rp,attestation=attestation)
+    rp = PublicKeyCredentialRpEntity(settings.FIDO_SERVER_ID, settings.FIDO_SERVER_NAME)
+    return Fido2Server(rp)


 def begin_registeration(request):
    """Starts registering a new FIDO Device, called from API"""
-    enable_json_mapping()
-    server = getServer()
-    from mfa import ResidentKey
-    resident_key = getattr(settings,'MFA_FIDO2_RESIDENT_KEY', ResidentKey.DISCOURAGED)
-    auth_attachment = getattr(settings,'MFA_FIDO2_AUTHENTICATOR_ATTACHMENT', None)
-    user_verification = getattr(settings,'MFA_FIDO2_USER_VERIFICATION', None)
-    registration_data, state = server.register_begin({
-        u'id': request.user.username.encode("utf8"),
-        u'name': request.user.username,
-        u'displayName': request.user.username,
-    }, getUserCredentials(request.user.username),user_verification = user_verification,
-        resident_key_requirement = resident_key, authenticator_attachment = auth_attachment)
-    request.session['fido2_state'] = state
-    return JsonResponse(dict(registration_data))
-    #return HttpResponse(cbor.encode(registration_data), content_type = 'application/octet-stream')
+    server = get_server()
+    registration_data, state = server.register_begin(
+        {
+            u"id": request.user.username.encode("utf8"),
+            u"name": (request.user.first_name + " " + request.user.last_name),
+            u"displayName": request.user.username,
+        },
+        get_user_credentials(request.user.username),
+    )
+    request.session["fido_state"] = state
+
+    return HttpResponse(
+        cbor.encode(registration_data), content_type="application/octet-stream"
+    )


@csrf_exempt
 def complete_reg(request):
    """Completes the registeration, called by API"""
    try:
-        if not "fido2_state" in request.session:
-            return JsonResponse({'status': 'ERR', "message": "FIDO Status can't be found, please try again"})
-        enable_json_mapping()
-        data = simplejson.loads(request.body)
-        server = getServer()
-        auth_data = server.register_complete(request.session["fido2_state"], response = data)
-        registration = RegistrationResponse.from_dict(data)
-        attestation_object = registration.response.attestation_object
-        #auth_data = attestation_object.auth_data
-        att_obj = attestation_object
+        data = cbor.decode(request.body)

+        client_data = ClientData(data["clientDataJSON"])
+        att_obj = AttestationObject((data["attestationObject"]))
+        server = get_server()
+        auth_data = server.register_complete(
+            request.session["fido_state"], client_data, att_obj
+        )
        encoded = websafe_encode(auth_data.credential_data)
-        uk = User_Keys()
+        uk = UserKey()
        uk.username = request.user.username
-        uk.properties = {"device": encoded, "type": att_obj.fmt, }
+        uk.properties = {
+            "device": encoded,
+            "type": att_obj.fmt,
+        }
        uk.owned_by_enterprise = getattr(settings, "MFA_OWNED_BY_ENTERPRISE", False)
        uk.key_type = "FIDO2"
-        if auth_data.credential_data.credential_id:
-            uk.user_handle = auth_data.credential_data.credential_id
        uk.save()
-        if getattr(settings, 'MFA_ENFORCE_RECOVERY_METHOD', False) and not User_Keys.objects.filter(key_type = "RECOVERY", username=request.user.username).exists():
-            request.session["mfa_reg"] = {"method":"FIDO2","name": getattr(settings, "MFA_RENAME_METHODS", {}).get("FIDO2", "FIDO2")}
-            return HttpResponse(simplejson.dumps({'status': 'RECOVERY'}))
-        else:
-            return HttpResponse(simplejson.dumps({'status': 'OK'}))
+        return JsonResponse({"status": "OK"})
    except Exception as exp:
-        import traceback
        print(traceback.format_exc())
-        try:
-            from raven.contrib.django.raven_compat.models import client
-            client.captureException()
-        except:
-            pass
-        return JsonResponse({'status': 'ERR', "message": "Error on server, please try again later"})
+        return JsonResponse(
+            {"status": "ERR", "message": "Error on server, please try again later"}
+        )


 def start(request):
-    """Start Registration a new FIDO Token"""
+    """Start Registeration a new FIDO Token"""
    context = csrf(request)
    context.update(get_redirect_url())
-    context["method"] = {"name":getattr(settings,"MFA_RENAME_METHODS",{}).get("FIDO2","FIDO2 Security Key")}
-    context["RECOVERY_METHOD"]=getattr(settings,"MFA_RENAME_METHODS",{}).get("RECOVERY","Recovery codes")
    return render(request, "FIDO2/Add.html", context)


-def getUserCredentials(username):
-    return [AttestedCredentialData(websafe_decode(uk.properties["device"])) for uk in User_Keys.objects.filter(username = username, key_type = "FIDO2")]
+def get_user_credentials(username):
+    credentials = []
+    for uk in UserKey.objects.filter(username=username, key_type="FIDO2"):
+        credentials.append(
+            AttestedCredentialData(websafe_decode(uk.properties["device"]))
+        )
+    return credentials


 def auth(request):
@@ -118,99 +104,84 @@ def auth(request):


 def authenticate_begin(request):
-    enable_json_mapping()
-    server = getServer()
-    credentials=[]
-    username = None
-    if "base_username" in request.session:
-        username = request.session["base_username"]
-    if request.user.is_authenticated:
-        username = request.user.username
-    if username:
-        credentials = getUserCredentials(request.session.get("base_username", request.user.username))
+    server = get_server()
+    credentials = get_user_credentials(
+        request.session.get("base_username", request.user.username)
+    )
    auth_data, state = server.authenticate_begin(credentials)
-    request.session['fido2_state'] = state
-    return JsonResponse(dict(auth_data))
+    request.session["fido_state"] = state
+    return HttpResponse(cbor.encode(auth_data), content_type="application/octet-stream")


@csrf_exempt
 def authenticate_complete(request):
    try:
-        enable_json_mapping()
        credentials = []
-        username = None
-        keys = None
-        if "base_username" in request.session:
-            username = request.session["base_username"]
-        if request.user.is_authenticated:
-            username = request.user.username
-        server = getServer()
-        data = simplejson.loads(request.body)
-        userHandle = data.get("response",{}).get('userHandle')
-        credential_id = data['id']
-
-        if userHandle:
-            if User_Keys.objects.filter(username=userHandle).exists():
-                credentials = getUserCredentials(userHandle)
-                username=userHandle
-            else:
-                keys = User_Keys.objects.filter(user_handle = userHandle)
-                if keys.exists():
-                    credentials = [AttestedCredentialData(websafe_decode(keys[0].properties["device"]))]
-        elif credential_id and username is None:
-            keys = User_Keys.objects.filter(user_handle = credential_id)
-            if keys.exists():
-                credentials=[AttestedCredentialData(websafe_decode(keys[0].properties["device"]))]
-        else:
-            credentials = getUserCredentials(username)
-
+        username = request.session.get("base_username", request.user.username)
+        server = get_server()
+        credentials = get_user_credentials(username)
+        data = cbor.decode(request.body)
+        credential_id = data["credentialId"]
+        client_data = ClientData(data["clientDataJSON"])
+        auth_data = AuthenticatorData(data["authenticatorData"])
+        signature = data["signature"]
        try:
            cred = server.authenticate_complete(
-                    request.session.pop('fido2_state'), credentials = credentials, response = data
+                request.session.pop("fido_state"),
+                credentials,
+                credential_id,
+                client_data,
+                auth_data,
+                signature,
            )
        except ValueError:
-            return HttpResponse(simplejson.dumps({'status': "ERR",
-                                                  "message": "Wrong challenge received, make sure that this is your security and try again."}),
-                                content_type = "application/json")
+            return JsonResponse(
+                {
+                    "status": "ERR",
+                    "message": "Wrong challenge received, make sure that this is your security and try again.",
+                }
+            )
        except Exception as excep:
-            try:
-                from raven.contrib.django.raven_compat.models import client
-                client.captureException()
-            except:
-                pass
-            return HttpResponse(simplejson.dumps({'status': "ERR",
-                                                  "message": str(excep)}),
-                                content_type = "application/json")
+            print(traceback.format_exc())
+            return JsonResponse({"status": "ERR", "message": excep.message})

        if request.session.get("mfa_recheck", False):
-            import time
            request.session["mfa"]["rechecked_at"] = time.time()
-            return HttpResponse(simplejson.dumps({'status': "OK"}),
-                                content_type = "application/json")
+            return JsonResponse({"status": "OK"})
        else:
-            import random
-            if keys is None:
-                keys = User_Keys.objects.filter(username = username, key_type = "FIDO2", enabled = 1)
+            keys = UserKey.objects.filter(
+                username=username, key_type="FIDO2", enabled=1
+            )
            for k in keys:
-                if AttestedCredentialData(websafe_decode(k.properties["device"])).credential_id == cred.credential_id:
+                if (
+                    AttestedCredentialData(
+                        websafe_decode(k.properties["device"])
+                    ).credential_id
+                    == cred.credential_id
+                ):
                    k.last_used = timezone.now()
                    k.save()
-                    mfa = {"verified": True, "method": "FIDO2", 'id': k.id}
+                    mfa = {"verified": True, "method": "FIDO2", "id": k.id}
                    if getattr(settings, "MFA_RECHECK", False):
-                        mfa["next_check"] = datetime.datetime.timestamp((datetime.datetime.now() + datetime.timedelta(
-                            seconds = random.randint(settings.MFA_RECHECK_MIN, settings.MFA_RECHECK_MAX))))
+                        mfa["next_check"] = datetime.datetime.timestamp(
+                            (
+                                datetime.datetime.now()
+                                + datetime.timedelta(
+                                    seconds=random.randint(
+                                        settings.MFA_RECHECK_MIN,
+                                        settings.MFA_RECHECK_MAX,
+                                    )
+                                )
+                            )
+                        )
                    request.session["mfa"] = mfa
-                    try:
-                        authenticated = request.user.is_authenticated
-                    except:
-                        authenticated = request.user.is_authenticated()
-                    if not authenticated:
-                        res = login(request,k.username)
-                        if not "location" in res: return reset_cookie(request)
-                        return HttpResponse(simplejson.dumps({'status': "OK", "redirect": res["location"]}),
-                                            content_type = "application/json")
-                    return HttpResponse(simplejson.dumps({'status': "OK"}),
-                                        content_type = "application/json")
+                    if not request.user.is_authenticated:
+                        res = login(request)
+                        if "location" not in res:
+                            return reset_cookie(request)
+                        return JsonResponse(
+                            {"status": "OK", "redirect": res["location"]}
+                        )
+                    return JsonResponse({"status": "OK"})
    except Exception as exp:
-        return HttpResponse(simplejson.dumps({'status': "ERR", "message": exp.message}),
-                            content_type = "application/json")
+        return JsonResponse({"status": "ERR", "message": str(exp)})
--- a/mfa/TrustedDevice.py
+++ b/mfa/TrustedDevice.py
@@ -1,134 +1,162 @@
-import string
 import random
-from django.shortcuts import render
-from django.http import HttpResponse
-from django.template.context import RequestContext
-from django.template.context_processors import csrf
-from .models import *
+import string
+from datetime import datetime, timedelta
+
 import user_agents
+from django.conf import settings
+from django.http import HttpResponse
+from django.shortcuts import render
+from django.template.context_processors import csrf
 from django.utils import timezone
+from jose import jwt
+
+from .Common import send
+from .models import UserKey
+

 def id_generator(size=6, chars=string.ascii_uppercase + string.digits):
-    x=''.join(random.choice(chars) for _ in range(size))
-    if not User_Keys.objects.filter(properties__shas="$.key="+x).exists(): return x
-    else: return id_generator(size,chars)
+    x = "".join(random.choice(chars) for _ in range(size))
+    if not UserKey.objects.filter(properties__shas="$.key=" + x).exists():
+        return x
+    else:
+        return id_generator(size, chars)

-def getUserAgent(request):
-    id=id=request.session.get("td_id",None)
+
+def get_user_agent(request):
+    id = id = request.session.get("td_id", None)
    if id:
-        tk=User_Keys.objects.get(id=id)
-        if tk.properties.get("user_agent","")!="":
+        tk = UserKey.objects.get(id=id)
+        if tk.properties.get("user_agent", "") != "":
            ua = user_agents.parse(tk.properties["user_agent"])
-            res = render(None, "TrustedDevices/user-agent.html", context={"ua":ua})
+            res = render(None, "TrustedDevices/user-agent.html", context={"ua": ua})
            return HttpResponse(res)
    return HttpResponse("")

+
 def trust_device(request):
-    tk = User_Keys.objects.get(id=request.session["td_id"])
-    tk.properties["status"]="trusted"
+    tk = UserKey.objects.get(id=request.session["td_id"])
+    tk.properties["status"] = "trusted"
    tk.save()
    del request.session["td_id"]
    return HttpResponse("OK")

-def checkTrusted(request):
+
+def check_trusted(request):
    res = ""
-    id=request.session.get("td_id","")
-    if id!="":
+    id = request.session.get("td_id", "")
+    if id != "":
        try:
-            tk = User_Keys.objects.get(id=id)
-            if tk.properties["status"] == "trusted": res = "OK"
+            tk = UserKey.objects.get(id=id)
+            if tk.properties["status"] == "trusted":
+                res = "OK"
        except:
            pass
    return HttpResponse(res)

-def getCookie(request):
-    tk = User_Keys.objects.get(id=request.session["td_id"])
+
+def get_cookie(request):
+    tk = UserKey.objects.get(id=request.session["td_id"])

    if tk.properties["status"] == "trusted":
-        context={"added":True}
-        response = render(request,"TrustedDevices/Done.html", context)
-        from datetime import datetime, timedelta
+        context = {"added": True}
+        response = render(request, "TrustedDevices/Done.html", context)
+
        expires = datetime.now() + timedelta(days=180)
-        tk.expires=expires
+        tk.expires = expires
        tk.save()
        response.set_cookie("deviceid", tk.properties["signature"], expires=expires)
        return response

+
 def add(request):
-    context=csrf(request)
-    if request.method=="GET":
-        return render(request,"TrustedDevices/Add.html",context)
+    context = csrf(request)
+    if request.method == "GET":
+        return render(request, "TrustedDevices/Add.html", context)
    else:
-        key=request.POST["key"].replace("-","").replace(" ","").upper()
+        key = request.POST["key"].replace("-", "").replace(" ", "").upper()
        context["username"] = request.POST["username"]
        context["key"] = request.POST["key"]
-        trusted_keys=User_Keys.objects.filter(username=request.POST["username"],properties__has="$.key="+key)
-        cookie=False
+        trusted_keys = UserKey.objects.filter(
+            username=request.POST["username"], properties__has="$.key=" + key
+        )
+        cookie = False
        if trusted_keys.exists():
-            tk=trusted_keys[0]
-            request.session["td_id"]=tk.id
-            ua=request.META['HTTP_USER_AGENT']
-            agent=user_agents.parse(ua)
+            tk = trusted_keys[0]
+            request.session["td_id"] = tk.id
+            ua = request.META["HTTP_USER_AGENT"]
+            agent = user_agents.parse(ua)
            if agent.is_pc:
-                context["invalid"]="This is a PC, it can't used as a trusted device."
+                context["invalid"] = "This is a PC, it can't used as a trusted device."
            else:
-                tk.properties["user_agent"]=ua
+                tk.properties["user_agent"] = ua
                tk.save()
-                context["success"]=True
-            # tk.properties["user_agent"]=ua
-            # tk.save()
-            # context["success"]=True
+                context["success"] = True

        else:
-            context["invalid"]="The username or key is wrong, please check and try again."
+            context[
+                "invalid"
+            ] = "The username or key is wrong, please check and try again."
+
+        return render(request, "TrustedDevices/Add.html", context)

-        return  render(request,"TrustedDevices/Add.html", context)

 def start(request):
-    if User_Keys.objects.filter(username=request.user.username,key_type="Trusted Device").count()>= 2:
-        return render(request,"TrustedDevices/start.html",{"not_allowed":True})
-    td=None
-    if not request.session.get("td_id",None):
-        td=User_Keys()
-        td.username=request.user.username
-        td.properties={"key":id_generator(),"status":"adding"}
-        td.key_type="Trusted Device"
+    if (
+        UserKey.objects.filter(
+            username=request.user.username, key_type="Trusted Device"
+        ).count()
+        >= 2
+    ):
+        return render(request, "TrustedDevices/start.html", {"not_allowed": True})
+    td = None
+    if not request.session.get("td_id", None):
+        td = UserKey()
+        td.username = request.user.username
+        td.properties = {"key": id_generator(), "status": "adding"}
+        td.key_type = "Trusted Device"
        td.save()
-        request.session["td_id"]=td.id
+        request.session["td_id"] = td.id
    try:
-        if td==None: td=User_Keys.objects.get(id=request.session["td_id"])
-        context={"key":td.properties["key"]}
+        if td is None:
+            td = UserKey.objects.get(id=request.session["td_id"])
+        context = {"key": td.properties["key"]}
    except:
        del request.session["td_id"]
        return start(request)
-    return render(request,"TrustedDevices/start.html",context)
+    return render(request, "TrustedDevices/start.html", context)
+

 def send_email(request):
-    body=render(request,"TrustedDevices/email.html",{}).content
-    from .Common import send
-    e=request.user.email
-    if e=="":
-        e=request.session.get("user",{}).get("email","")
-    if e=="":
+    body = render(request, "TrustedDevices/email.html", {}).content
+    e = request.user.email
+    if e == "":
+        e = request.session.get("user", {}).get("email", "")
+    if e == "":
        res = "User has no email on the system."
-    elif send([e],"Add Trusted Device Link",body):
-        res="Sent Successfully"
+    elif send([e], "Add Trusted Device Link", body):
+        res = "Sent Successfully"
    else:
-        res="Error occured, please try again later."
+        res = "Error occured, please try again later."
    return HttpResponse(res)


 def verify(request):
-    if request.COOKIES.get('deviceid',None):
-        from jose import jwt
-        json= jwt.decode(request.COOKIES.get('deviceid'),settings.SECRET_KEY)
-        if json["username"].lower()== request.session['base_username'].lower():
+    if request.COOKIES.get("deviceid", None):
+        json = jwt.decode(request.COOKIES.get("deviceid"), settings.SECRET_KEY)
+        if json["username"].lower() == request.session["base_username"].lower():
            try:
-                uk = User_Keys.objects.get(username=request.POST["username"].lower(), properties__has="$.key=" + json["key"])
+                uk = UserKey.objects.get(
+                    username=request.POST["username"].lower(),
+                    properties__has="$.key=" + json["key"],
+                )
                if uk.enabled and uk.properties["status"] == "trusted":
-                    uk.last_used=timezone.now()
+                    uk.last_used = timezone.now()
                    uk.save()
-                    request.session["mfa"] = {"verified": True, "method": "Trusted Device","id":uk.id}
+                    request.session["mfa"] = {
+                        "verified": True,
+                        "method": "Trusted Device",
+                        "id": uk.id,
+                    }
                    return True
            except:
                return False
--- a/mfa/U2F.py
+++ b/mfa/U2F.py
@@ -1,123 +1,141 @@
+import datetime
+import hashlib
+import random
+import time

-from u2flib_server.u2f import (begin_registration, begin_authentication,
-                               complete_registration, complete_authentication)
+import simplejson
 from cryptography import x509
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.serialization import Encoding
-from django.shortcuts import render
-import simplejson
-#from django.template.context import RequestContext
-from django.template.context_processors import csrf
 from django.conf import settings
-from django.http import HttpResponse
-from .models import *
-from .views import login
-from .Common import get_redirect_url
-import datetime
+from django.http import HttpResponse, JsonResponse
+from django.shortcuts import render
+from django.template.context_processors import csrf
 from django.utils import timezone
+from u2flib_server.u2f import (
+    begin_authentication,
+    begin_registration,
+    complete_authentication,
+    complete_registration,
+)
+
+from .Common import get_redirect_url
+from .models import UserKey
+from .views import login
+

 def recheck(request):
    context = csrf(request)
-    context["mode"]="recheck"
+    context["mode"] = "recheck"
    s = sign(request.user.username)
    request.session["_u2f_challenge_"] = s[0]
    context["token"] = s[1]
-    request.session["mfa_recheck"]=True
-    return render(request,"U2F/recheck.html", context)
+    request.session["mfa_recheck"] = True
+    return render(request, "U2F/recheck.html", context)
+

 def process_recheck(request):
-    x=validate(request,request.user.username)
-    if x==True:
-        import time
+    x = validate(request, request.user.username)
+    if x is True:
        request.session["mfa"]["rechecked_at"] = time.time()
-        return HttpResponse(simplejson.dumps({"recheck":True}),content_type="application/json")
+        return JsonResponse({"recheck": True})
    return x

+
 def check_errors(request, data):
    if "errorCode" in data:
-        if data["errorCode"] == 0: return True
+        if data["errorCode"] == 0:
+            return True
        if data["errorCode"] == 4:
            return HttpResponse("Invalid Security Key")
        if data["errorCode"] == 1:
            return auth(request)
    return True
-def validate(request,username):
-    import datetime, random

+
+def validate(request, username):
    data = simplejson.loads(request.POST["response"])

-    res= check_errors(request,data)
-    if res!=True:
+    res = check_errors(request, data)
+    if res is not True:
        return res

-    challenge = request.session.pop('_u2f_challenge_')
+    challenge = request.session.pop("_u2f_challenge_")
    device, c, t = complete_authentication(challenge, data, [settings.U2F_APPID])
-    try:
-        key=User_Keys.objects.get(username=username,properties__icontains='"publicKey": "%s"'%device["publicKey"])
-        key.last_used=timezone.now()
+
+    key = UserKey.objects.get(
+        username=username,
+        properties__shas="$.device.publicKey=%s" % device["publicKey"],
+    )
+    key.last_used = timezone.now()
    key.save()
-        mfa = {"verified": True, "method": "U2F","id":key.id}
+    mfa = {"verified": True, "method": "U2F", "id": key.id}
    if getattr(settings, "MFA_RECHECK", False):
-            mfa["next_check"] = datetime.datetime.timestamp((datetime.datetime.now()
+        mfa["next_check"] = datetime.datetime.timestamp(
+            (
+                datetime.datetime.now()
                + datetime.timedelta(
-                        seconds=random.randint(settings.MFA_RECHECK_MIN, settings.MFA_RECHECK_MAX))))
+                    seconds=random.randint(
+                        settings.MFA_RECHECK_MIN, settings.MFA_RECHECK_MAX
+                    )
+                )
+            )
+        )
    request.session["mfa"] = mfa
    return True
-    except:
-        return False
-


 def auth(request):
-    context=csrf(request)
-    s=sign(request.session["base_username"])
-    request.session["_u2f_challenge_"]=s[0]
-    context["token"]=s[1]
-    context["method"] = {"name": getattr(settings, "MFA_RENAME_METHODS", {}).get("U2F", "Classical Security Key")}
-    return render(request,"U2F/Auth.html",context)
+    context = csrf(request)
+    s = sign(request.session["base_username"])
+    request.session["_u2f_challenge_"] = s[0]
+    context["token"] = s[1]
+
+    return render(request, "U2F/Auth.html")
+

 def start(request):
    enroll = begin_registration(settings.U2F_APPID, [])
-    request.session['_u2f_enroll_'] = enroll.json
-    context=csrf(request)
-    context["token"]=simplejson.dumps(enroll.data_for_client)
+    request.session["_u2f_enroll_"] = enroll.json
+    context = csrf(request)
+    context["token"] = simplejson.dumps(enroll.data_for_client)
    context.update(get_redirect_url())
-    context["method"] = {"name": getattr(settings, "MFA_RENAME_METHODS", {}).get("U2F", "Classical Security Key")}
-    context["RECOVERY_METHOD"] = getattr(settings, "MFA_RENAME_METHODS", {}).get("RECOVERY", "Recovery codes")
-    return render(request,"U2F/Add.html",context)
+    return render(request, "U2F/Add.html", context)


 def bind(request):
-    import hashlib
-    enroll = request.session['_u2f_enroll_']
-    data=simplejson.loads(request.POST["response"])
+    enroll = request.session["_u2f_enroll_"]
+    data = simplejson.loads(request.POST["response"])
    device, cert = complete_registration(enroll, data, [settings.U2F_APPID])
    cert = x509.load_der_x509_certificate(cert, default_backend())
-    cert_hash=hashlib.md5(cert.public_bytes(Encoding.PEM)).hexdigest()
-    q=User_Keys.objects.filter(key_type="U2F", properties__icontains= cert_hash)
+    cert_hash = hashlib.md5(cert.public_bytes(Encoding.PEM)).hexdigest()
+    q = UserKey.objects.filter(key_type="U2F", properties__icontains=cert_hash)
    if q.exists():
-        return HttpResponse("This key is registered before, it can't be registered again.")
-    User_Keys.objects.filter(username=request.user.username,key_type="U2F").delete()
-    uk = User_Keys()
+        return HttpResponse(
+            "This key is registered before, it can't be registered again."
+        )
+    UserKey.objects.filter(username=request.user.username, key_type="U2F").delete()
+    uk = UserKey()
    uk.username = request.user.username
    uk.owned_by_enterprise = getattr(settings, "MFA_OWNED_BY_ENTERPRISE", False)
-    uk.properties = {"device":simplejson.loads(device.json),"cert":cert_hash}
+    uk.properties = {"device": simplejson.loads(device.json), "cert": cert_hash}
    uk.key_type = "U2F"
    uk.save()
-    if getattr(settings, 'MFA_ENFORCE_RECOVERY_METHOD', False) and not User_Keys.objects.filter(key_type="RECOVERY",
-                                                                                                username=request.user.username).exists():
-        request.session["mfa_reg"] = {"method": "U2F",
-                                      "name": getattr(settings, "MFA_RENAME_METHODS", {}).get("U2F", "Classical Security Key")}
-        return HttpResponse('RECOVERY')
    return HttpResponse("OK")

+
 def sign(username):
-    u2f_devices=[d.properties["device"] for d in User_Keys.objects.filter(username=username,key_type="U2F")]
+    u2f_devices = [
+        d.properties["device"]
+        for d in UserKey.objects.filter(username=username, key_type="U2F")
+    ]
    challenge = begin_authentication(settings.U2F_APPID, u2f_devices)
-    return [challenge.json,simplejson.dumps(challenge.data_for_client)]
+    return [challenge.json, simplejson.dumps(challenge.data_for_client)]
+

 def verify(request):
-    x= validate(request,request.session["base_username"])
-    if x==True:
+    x = validate(request, request.session["base_username"])
+    if x is True:
        return login(request)
-    else: return x
+    else:
+        return x
--- a/mfa/init.py
+++ b/mfa/init.py
@@ -1,5 +1 @@
-__version__="2.7.1"
-from fido2.webauthn import ResidentKeyRequirement as ResidentKey
-from fido2.webauthn import AuthenticatorAttachment as Attachment
-from fido2.webauthn import UserVerificationRequirement as UserVerification
-from fido2.webauthn import AttestationConveyancePreference as AttestationPreference
+__version__ = "2.2.0"
--- a/mfa/admin.py
+++ b/mfa/admin.py
@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.
--- a/mfa/apps.py
+++ b/mfa/apps.py
@@ -1,4 +1,6 @@
 from django.apps import AppConfig
+
+
 class myAppNameConfig(AppConfig):
-    name = 'mfa'
-    verbose_name = 'A Much Better Name'
+    name = "mfa"
+    verbose_name = "A Much Better Name"
--- a/mfa/helpers.py
+++ b/mfa/helpers.py
@@ -1,32 +1,32 @@
-import pyotp
-from .models import *
-from . import TrustedDevice, U2F, FIDO2, totp
-import simplejson
-from django.shortcuts import HttpResponse
-from mfa.views import verify,goto
-def has_mfa(request,username):
-    if User_Keys.objects.filter(username=username,enabled=1).count()>0:
+from django.http import JsonResponse
+
+from . import FIDO2, U2F, TrustedDevice, totp
+from .models import UserKey
+from .views import verify
+
+
+def has_mfa(request, username):
+    if UserKey.objects.filter(username=username, enabled=1).count() > 0:
        return verify(request, username)
    return False

-def is_mfa(request,ignore_methods=[]):
-    if request.session.get("mfa",{}).get("verified",False):
-        if not request.session.get("mfa",{}).get("method",None) in ignore_methods:
+
+def is_mfa(request, ignore_methods=[]):
+    if request.session.get("mfa", {}).get("verified", False):
+        if not request.session.get("mfa", {}).get("method", None) in ignore_methods:
            return True
    return False

+
 def recheck(request):
-    method=request.session.get("mfa",{}).get("method",None)
+    method = request.session.get("mfa", {}).get("method", None)
    if not method:
-        return HttpResponse(simplejson.dumps({"res":False}),content_type="application/json")
-    if method=="Trusted Device":
-        return HttpResponse(simplejson.dumps({"res":TrustedDevice.verify(request)}),content_type="application/json")
-    elif method=="U2F":
-        return HttpResponse(simplejson.dumps({"html": U2F.recheck(request).content}), content_type="application/json")
+        return JsonResponse({"res": False})
+    if method == "Trusted Device":
+        return JsonResponse({"res": TrustedDevice.verify(request)})
+    elif method == "U2F":
+        return JsonResponse({"html": U2F.recheck(request).content})
    elif method == "FIDO2":
-        return HttpResponse(simplejson.dumps({"html": FIDO2.recheck(request).content}), content_type="application/json")
-    elif method=="TOTP":
-        return HttpResponse(simplejson.dumps({"html": totp.recheck(request).content}), content_type="application/json")
-
-
-
+        return JsonResponse({"html": FIDO2.recheck(request).content})
+    elif method == "TOTP":
+        return JsonResponse({"html": totp.recheck(request).content})
--- a/mfa/middleware.py
+++ b/mfa/middleware.py
@@ -1,13 +1,20 @@
 import time
-from django.http import HttpResponseRedirect
-from django.core.urlresolvers import reverse
+
 from django.conf import settings
+from django.http import HttpResponseRedirect
+from django.urls import reverse
+
+
 def process(request):
-    next_check=request.session.get('mfa',{}).get("next_check",False)
-    if not next_check: return None
-    now=int(time.time())
-    if now >= next_check:
-        method=request.session["mfa"]["method"]
-        path = request.META["PATH_INFO"]
-        return HttpResponseRedirect(reverse(method+"_auth")+"?next=%s"%(settings.BASE_URL + path).replace("//", "/"))
+    next_check = request.session.get("mfa", {}).get("next_check", False)
+    if not next_check:
+        return None
+    now = int(time.time())
+    if now >= next_check:
+        method = request.session["mfa"]["method"]
+        path = request.META["PATH_INFO"]
+        return HttpResponseRedirect(
+            reverse(method + "_auth")
+            + "?next=%s" % (settings.BASE_URL + path).replace("//", "/")
+        )
    return None
--- a/mfa/migrations/0001_initial.py
+++ b/mfa/migrations/0001_initial.py
@@ -6,17 +6,24 @@ from django.db import models, migrations

 class Migration(migrations.Migration):

-    dependencies = [
-    ]
+    dependencies = []

    operations = [
        migrations.CreateModel(
-            name='User_Keys',
+            name="User_Keys",
            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('username', models.CharField(max_length=50)),
-                ('secret_key', models.CharField(max_length=15)),
-                ('added_on', models.DateTimeField(auto_now_add=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                ("username", models.CharField(max_length=50)),
+                ("secret_key", models.CharField(max_length=15)),
+                ("added_on", models.DateTimeField(auto_now_add=True)),
            ],
        ),
    ]
--- a/mfa/migrations/0002_user_keys_key_type.py
+++ b/mfa/migrations/0002_user_keys_key_type.py
@@ -7,13 +7,13 @@ from django.db import models, migrations
 class Migration(migrations.Migration):

    dependencies = [
-        ('mfa', '0001_initial'),
+        ("mfa", "0001_initial"),
    ]

    operations = [
        migrations.AddField(
-            model_name='user_keys',
-            name='key_type',
-            field=models.CharField(default=b'TOTP', max_length=25),
+            model_name="user_keys",
+            name="key_type",
+            field=models.CharField(default=b"TOTP", max_length=25),
        ),
    ]
--- a/mfa/migrations/0003_auto_20181114_2159.py
+++ b/mfa/migrations/0003_auto_20181114_2159.py
@@ -7,13 +7,13 @@ from django.db import models, migrations
 class Migration(migrations.Migration):

    dependencies = [
-        ('mfa', '0002_user_keys_key_type'),
+        ("mfa", "0002_user_keys_key_type"),
    ]

    operations = [
        migrations.AlterField(
-            model_name='user_keys',
-            name='secret_key',
+            model_name="user_keys",
+            name="secret_key",
            field=models.CharField(max_length=32),
        ),
    ]
--- a/mfa/migrations/0004_user_keys_enabled.py
+++ b/mfa/migrations/0004_user_keys_enabled.py
@@ -7,13 +7,13 @@ from django.db import models, migrations
 class Migration(migrations.Migration):

    dependencies = [
-        ('mfa', '0003_auto_20181114_2159'),
+        ("mfa", "0003_auto_20181114_2159"),
    ]

    operations = [
        migrations.AddField(
-            model_name='user_keys',
-            name='enabled',
+            model_name="user_keys",
+            name="enabled",
            field=models.BooleanField(default=True),
        ),
    ]
--- a/mfa/migrations/0005_auto_20181115_2014.py
+++ b/mfa/migrations/0005_auto_20181115_2014.py
@@ -7,24 +7,25 @@ import jsonfield.fields

 def modify_json(apps, schema_editor):
    from django.conf import settings
+
    if "mysql" in settings.DATABASES.get("default", {}).get("engine", ""):
        migrations.RunSQL("alter table mfa_user_keys modify column properties json;")


 class Migration(migrations.Migration):
    dependencies = [
-        ('mfa', '0004_user_keys_enabled'),
+        ("mfa", "0004_user_keys_enabled"),
    ]

    operations = [
        migrations.RemoveField(
-            model_name='user_keys',
-            name='secret_key',
+            model_name="user_keys",
+            name="secret_key",
        ),
        migrations.AddField(
-            model_name='user_keys',
-            name='properties',
+            model_name="user_keys",
+            name="properties",
            field=jsonfield.fields.JSONField(null=True),
        ),
-        migrations.RunPython(modify_json)
+        migrations.RunPython(modify_json),
    ]
--- a/mfa/migrations/0006_trusted_devices.py
+++ b/mfa/migrations/0006_trusted_devices.py
@@ -7,21 +7,29 @@ from django.db import models, migrations
 class Migration(migrations.Migration):

    dependencies = [
-        ('mfa', '0005_auto_20181115_2014'),
+        ("mfa", "0005_auto_20181115_2014"),
    ]

    operations = [
        migrations.CreateModel(
-            name='Trusted_Devices',
+            name="Trusted_Devices",
            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('signature', models.CharField(max_length=255)),
-                ('key', models.CharField(max_length=6)),
-                ('username', models.CharField(max_length=50)),
-                ('user_agent', models.CharField(max_length=255)),
-                ('status', models.CharField(default=b'adding', max_length=255)),
-                ('added_on', models.DateTimeField(auto_now_add=True)),
-                ('last_used', models.DateTimeField(default=None, null=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                ("signature", models.CharField(max_length=255)),
+                ("key", models.CharField(max_length=6)),
+                ("username", models.CharField(max_length=50)),
+                ("user_agent", models.CharField(max_length=255)),
+                ("status", models.CharField(default=b"adding", max_length=255)),
+                ("added_on", models.DateTimeField(auto_now_add=True)),
+                ("last_used", models.DateTimeField(default=None, null=True)),
            ],
        ),
    ]
--- a/mfa/migrations/0007_auto_20181230_1549.py
+++ b/mfa/migrations/0007_auto_20181230_1549.py
@@ -7,16 +7,16 @@ from django.db import models, migrations
 class Migration(migrations.Migration):

    dependencies = [
-        ('mfa', '0006_trusted_devices'),
+        ("mfa", "0006_trusted_devices"),
    ]

    operations = [
        migrations.DeleteModel(
-            name='Trusted_Devices',
+            name="Trusted_Devices",
        ),
        migrations.AddField(
-            model_name='user_keys',
-            name='expires',
+            model_name="user_keys",
+            name="expires",
            field=models.DateTimeField(default=None, null=True, blank=True),
        ),
    ]
--- a/mfa/migrations/0008_user_keys_last_used.py
+++ b/mfa/migrations/0008_user_keys_last_used.py
@@ -7,13 +7,13 @@ from django.db import models, migrations
 class Migration(migrations.Migration):

    dependencies = [
-        ('mfa', '0007_auto_20181230_1549'),
+        ("mfa", "0007_auto_20181230_1549"),
    ]

    operations = [
        migrations.AddField(
-            model_name='user_keys',
-            name='last_used',
+            model_name="user_keys",
+            name="last_used",
            field=models.DateTimeField(default=None, null=True, blank=True),
        ),
    ]
--- a/mfa/migrations/0009_user_keys_owned_by_enterprise.py
+++ b/mfa/migrations/0009_user_keys_owned_by_enterprise.py
@@ -6,21 +6,23 @@ from django.conf import settings


 def update_owned_by_enterprise(apps, schema_editor):
-    user_keys = apps.get_model('mfa', 'user_keys')
-    user_keys.objects.filter(key_type='FIDO2').update(owned_by_enterprise=getattr(settings,"MFA_OWNED_BY_ENTERPRISE",False))
+    user_keys = apps.get_model("mfa", "user_keys")
+    user_keys.objects.filter(key_type="FIDO2").update(
+        owned_by_enterprise=getattr(settings, "MFA_OWNED_BY_ENTERPRISE", False)
+    )


 class Migration(migrations.Migration):

    dependencies = [
-        ('mfa', '0008_user_keys_last_used'),
+        ("mfa", "0008_user_keys_last_used"),
    ]

    operations = [
        migrations.AddField(
-            model_name='user_keys',
-            name='owned_by_enterprise',
+            model_name="user_keys",
+            name="owned_by_enterprise",
            field=models.NullBooleanField(default=None),
        ),
-        migrations.RunPython(update_owned_by_enterprise)
+        migrations.RunPython(update_owned_by_enterprise),
    ]
--- a/mfa/migrations/0010_auto_20201110_0557.py
+++ b/mfa/migrations/0010_auto_20201110_0557.py
@@ -6,13 +6,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):

    dependencies = [
-        ('mfa', '0009_user_keys_owned_by_enterprise'),
+        ("mfa", "0009_user_keys_owned_by_enterprise"),
    ]

    operations = [
        migrations.AlterField(
-            model_name='user_keys',
-            name='key_type',
-            field=models.CharField(default='TOTP', max_length=25),
+            model_name="user_keys",
+            name="key_type",
+            field=models.CharField(default="TOTP", max_length=25),
        ),
    ]
--- a/mfa/migrations/0011_auto_20210530_0622.py
+++ b/mfa/migrations/0011_auto_20210530_0622.py
@@ -6,13 +6,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):

    dependencies = [
-        ('mfa', '0010_auto_20201110_0557'),
+        ("mfa", "0010_auto_20201110_0557"),
    ]

    operations = [
        migrations.AlterField(
-            model_name='user_keys',
-            name='owned_by_enterprise',
+            model_name="user_keys",
+            name="owned_by_enterprise",
            field=models.BooleanField(blank=True, default=None, null=True),
        ),
    ]
--- a/mfa/migrations/0012_rename_user_keys_userkey.py
+++ b/mfa/migrations/0012_rename_user_keys_userkey.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.2.4 on 2021-06-23 07:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("mfa", "0011_auto_20210530_0622"),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name="User_Keys",
+            new_name="UserKey",
+        ),
+    ]
--- a/mfa/migrations/0012_user_keys_userhandle.py
+++ b/mfa/migrations/0012_user_keys_userhandle.py
@@ -1,17 +0,0 @@
-# Generated by Django 2.2 on 2022-10-16 14:15
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mfa', '0011_auto_20210530_0622'),
-    ]
-    operations = [
-        migrations.AddField(
-            model_name='user_keys',
-            name='user_handle',
-            field=models.CharField(blank=True, default=None, max_length=255, null=True),
-        ),
-    ]
--- a/mfa/migrations/0013_auto_20210624_1505.py
+++ b/mfa/migrations/0013_auto_20210624_1505.py
@@ -0,0 +1,35 @@
+# Generated by Django 2.2 on 2021-06-24 15:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("mfa", "0012_rename_user_keys_userkey"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="OTPTracker",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("actor", models.CharField(max_length=50)),
+                ("value", models.CharField(max_length=6)),
+                ("success", models.BooleanField(blank=True)),
+                ("done_on", models.DateTimeField(auto_now=True)),
+            ],
+        ),
+        migrations.AddIndex(
+            model_name="otptracker",
+            index=models.Index(fields=["actor"], name="mfa_otptrac_usernam_1f423f_idx"),
+        ),
+    ]
--- a/mfa/models.py
+++ b/mfa/models.py
@@ -1,33 +1,45 @@
-from django.db import models
-from jsonfield import JSONField
-from jose import jwt
 from django.conf import settings
-#from jsonLookup import shasLookup, hasLookup
-# JSONField.register_lookup(shasLookup)
-# JSONField.register_lookup(hasLookup)
+from django.db import models
+from jose import jwt
+from jsonfield import JSONField


-class User_Keys(models.Model):
-    username=models.CharField(max_length = 50)
-    properties=JSONField(null = True)
-    added_on=models.DateTimeField(auto_now_add = True)
-    key_type=models.CharField(max_length = 25,default = "TOTP")
-    enabled=models.BooleanField(default=True)
-    expires=models.DateTimeField(null=True,default=None,blank=True)
-    last_used=models.DateTimeField(null=True,default=None,blank=True)
-    owned_by_enterprise=models.BooleanField(default=None,null=True,blank=True)
-    user_handle = models.CharField(default = None, null = True, blank = True, max_length = 255)
+class UserKey(models.Model):
+    username = models.CharField(max_length=50)
+    properties = JSONField(null=True)
+    added_on = models.DateTimeField(auto_now_add=True)
+    key_type = models.CharField(max_length=25, default="TOTP")
+    enabled = models.BooleanField(default=True)
+    expires = models.DateTimeField(null=True, default=None, blank=True)
+    last_used = models.DateTimeField(null=True, default=None, blank=True)
+    owned_by_enterprise = models.BooleanField(default=None, null=True, blank=True)

-    def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
-        if self.key_type == "Trusted Device" and self.properties.get("signature","") == "":
-            self.properties["signature"]= jwt.encode({"username": self.username, "key": self.properties["key"]}, settings.SECRET_KEY)
-        super(User_Keys, self).save(force_insert=force_insert, force_update=force_update, using=using, update_fields=update_fields)
-
-    def __unicode__(self):
-        return "%s -- %s"%(self.username,self.key_type)
+    def save(self, *args, **kwargs):
+        if (
+            self.key_type == "Trusted Device"
+            and self.properties.get("signature", "") == ""
+        ):
+            self.properties["signature"] = jwt.encode(
+                {"username": self.username, "key": self.properties["key"]},
+                settings.SECRET_KEY,
+            )
+        super().save(*args, **kwargs)

    def __str__(self):
-        return self.__unicode__()
+        return "%s -- %s" % (self.username, self.key_type)

    class Meta:
-        app_label='mfa'
+        app_label = "mfa"
+
+
+class OTPTracker(models.Model):
+    actor = models.CharField(
+        max_length=50, help_text="Username"
+    )  # named this way for indexing purpose.
+    value = models.CharField(max_length=6)
+    success = models.BooleanField(blank=True)
+    done_on = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        app_label = "mfa"
+        indexes = [models.Index(fields=["actor"])]
--- a/mfa/recovery.py
+++ b/mfa/recovery.py
@@ -1,122 +0,0 @@
-from django.shortcuts import render
-from django.views.decorators.cache import never_cache
-from django.template.context_processors import csrf
-from django.contrib.auth.hashers import make_password, PBKDF2PasswordHasher
-from django.http import HttpResponse
-from .Common import get_redirect_url
-from .models import *
-import simplejson
-import random
-import string
-import datetime
-from django.utils import timezone
-
-USER_FRIENDLY_NAME = "Recovery Codes"
-
-class Hash(PBKDF2PasswordHasher):
-    algorithm = 'pbkdf2_sha256_custom'
-    iterations = getattr(settings,"RECOVERY_ITERATION",1)
-
-def delTokens(request):
-    #Only when all MFA have been deactivated, or to generate new !
-    #We iterate only to clean if any error happend and multiple entry of RECOVERY created for one user
-    for key in User_Keys.objects.filter(username=request.user.username, key_type = "RECOVERY"):
-        if key.username == request.user.username:
-            key.delete()
-
-def randomGen(n):
-    return ''.join(random.choice(string.ascii_uppercase + string.ascii_lowercase + string.digits) for _ in range(n))
-
-@never_cache
-def genTokens(request):
-    #Delete old ones
-    delTokens(request)
-    #Then generate new one
-    salt = randomGen(15)
-    hashedKeys = []
-    clearKeys = []
-    for i in range(5):
-            token = randomGen(5) + "-" + randomGen(5)
-            hashedToken = make_password(token, salt, 'pbkdf2_sha256_custom')
-            hashedKeys.append(hashedToken)
-            clearKeys.append(token)
-    uk=User_Keys()
-
-    uk.username = request.user.username
-    uk.properties={"secret_keys":hashedKeys, "salt":salt}
-    uk.key_type="RECOVERY"
-    uk.enabled = True
-    uk.save()
-    return HttpResponse(simplejson.dumps({"keys":clearKeys}))
-
-
-def verify_login(request, username, token):
-    for key in User_Keys.objects.filter(username=username, key_type = "RECOVERY"):
-        secret_keys = key.properties["secret_keys"]
-        salt = key.properties["salt"]
-        hashedToken = make_password(token, salt, "pbkdf2_sha256_custom")
-        for i,token in enumerate(secret_keys):
-            if hashedToken == token:
-                secret_keys.pop(i)
-                key.properties["secret_keys"] = secret_keys
-                key.last_used= timezone.now()
-                key.save()
-                return [True, key.id, len(secret_keys) == 0]
-    return [False]
-
-def getTokenLeft(request):
-    uk = User_Keys.objects.filter(username=request.user.username, key_type = "RECOVERY")
-    keyLeft=0
-    for key in uk:
-        keyLeft += len(key.properties["secret_keys"])
-    return HttpResponse(simplejson.dumps({"left":keyLeft}))
-
-def recheck(request):
-    context = csrf(request)
-    context["mode"]="recheck"
-    if request.method == "POST":
-        if verify_login(request,request.user.username, token=request.POST["recovery"])[0]:
-            import time
-            request.session["mfa"]["rechecked_at"] = time.time()
-            return HttpResponse(simplejson.dumps({"recheck": True}), content_type="application/json")
-        else:
-            return HttpResponse(simplejson.dumps({"recheck": False}), content_type="application/json")
-    return render(request,"RECOVERY/recheck.html", context)
-
-@never_cache
-def auth(request):
-    from .views import login
-    context=csrf(request)
-    if request.method=="POST":
-        tokenLength = len(request.POST["recovery"])
-        if tokenLength == 11 and "RECOVERY" not in settings.MFA_UNALLOWED_METHODS:
-            #Backup code check
-            resBackup=verify_login(request, request.session["base_username"], token=request.POST["recovery"])
-            if resBackup[0]:
-                mfa = {"verified": True, "method": "RECOVERY","id":resBackup[1], "lastBackup":resBackup[2]}
-                # if getattr(settings, "MFA_RECHECK", False):
-                #     mfa["next_check"] = datetime.datetime.timestamp((datetime.datetime.now()
-                #                             + datetime.timedelta(
-                #                 seconds=random.randint(settings.MFA_RECHECK_MIN, settings.MFA_RECHECK_MAX))))
-                request.session["mfa"] = mfa
-                if resBackup[2]:
-                    #If the last bakup code has just been used, we return a response insead of redirecting to login
-                    context["lastBackup"] = True
-                    return render(request,"RECOVERY/Auth.html", context)                
-                return login(request)
-        context["invalid"]=True
-
-    elif request.method=="GET":
-        mfa = request.session.get("mfa")
-        if mfa and mfa["verified"] and mfa["lastBackup"]:
-            return login(request)
-
-    return render(request,"RECOVERY/Auth.html", context)
-
-@never_cache
-def start(request):
-    """Start Managing recovery tokens"""
-    context = get_redirect_url()
-    if "mfa_reg" in request.session:
-        context["mfa_redirect"] = request.session["mfa_reg"]["name"]
-    return render(request,"RECOVERY/Add.html",context)
--- a/mfa/static/mfa/js/base64url.js
+++ b/mfa/static/mfa/js/base64url.js
@@ -1,73 +0,0 @@
-(function(){
-            'use strict';
-
-            let chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_';
-
-            // Use a lookup table to find the index.
-            let lookup = new Uint8Array(256);
-            for (let i = 0; i < chars.length; i++) {
-                lookup[chars.charCodeAt(i)] = i;
-            }
-
-            let encode = function(arraybuffer) {
-                let bytes = new Uint8Array(arraybuffer),
-                i, len = bytes.length, base64url = '';
-
-                for (i = 0; i < len; i+=3) {
-                    base64url += chars[bytes[i] >> 2];
-                    base64url += chars[((bytes[i] & 3) << 4) | (bytes[i + 1] >> 4)];
-                    base64url += chars[((bytes[i + 1] & 15) << 2) | (bytes[i + 2] >> 6)];
-                    base64url += chars[bytes[i + 2] & 63];
-                }
-
-                if ((len % 3) === 2) {
-                    base64url = base64url.substring(0, base64url.length - 1);
-                } else if (len % 3 === 1) {
-                    base64url = base64url.substring(0, base64url.length - 2);
-                }
-
-                return base64url;
-            };
-
-            let decode = function(base64string) {
-                let bufferLength = base64string.length * 0.75,
-                len = base64string.length, i, p = 0,
-                encoded1, encoded2, encoded3, encoded4;
-
-                let bytes = new Uint8Array(bufferLength);
-
-                for (i = 0; i < len; i+=4) {
-                    encoded1 = lookup[base64string.charCodeAt(i)];
-                    encoded2 = lookup[base64string.charCodeAt(i+1)];
-                    encoded3 = lookup[base64string.charCodeAt(i+2)];
-                    encoded4 = lookup[base64string.charCodeAt(i+3)];
-
-                    bytes[p++] = (encoded1 << 2) | (encoded2 >> 4);
-                    bytes[p++] = ((encoded2 & 15) << 4) | (encoded3 >> 2);
-                    bytes[p++] = ((encoded3 & 3) << 6) | (encoded4 & 63);
-                }
-
-                return bytes.buffer
-            };
-
-            let methods = {
-                'decode': decode,
-                'encode': encode
-            }
-
-            /**
-             * Exporting and stuff
-             */
-            if (typeof module !== 'undefined' && typeof module.exports !== 'undefined') {
-                module.exports = methods;
-
-            } else {
-                if (typeof define === 'function' && define.amd) {
-                    define([], function() {
-                        return methods
-                    });
-                } else {
-                    window.base64url = methods;
-                }
-            }
-        })();
--- a/mfa/static/mfa/js/cbor.js
+++ b/mfa/static/mfa/js/cbor.js
@@ -0,0 +1,406 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014-2016 Patrick Gansterer <paroga@paroga.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+(function(global, undefined) { "use strict";
+var POW_2_24 = 5.960464477539063e-8,
+    POW_2_32 = 4294967296,
+    POW_2_53 = 9007199254740992;
+
+function encode(value) {
+  var data = new ArrayBuffer(256);
+  var dataView = new DataView(data);
+  var lastLength;
+  var offset = 0;
+
+  function prepareWrite(length) {
+    var newByteLength = data.byteLength;
+    var requiredLength = offset + length;
+    while (newByteLength < requiredLength)
+      newByteLength <<= 1;
+    if (newByteLength !== data.byteLength) {
+      var oldDataView = dataView;
+      data = new ArrayBuffer(newByteLength);
+      dataView = new DataView(data);
+      var uint32count = (offset + 3) >> 2;
+      for (var i = 0; i < uint32count; ++i)
+        dataView.setUint32(i << 2, oldDataView.getUint32(i << 2));
+    }
+
+    lastLength = length;
+    return dataView;
+  }
+  function commitWrite() {
+    offset += lastLength;
+  }
+  function writeFloat64(value) {
+    commitWrite(prepareWrite(8).setFloat64(offset, value));
+  }
+  function writeUint8(value) {
+    commitWrite(prepareWrite(1).setUint8(offset, value));
+  }
+  function writeUint8Array(value) {
+    var dataView = prepareWrite(value.length);
+    for (var i = 0; i < value.length; ++i)
+      dataView.setUint8(offset + i, value[i]);
+    commitWrite();
+  }
+  function writeUint16(value) {
+    commitWrite(prepareWrite(2).setUint16(offset, value));
+  }
+  function writeUint32(value) {
+    commitWrite(prepareWrite(4).setUint32(offset, value));
+  }
+  function writeUint64(value) {
+    var low = value % POW_2_32;
+    var high = (value - low) / POW_2_32;
+    var dataView = prepareWrite(8);
+    dataView.setUint32(offset, high);
+    dataView.setUint32(offset + 4, low);
+    commitWrite();
+  }
+  function writeTypeAndLength(type, length) {
+    if (length < 24) {
+      writeUint8(type << 5 | length);
+    } else if (length < 0x100) {
+      writeUint8(type << 5 | 24);
+      writeUint8(length);
+    } else if (length < 0x10000) {
+      writeUint8(type << 5 | 25);
+      writeUint16(length);
+    } else if (length < 0x100000000) {
+      writeUint8(type << 5 | 26);
+      writeUint32(length);
+    } else {
+      writeUint8(type << 5 | 27);
+      writeUint64(length);
+    }
+  }
+
+  function encodeItem(value) {
+    var i;
+
+    if (value === false)
+      return writeUint8(0xf4);
+    if (value === true)
+      return writeUint8(0xf5);
+    if (value === null)
+      return writeUint8(0xf6);
+    if (value === undefined)
+      return writeUint8(0xf7);
+
+    switch (typeof value) {
+      case "number":
+        if (Math.floor(value) === value) {
+          if (0 <= value && value <= POW_2_53)
+            return writeTypeAndLength(0, value);
+          if (-POW_2_53 <= value && value < 0)
+            return writeTypeAndLength(1, -(value + 1));
+        }
+        writeUint8(0xfb);
+        return writeFloat64(value);
+
+      case "string":
+        var utf8data = [];
+        for (i = 0; i < value.length; ++i) {
+          var charCode = value.charCodeAt(i);
+          if (charCode < 0x80) {
+            utf8data.push(charCode);
+          } else if (charCode < 0x800) {
+            utf8data.push(0xc0 | charCode >> 6);
+            utf8data.push(0x80 | charCode & 0x3f);
+          } else if (charCode < 0xd800) {
+            utf8data.push(0xe0 | charCode >> 12);
+            utf8data.push(0x80 | (charCode >> 6)  & 0x3f);
+            utf8data.push(0x80 | charCode & 0x3f);
+          } else {
+            charCode = (charCode & 0x3ff) << 10;
+            charCode |= value.charCodeAt(++i) & 0x3ff;
+            charCode += 0x10000;
+
+            utf8data.push(0xf0 | charCode >> 18);
+            utf8data.push(0x80 | (charCode >> 12)  & 0x3f);
+            utf8data.push(0x80 | (charCode >> 6)  & 0x3f);
+            utf8data.push(0x80 | charCode & 0x3f);
+          }
+        }
+
+        writeTypeAndLength(3, utf8data.length);
+        return writeUint8Array(utf8data);
+
+      default:
+        var length;
+        if (Array.isArray(value)) {
+          length = value.length;
+          writeTypeAndLength(4, length);
+          for (i = 0; i < length; ++i)
+            encodeItem(value[i]);
+        } else if (value instanceof Uint8Array) {
+          writeTypeAndLength(2, value.length);
+          writeUint8Array(value);
+        } else {
+          var keys = Object.keys(value);
+          length = keys.length;
+          writeTypeAndLength(5, length);
+          for (i = 0; i < length; ++i) {
+            var key = keys[i];
+            encodeItem(key);
+            encodeItem(value[key]);
+          }
+        }
+    }
+  }
+
+  encodeItem(value);
+
+  if ("slice" in data)
+    return data.slice(0, offset);
+
+  var ret = new ArrayBuffer(offset);
+  var retView = new DataView(ret);
+  for (var i = 0; i < offset; ++i)
+    retView.setUint8(i, dataView.getUint8(i));
+  return ret;
+}
+
+function decode(data, tagger, simpleValue) {
+  var dataView = new DataView(data);
+  var offset = 0;
+
+  if (typeof tagger !== "function")
+    tagger = function(value) { return value; };
+  if (typeof simpleValue !== "function")
+    simpleValue = function() { return undefined; };
+
+  function commitRead(length, value) {
+    offset += length;
+    return value;
+  }
+  function readArrayBuffer(length) {
+    return commitRead(length, new Uint8Array(data, offset, length));
+  }
+  function readFloat16() {
+    var tempArrayBuffer = new ArrayBuffer(4);
+    var tempDataView = new DataView(tempArrayBuffer);
+    var value = readUint16();
+
+    var sign = value & 0x8000;
+    var exponent = value & 0x7c00;
+    var fraction = value & 0x03ff;
+
+    if (exponent === 0x7c00)
+      exponent = 0xff << 10;
+    else if (exponent !== 0)
+      exponent += (127 - 15) << 10;
+    else if (fraction !== 0)
+      return (sign ? -1 : 1) * fraction * POW_2_24;
+
+    tempDataView.setUint32(0, sign << 16 | exponent << 13 | fraction << 13);
+    return tempDataView.getFloat32(0);
+  }
+  function readFloat32() {
+    return commitRead(4, dataView.getFloat32(offset));
+  }
+  function readFloat64() {
+    return commitRead(8, dataView.getFloat64(offset));
+  }
+  function readUint8() {
+    return commitRead(1, dataView.getUint8(offset));
+  }
+  function readUint16() {
+    return commitRead(2, dataView.getUint16(offset));
+  }
+  function readUint32() {
+    return commitRead(4, dataView.getUint32(offset));
+  }
+  function readUint64() {
+    return readUint32() * POW_2_32 + readUint32();
+  }
+  function readBreak() {
+    if (dataView.getUint8(offset) !== 0xff)
+      return false;
+    offset += 1;
+    return true;
+  }
+  function readLength(additionalInformation) {
+    if (additionalInformation < 24)
+      return additionalInformation;
+    if (additionalInformation === 24)
+      return readUint8();
+    if (additionalInformation === 25)
+      return readUint16();
+    if (additionalInformation === 26)
+      return readUint32();
+    if (additionalInformation === 27)
+      return readUint64();
+    if (additionalInformation === 31)
+      return -1;
+    throw "Invalid length encoding";
+  }
+  function readIndefiniteStringLength(majorType) {
+    var initialByte = readUint8();
+    if (initialByte === 0xff)
+      return -1;
+    var length = readLength(initialByte & 0x1f);
+    if (length < 0 || (initialByte >> 5) !== majorType)
+      throw "Invalid indefinite length element";
+    return length;
+  }
+
+  function appendUtf16Data(utf16data, length) {
+    for (var i = 0; i < length; ++i) {
+      var value = readUint8();
+      if (value & 0x80) {
+        if (value < 0xe0) {
+          value = (value & 0x1f) <<  6
+                | (readUint8() & 0x3f);
+          length -= 1;
+        } else if (value < 0xf0) {
+          value = (value & 0x0f) << 12
+                | (readUint8() & 0x3f) << 6
+                | (readUint8() & 0x3f);
+          length -= 2;
+        } else {
+          value = (value & 0x0f) << 18
+                | (readUint8() & 0x3f) << 12
+                | (readUint8() & 0x3f) << 6
+                | (readUint8() & 0x3f);
+          length -= 3;
+        }
+      }
+
+      if (value < 0x10000) {
+        utf16data.push(value);
+      } else {
+        value -= 0x10000;
+        utf16data.push(0xd800 | (value >> 10));
+        utf16data.push(0xdc00 | (value & 0x3ff));
+      }
+    }
+  }
+
+  function decodeItem() {
+    var initialByte = readUint8();
+    var majorType = initialByte >> 5;
+    var additionalInformation = initialByte & 0x1f;
+    var i;
+    var length;
+
+    if (majorType === 7) {
+      switch (additionalInformation) {
+        case 25:
+          return readFloat16();
+        case 26:
+          return readFloat32();
+        case 27:
+          return readFloat64();
+      }
+    }
+
+    length = readLength(additionalInformation);
+    if (length < 0 && (majorType < 2 || 6 < majorType))
+      throw "Invalid length";
+
+    switch (majorType) {
+      case 0:
+        return length;
+      case 1:
+        return -1 - length;
+      case 2:
+        if (length < 0) {
+          var elements = [];
+          var fullArrayLength = 0;
+          while ((length = readIndefiniteStringLength(majorType)) >= 0) {
+            fullArrayLength += length;
+            elements.push(readArrayBuffer(length));
+          }
+          var fullArray = new Uint8Array(fullArrayLength);
+          var fullArrayOffset = 0;
+          for (i = 0; i < elements.length; ++i) {
+            fullArray.set(elements[i], fullArrayOffset);
+            fullArrayOffset += elements[i].length;
+          }
+          return fullArray;
+        }
+        return readArrayBuffer(length);
+      case 3:
+        var utf16data = [];
+        if (length < 0) {
+          while ((length = readIndefiniteStringLength(majorType)) >= 0)
+            appendUtf16Data(utf16data, length);
+        } else
+          appendUtf16Data(utf16data, length);
+        return String.fromCharCode.apply(null, utf16data);
+      case 4:
+        var retArray;
+        if (length < 0) {
+          retArray = [];
+          while (!readBreak())
+            retArray.push(decodeItem());
+        } else {
+          retArray = new Array(length);
+          for (i = 0; i < length; ++i)
+            retArray[i] = decodeItem();
+        }
+        return retArray;
+      case 5:
+        var retObject = {};
+        for (i = 0; i < length || length < 0 && !readBreak(); ++i) {
+          var key = decodeItem();
+          retObject[key] = decodeItem();
+        }
+        return retObject;
+      case 6:
+        return tagger(decodeItem(), length);
+      case 7:
+        switch (length) {
+          case 20:
+            return false;
+          case 21:
+            return true;
+          case 22:
+            return null;
+          case 23:
+            return undefined;
+          default:
+            return simpleValue(length);
+        }
+    }
+  }
+
+  var ret = decodeItem();
+  if (offset !== data.byteLength)
+    throw "Remaining bytes";
+  return ret;
+}
+
+var obj = { encode: encode, decode: decode };
+
+if (typeof define === "function" && define.amd)
+  define("cbor/cbor", obj);
+else if (typeof module !== "undefined" && module.exports)
+  module.exports = obj;
+else if (!global.CBOR)
+  global.CBOR = obj;
+
+})(this);
--- a/mfa/static/mfa/js/helpers.js
+++ b/mfa/static/mfa/js/helpers.js
@@ -1,25 +0,0 @@
-var publicKeyCredentialToJSON = (pubKeyCred) => {
-            if(pubKeyCred instanceof Array) {
-                let arr = [];
-                for(let i of pubKeyCred)
-                    arr.push(publicKeyCredentialToJSON(i));
-
-                return arr
-            }
-
-            if(pubKeyCred instanceof ArrayBuffer) {
-                return base64url.encode(pubKeyCred)
-            }
-
-            if(pubKeyCred instanceof Object) {
-                let obj = {};
-
-                for (let key in pubKeyCred) {
-                    obj[key] = publicKeyCredentialToJSON(pubKeyCred[key])
-                }
-
-                return obj
-            }
-
-            return pubKeyCred
-        }
--- a/mfa/templates/Email/Add.html
+++ b/mfa/templates/Email/Add.html
@@ -4,12 +4,12 @@
 {% block content %}
 <br/>
 <br/>
-<div class="container d-flex justify-content-center">
-  <div class="panel panel-default card">
-    <div class="panel-heading card-header">
+<div class="container">
+  <div class="panel panel-default">
+    <div class="panel-heading">
      <strong> Activate Token by email</strong>
    </div>
-    <div class="panel-body card-body">
+    <div class="panel-body">
      <FORM METHOD="POST" ACTION="{% url 'start_email' %}" Id="formLogin"  onSubmit="" name="FrontPage_Form1">
        {% csrf_token %}
        {%  if invalid %}
@@ -31,14 +31,14 @@
          <div class="row">
            <div class="col-sm-12 col-md-12">
              <div class="form-group">
-                <div class="input-group mb-3">
-                  <span class="input-group-addon input-group-text">
-                  <i class="glyphicon glyphicon-lock bi bi-lock"></i>
+                <div class="input-group">
+                  <span class="input-group-addon">
+                  <i class="glyphicon glyphicon-lock"></i>
                  </span>
                  <input class="form-control" size="6" MaxLength="6" value="" placeholder="e.g 55552" name="otp" type="text" id="otp" autofocus>
                </div>
              </div>
-              <div class="form-group d-grid gap-2">
+              <div class="form-group">
                <input type="submit" class="btn btn-lg btn-success btn-block" value="Verify">
              </div>
            </div>
--- a/mfa/templates/Email/recheck.html
+++ b/mfa/templates/Email/recheck.html
@@ -13,15 +13,14 @@

    }
 </script>
-<div class='container'>
 <div class="row">

 <div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
-<div class="panel panel-default card">
-      <div class="panel-heading card-header">
+<div class="panel panel-default">
+      <div class="panel-heading">
 	      <strong> Email One Time Password </strong>
      </div>
-      <div class="panel-body card-body">
+      <div class="panel-body">

      <FORM METHOD="POST" ACTION="{% url 'email_auth' %}" Id="formLogin" onSubmit="" name="FrontPage_Form1">

@@ -47,16 +46,16 @@
      <div class="row">
 	  <div class="col-sm-12 col-md-12">
 	    <div class="form-group">
-	      <div class="input-group mb-3">
-		<span class="input-group-addon input-group-text">
-		<i class="glyphicon glyphicon-lock bi bi-lock"></i>
+	      <div class="input-group">
+		<span class="input-group-addon">
+		<i class="glyphicon glyphicon-lock"></i>
 		</span>
 		<input class="form-control" size="6" MaxLength="6" value="" placeholder="e.g 55552" name="otp" type="text" id="otp" autofocus>

 	      </div>
 	    </div>

-          <div class="form-group d-grid gap-2">
+          <div class="form-group">

 	      <input type="{% if mode == "auth" %}submit{% elif mode == 'recheck'  %}button{% endif %}" {% if mode == "recheck" %}onclick="send_totp()" {% endif %} class="btn btn-lg btn-success btn-block" value="Sign in">
 	      </div>
@@ -65,7 +64,7 @@
      </FORM>
      </div>
        <div class="row">
-        <div class="col-md-12 mb-3" style="padding-left: 25px">
+        <div class="col-md-6" style="padding-left: 25px">
            {% if request.session.mfa_methods|length > 1 %}
                <a href="{%  url 'mfa_methods_list' %}">Select Another Method</a>
            {% endif %}
@@ -75,4 +74,3 @@
              </div>
 	      </div>
 	      </div>
-</div>
--- a/mfa/templates/FIDO2/Add.html
+++ b/mfa/templates/FIDO2/Add.html
@@ -1,39 +1,29 @@
 {% extends "base.html" %}
 {% load static %}
 {% block head %}
+    <script type="application/javascript" src="{% static 'mfa/js/cbor.js'%}"></script>
    <script type="application/javascript" src="{% static 'mfa/js/ua-parser.min.js'%}"></script>
-    <script type="application/javascript" src="{% static 'mfa/js/base64url.js'%}"></script>
-    <script type="application/javascript" src="{% static 'mfa/js/helpers.js'%}"></script>
    <script type="application/javascript">
-    var MakeCredReq = (makeCredReq) => {
-            makeCredReq.publicKey.challenge = base64url.decode(makeCredReq.publicKey.challenge);
-            makeCredReq.publicKey.user.id   = base64url.decode(makeCredReq.publicKey.user.id);
-
-            for(let excludeCred of makeCredReq.publicKey.excludeCredentials) {
-                excludeCred.id = base64url.decode(excludeCred.id);
-            }
-
-            return makeCredReq
-        }
    function begin_reg(){
    fetch('{% url 'fido2_begin_reg' %}',{}).then(function(response) {
      if(response.ok)
      {
-          return response.json().then(function (req){
-              return MakeCredReq(req)
-          });
+          return response.arrayBuffer();
      }
      throw new Error('Error getting registration data!');
-    }).then(function(options) {
-
-        //options.publicKey.attestation="direct"
+    }).then(CBOR.decode).then(function(options) {
+        options.publicKey.attestation="direct"
        console.log(options)

      return navigator.credentials.create(options);
    }).then(function(attestation) {
      return fetch('{% url 'fido2_complete_reg' %}', {
        method: 'POST',
-        body: JSON.stringify(publicKeyCredentialToJSON(attestation))
+        headers: {'Content-Type': 'application/cbor'},
+        body: CBOR.encode({
+          "attestationObject": new Uint8Array(attestation.response.attestationObject),
+          "clientDataJSON": new Uint8Array(attestation.response.clientDataJSON),
+        })
      });
    }).then(function(response) {

@@ -43,22 +33,17 @@
        {
      if (res["status"] =='OK')
            $("#res").html("<div class='alert alert-success'>Registered Successfully, <a href='{{redirect_html}}'> {{reg_success_msg}}</a></div>")
-      else if (res['status'] = "RECOVERY")
-      {
-          setTimeout(function (){location.href="{% url 'manage_recovery_codes' %}"},2500)
-        $("#res").html("<div class='alert alert-success'>Registered Successfully, but <a href='{% url 'manage_recovery_codes' %}'>redirecting to {{ RECOVERY_METHOD }} method</a></div>")
-      }
        else
-        $("#res").html("<div class='alert alert-danger'>Registration Failed as " + res["message"] + ", <a href='javascript:void(0)' onclick='begin_reg()'> try again or <a href='{% url 'mfa_home' %}'> Go to Security Home</a></div>")
+            $("#res").html("<div class='alert alert-danger'>Registeration Failed as " + res["message"] + ", <a href='javascript:void(0)' onclick='begin_reg()'> try again or <a href='{% url 'mfa_home' %}'> Go to Security Home</a></div>")


    }, function(reason) {
-       $("#res").html("<div class='alert alert-danger'>Registration Failed as " +reason +", <a href='javascript:void(0)' onclick='begin_reg()'> try again </a> or <a href='{% url 'mfa_home' %}'> Go to Security Home</a></div>")
+       $("#res").html("<div class='alert alert-danger'>Registeration Failed as " +reason +", <a href='javascript:void(0)' onclick='begin_reg()'> try again </a> or <a href='{% url 'mfa_home' %}'> Go to Security Home</a></div>")
    })
    }
    $(document).ready(function (){
        ua=new UAParser().getResult()
-        if (ua.browser.name == "Safari" || ua.browser.name == "Mobile Safari" )
+        if (ua.browser.name == "Safari")
        {
                $("#res").html("<button class='btn btn-success' onclick='begin_reg()'>Start...</button>")
        }
@@ -74,11 +59,11 @@
      <br/>
    <br/>
     <div class="container">
-     <div class="panel panel-default card">
-      <div class="panel-heading card-header">
-	      <strong> Adding a New {{ method.name }}</strong>
+     <div class="panel panel-default">
+      <div class="panel-heading">
+	      <strong> FIDO2 Security Key</strong>
      </div>
-      <div class="panel-body card-body">
+      <div class="panel-body">


    <div class="row alert alert-pr" id="res" align="center">
--- a/mfa/templates/FIDO2/Auth_JS.html
+++ b/mfa/templates/FIDO2/Auth_JS.html
@@ -1,80 +0,0 @@
-{% load static %}
-<script type="application/javascript" src="{% static 'mfa/js/base64url.js' %}"></script>
-<script type="application/javascript" src="{% static 'mfa/js/helpers.js' %}"></script>
-<script type="application/javascript" src="{% static 'mfa/js/ua-parser.min.js' %}"></script>
-<script type="text/javascript">
-var GetAssertReq = (getAssert) => {
-           getAssert.publicKey.challenge = base64url.decode(getAssert.publicKey.challenge);
-
-            for(let allowCred of getAssert.publicKey.allowCredentials) {
-                allowCred.id = base64url.decode(allowCred.id);
-            }
-
-            return getAssert
-        }
-        function authen()
-        {
-         fetch('{% url 'fido2_begin_auth' %}', {
-      method: 'GET',
-    }).then(function(response) {
-      if(response.ok) {
-          return response.json().then(function (req){
-              return GetAssertReq(req)
-          });
-      }
-      throw new Error('No credential available to authenticate!');
-    }).then(function(options) {
-        console.log(options)
-      return navigator.credentials.get(options);
-    }).then(function(assertion) {
-
-
-      return fetch('{% url 'fido2_complete_auth' %}', {
-
-        method: 'POST',
-        headers: {'Content-Type': 'application/json'},
-        body:JSON.stringify(publicKeyCredentialToJSON(assertion)),
-
-      }).then(function (response) {if (response.ok) return res = response.json()}).then(function (res) {
-          if (res.status=="OK")
-          {
-              $("#msgdiv").addClass("alert alert-success").removeClass("alert-danger")
-             $("#msgdiv").html("Verified....please wait")
-          {%  if mode == "auth" or mode == None %}
-          window.location.href=res.redirect;
-          {% elif mode == "recheck" %}
-              mfa_success_function();
-          {% endif %}
-          }
-          else {
-              $("#msgdiv").addClass("alert alert-danger").removeClass("alert-success")
-                $("#msgdiv").html("Verification Failed as " + res.message + ", <a href='javascript:void(0)' onclick='authen())'> try again</a> or <a href='javascript:void(0)' onclick='history.back()'> Go Back</a>")
-
-              {%  if mode == "auth" %}
-
-              {% elif mode == "recheck" %}
-
-                mfa_failed_function();
-              {% endif %}
-          }
-      })
-
-                 })
-
-        }
-    $(document).ready(function () {
-        if (location.protocol != 'https:') {
-            $("#main_paragraph").addClass("alert alert-danger")
-            $("#main_paragraph").html("FIDO2 must work under secure context")
-        } else {
-            ua=new UAParser().getResult()
-            if (ua.browser.name == "Safari" || ua.browser.name == "Mobile Safari" || ua.os.name == "iOS" || ua.os.name == "iPadOS")
-                $("#res").html("<button class='btn btn-success' onclick='authen()'>Authenticate...</button>")
-            else
-                authen()
-        }
-    });
-
-
-
-    </script>
--- a/mfa/templates/FIDO2/recheck.html
+++ b/mfa/templates/FIDO2/recheck.html
@@ -1,12 +1,14 @@
 {%  load static %}
+<script type="application/javascript" src="{% static 'mfa/js/cbor.js' %}"></script>
+<script type="application/javascript" src="{% static 'mfa/js/ua-parser.min.js' %}"></script>
 <div class="row">

-<div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2 offset-2 col-8">
-<div class="panel panel-default card">
-      <div class="panel-heading card-header">
+<div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
+<div class="panel panel-default">
+      <div class="panel-heading">
 	      <strong> Security Key</strong>
      </div>
-      <div class="panel-body card-body">
+      <div class="panel-body">

              <div class="row">
            <div style="padding-left: 15px" class="col-md-10 col-md-offset-1" id="main_paragraph" align="center">
@@ -33,7 +35,7 @@
          </div>

          <div class="row">
-          <div class="col-md-12 mb-3" style="padding-left: 25px">
+          <div style="padding-left: 15px">

            {% if request.session.mfa_methods|length > 1 %}
                <a href="{%  url 'mfa_methods_list' %}">Select Another Method</a>
@@ -45,4 +47,71 @@
 </div>
 </div>

-    {% include 'FIDO2/Auth_JS.html' %}
+    <script type="text/javascript">
+        function authen()
+        {
+                         fetch('{% url 'fido2_begin_auth' %}', {
+      method: 'GET',
+    }).then(function(response) {
+      if(response.ok) return response.arrayBuffer();
+      throw new Error('No credential available to authenticate!');
+    }).then(CBOR.decode).then(function(options) {
+        console.log(options)
+      return navigator.credentials.get(options);
+    }).then(function(assertion) {
+        res=CBOR.encode({
+          "credentialId": new Uint8Array(assertion.rawId),
+          "authenticatorData": new Uint8Array(assertion.response.authenticatorData),
+          "clientDataJSON": new Uint8Array(assertion.response.clientDataJSON),
+          "signature": new Uint8Array(assertion.response.signature)
+        });
+
+      return fetch('{% url 'fido2_complete_auth' %}', {
+
+        method: 'POST',
+        headers: {'Content-Type': 'application/cbor'},
+        body:res,
+
+      }).then(function (response) {if (response.ok) return res = response.json()}).then(function (res) {
+          if (res.status=="OK")
+          {
+              $("#msgdiv").addClass("alert alert-success").removeClass("alert-danger")
+             $("#msgdiv").html("Verified....please wait")
+          {%  if mode == "auth" %}
+          window.location.href=res.redirect;
+          {% elif mode == "recheck" %}
+              mfa_success_function();
+          {% endif %}
+          }
+          else {
+              $("#msgdiv").addClass("alert alert-danger").removeClass("alert-success")
+                $("#msgdiv").html("Verification Failed as " + res.message + ", <a href='javascript:void(0)' onclick='authen())'> try again</a> or <a href='javascript:void(0)' onclick='history.back()'> Go Back</a>")
+
+              {%  if mode == "auth" %}
+
+              {% elif mode == "recheck" %}
+
+                mfa_failed_function();
+              {% endif %}
+          }
+      })
+
+                 })
+
+        }
+    $(document).ready(function () {
+        if (location.protocol != 'https:') {
+            $("#main_paragraph").addClass("alert alert-danger")
+            $("#main_paragraph").html("FIDO2 must work under secure context")
+        } else {
+            ua=new UAParser().getResult()
+            if (ua.browser.name == "Safari")
+                $("#res").html("<button class='btn btn-success' onclick='authen()'>Authenticate...</button>")
+            else
+                authen()
+        }
+    });
+
+
+
+    </script>
--- a/mfa/templates/MFA.html
+++ b/mfa/templates/MFA.html
@@ -1,7 +1,6 @@
-{% extends "mfa_base.html" %}
+{% extends "base.html" %}
 {% load static %}
 {% block head %}
-{{block.super}}
    <script type="text/javascript">
    function confirmDel(id) {
        $.ajax({
@@ -19,7 +18,7 @@
        $("#modal-body").html("Are you sure you want to delete '"+name+"'? you may lose access to your system if this your only 2FA.");
        $("#actionBtn").remove()
        $("#modal-footer").prepend("<button id='actionBtn' class='btn btn-danger' onclick='confirmDel("+id+")'>Confirm Deletion</button>")
-        $("#popUpModal").modal('show')
+        $("#popUpModal").modal()
    }

    function toggleKey(id) {
@@ -40,36 +39,35 @@
    <script src="{% static 'mfa/js/bootstrap-toggle.min.js'%}"></script>
 {% endblock %}
 {% block content %}
-{{block.super}}
    <br/>
    <br/>
    <div class="container">
    <div class="row">
-        <div class="offset-5 col-2" style="text-align: center">
+        <div align="center">
            <div class="btn-group">
-            <button class="btn btn-success dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown">
+            <button class="btn btn-success dropdown-toggle" data-toggle="dropdown">
                Add Method&nbsp;<span class="caret"></span>
            </button>
            <ul class="dropdown-menu">
                {% if not 'TOTP' in UNALLOWED_AUTHEN_METHODS %}
-                    <li><a class="dropdown-item" href="{% url 'start_new_otop' %}">{% if 'TOTP' in RENAME_METHODS.keys %}{{ RENAME_METHODS.TOTP }}{% else %}Authenticator app{% endif %}</a></li>
+                    <li><a href="{% url 'start_new_otop' %}">Authenticator app</a></li>
                {% endif %}
                {% if not 'Email' in UNALLOWED_AUTHEN_METHODS %}
-                    <li><a class="dropdown-item" href="{% url 'start_email' %}">{% if 'Email' in RENAME_METHODS.keys %}{{ RENAME_METHODS.Email }}{% else %}Email Token{% endif %}</a></li>
+                    <li><a href="{% url 'start_email' %}">Email Token</a></li>
                {% endif %}
                {% if not 'U2F' in UNALLOWED_AUTHEN_METHODS %}
-                    <li><a class="dropdown-item" href="{% url 'start_u2f' %}">{% if 'U2F' in RENAME_METHODS.keys %}{{ RENAME_METHODS.U2F }}{% else %}Security Key{% endif %}</a></li>
+                    <li><a href="{% url 'start_u2f' %}">Security Key</a></li>
                {% endif %}
            {% if not 'FIDO2' in UNALLOWED_AUTHEN_METHODS %}
-                    <li><a class="dropdown-item" href="{% url 'start_fido2' %}">{% if 'FIDO2' in RENAME_METHODS.keys %}{{ RENAME_METHODS.FIDO2 }}{% else %}FIDO2 Security Key{% endif %}</a></li>
+                    <li><a href="{% url 'start_fido2' %}">FIDO2 Security Key</a></li>
                {% endif %}
            {% if not 'Trusted_Devices' in UNALLOWED_AUTHEN_METHODS %}
-                    <li><a class="dropdown-item" href="{% url 'start_td' %}">{% if 'Trusted_Devices' in  RENAME_METHODS.keys %}{{ RENAME_METHODS.Trusted_Devices }}{% else %}Trusted Device{% endif %}</a></li>
+                    <li><a href="{% url 'start_td' %}">Trusted Device</a></li>
                {% endif %}
            </ul>
            </div>
        </div>
-    </div>
+    <br/>
    <br/>
       <table class="table table-striped">
           <tr>
@@ -82,15 +80,14 @@
               <th>Status</th>
               <th>Delete</th>
           </tr>
-        {% if keys %}
        {% for key in keys %}
           <tr>

-                <td>{{ key.name }}</td>
+               <td>{{ key.key_type }}</td>
               <td>{{ key.added_on }}</td>
-                <td>{% if key.expires %}{{ key.expires }}{% else %}N/A{% endif %}</td>
+               <td>{{ key.expires }}</td>
               <td>{% if key.device %}{{ key.device }}{% endif %}</td>
-                <td>{% if key.last_used %}{{ key.last_used }}{% else %}Never{% endif %}</td>
+               <td>{{ key.last_used }}</td>
                {% if key.key_type in HIDE_DISABLE %}
                    <td>{% if key.enabled %}On{% else %} Off{% endif %}</td>
                {% else %}
@@ -99,25 +96,12 @@
               <td>{% if key.key_type in HIDE_DISABLE %}
                   ----
                   {% else %}
-                        <a href="javascript:void(0)" onclick="deleteKey({{ key.id }},'{{ key.key_type }}')"> <span class="fa fa-trash fa-solid fa-trash-can bi bi-trash-fill"></span></a></td>
+                    <a href="javascript:void(0)" onclick="deleteKey({{ key.id }},'{{ key.key_type }}')"> <span class="fa fa-trash"></span></a></td>
                    {% endif %}
           </tr>
-            {% endfor %}
-            {% if "RECOVERY" not in UNALLOWED_AUTHEN_METHODS %}
-            <tr>
-
-                <td>{{ recovery.name }}</td>
-                <td>{{ recovery.added_on }}</td>
-                <td>N/A</td>
-                <td>N/A</td>
-                <td>{% if recovery.last_used %}{{ recovery.last_used }}{% else %}Never{% endif %}</td>
-                <td>On</td>
-                <td><a href="{% url 'manage_recovery_codes' %}"> <span class="fa fa-wrench fa-solid fa-wrench bi bi-wrench-fill"></span></a></td>
-            </tr>
-            {% endif %}
-        {% else %}
+       {% empty %}
           <tr><td colspan="7" align="center">You didn't have any keys yet.</td> </tr>
-       {% endif %}
+       {% endfor %}
        </table>
    </div>
    </div>
--- a/mfa/templates/RECOVERY/Add.html
+++ b/mfa/templates/RECOVERY/Add.html
@@ -1,134 +0,0 @@
-
-{% extends "base.html" %}
-{% load static %}
-{% block head %}
-<style>
-    #two-factor-steps {
-	border: 1px solid #ccc;
-	border-radius: 3px;
-	padding: 15px;
-    }
-    .tokenrow{
-        margin-top: 10px;
-        margin-left: 5px;
-    }
-    .row{
-        margin: 3px;
-    }
-    .toolbtn {
-        border-radius: 7px;
-        cursor: pointer;
-    }
-    .toolbtn:hover {
-        background-color: gray;
-        transition: 0.2s;
-    }
-    .toolbtn:active {
-        background-color: green;
-        transition: 0.2s;
-    }
-</style>
-
-<script src="{% static 'mfa/js/qrious.min.js' %}" type="text/javascript"></script>
-<script type="text/javascript">
-    var clearCodes;
-    $(document).ready(function checkTokenLeft() {
-        $.ajax({"url":"{% url 'get_recovery_token_left' %}", dataType:"JSON",
-        success:function (data) {
-            tokenLeft = data.left
-            html = ""
-            {% if mfa_redirect %}
-                html += "<div class='alert alert-success'>You have enrolled successfully in {{ mfa_redirect }} method, please generate recovery codes so that you can use in case you lost access to all your verification methods.</div>"
-            {% endif %}
-            if (tokenLeft == 0) {
-                html += "<h6>You don't have any backup code linked to your account, please generate new ones !</h6>"
-                
-            }
-            else {
-                html += "<p>You still have "+tokenLeft+" backup code left."
-            }
-            document.getElementById('tokens').innerHTML = html
-        }})
-    });
-    function confirmRegenerateTokens() {
-        htmlModal = "<h6>Caution! you can only view these token now, else you will need to generate new ones.</h6><div align='center'><button onclick='regenerateTokens()' class='btn btn-success'>Regenerate</button></div>"
-        $("#modal-title").html("Regenerate your recovery Codes?")
-        $("#modal-body").html(htmlModal)
-        $("#popUpModal").modal('show')
-    }
-    function copy() {
-        navigator.clipboard.writeText($("#recovery_codes").text());
-    }
-    function regenerateTokens() {
-        $.ajax({
-            "url":"{% url 'regen_recovery_tokens' %}", dataType:"JSON",
-            success:function (data) {
-                let htmlkey=`<p>Here are the recovery codes, you have to save them now as you won't able to view them again.</p>
-                <div class='row'><div class='offset-4 col-md-4' style='background-color:#f0f0f0;padding: 10px'>
-                    <div class='row'>
-                    <div class="col-6 offset-6">
-                    <span onclick='download_recovery()' class='fa fa-download toolbtn' title="Download"></span>&nbsp;&nbsp;
-                    <span class='fa fa-clipboard toolbtn' title="Copy" onclick="copy()"></span>
-                    </div></div><div id='recovery_codes'><pre>`;
-                for (let i = 0; i < data.keys.length; i++) {
-                        htmlkey +="- " +data.keys[i] + "\n"
-                }
-                document.getElementById('tokens').innerHTML = htmlkey+"</pre></div></div></div>"
-                $("#popUpModal").modal('hide')
-                clearCodes = data.keys
-            }
-        })
-    }
-    function download_recovery() {
-        var element = document.createElement('a');
-        var text = "";
-        for(let i = 0; i < clearCodes.length; i++)
-        {
-            text = text + clearCodes[i] 
-            if (i < clearCodes.length - 1) { text = text + "\n"}
-        }
-        element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text));
-        element.setAttribute('download', 'Recovery Codes.txt');
-        element.style.display = 'none';
-        document.body.appendChild(element);
-        element.click();
-        console.log(element.innerHTML)
-        document.body.removeChild(element);
-    }
-    </script>
-{% endblock %}
-{% block content %}
-<br/>
-<br/>
-<div class="container d-flex justify-content-center">
-    <div class="col-md-6 col-md-offset-3" id="two-factor-steps">
-        
-        <div class="row">
-            
-            <h4>Recovery Codes List</h4>
-        
-        </div>
-            
-        <div class="tokenrow" id="tokens">
-        
-        </div>
-         <br/>
-            <br/>
-        <div class="row">
-
-            <div class="col-md-4 col-md-offset-4" style="padding-left: 0px" align="center">
-
-                <button onclick="confirmRegenerateTokens()" class="btn btn-success">Regenerate</button>
-                
-            </div>
-
-            <div class="col-md-6"  align="right" style="padding-right: 30px">
-
-                <a href="{{redirect_html}}" class="btn btn-default btn-secondary" role="button"> {{reg_success_msg}}</a>
-
-            </div>
-        </div>
-    </div>
-</div>
-{% include "modal.html" %}
-{% endblock %}
--- a/mfa/templates/RECOVERY/Auth.html
+++ b/mfa/templates/RECOVERY/Auth.html
@@ -1,14 +0,0 @@
-{% extends "mfa_auth_base.html" %}
-{% block head %}
-    <style>
-    .row{
-        margin-left: 15px;
-    }
-    </style>
-{% endblock %}
-{% block content %}
-<br/>
-<br/>
-{% include "RECOVERY/recheck.html" with mode='auth' %}
-
-  {% endblock %}
--- a/mfa/templates/RECOVERY/recheck.html
+++ b/mfa/templates/RECOVERY/recheck.html
@@ -1,85 +0,0 @@
-<script type="application/javascript">
-    $(document).ready(function showWarningLastBackup() {
-        {% if lastBackup %}
-        $("#modal-title").html("Last backup code used !")
-        $("#modal-body").html("Don't forget to regenerate new backup code after login !")
-        $('#modal-footer').html(`<FORM METHOD="GET" ACTION="{% url 'recovery_auth' %}" Id="confirmLogin" onSubmit="" name="recoveryLastBackupConfirm">
-        <input type='submit'class='btn btn-lg btn-success btn-block' value='Continue'>`)
-        $("#popUpModal").modal('show')
-        {% endif %}
-        return
-    });
-    function send_recovery() {
-        $.ajax({"url":"{% url 'recovery_recheck' %}", method:"POST",dataType:"JSON",
-            data:{"csrfmiddlewaretoken":"{{ csrf_token }}","recovery":$("#recovery").val()},
-         success:function (data) {
-                            if (data["recheck"])
-                                mfa_success_function();
-                            else {
-                                mfa_failed_function();
-                            }
-                        }
-        })
-    }
-</script>
-<div class="row">
-<div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-10 col-lg-offset-1">
-<div class="panel panel-default card">
-      <div class="panel-heading card-header">
-	      <strong> Recovery code</strong>
-      </div>
-      <div class="panel-body card-body">
-
-      <FORM METHOD="POST" ACTION="{% url 'recovery_auth' %}" Id="formLogin" onSubmit="" name="FrontPage_Form1">
-
-
-      {% csrf_token %}
-          {%  if invalid %}
-          <div class="alert alert-danger">
-              Sorry, The provided code is not valid, or has already been used.
-          </div>
-          {% endif %}
-      {% if quota %}
-          <div class="alert alert-warning">
-              {{ quota }}
-          </div>
-      {% endif %}
-      <fieldset>
-      <div class="row">
-      <div class="col-sm-12 col-md-12">
-        <p>Enter the 11-digits on your authenticator. Or input a recovery code</p>
-      </div>
-      </div>
-
-      <div class="row">
-	  <div class="col-sm-12 col-md-12">
-	    <div class="form-group">
-	      <div class="input-group mb-3">
-		<span class="input-group-addon input-group-text">
-		<i class="glyphicon glyphicon-lock bi bi-lock"></i>
-		</span>
-		<input class="form-control" size="11" MaxLength="11" value="" placeholder="e.g abcde-fghij" name="recovery" type="text" id="recovery" autofocus>
-
-	      </div>
-	    </div>
-
-          <div class="form-group d-grid gap-2">
-
-            <input type="{% if mode == "auth" %}submit{% elif mode == 'recheck'  %}button{% endif %}" {% if mode == "recheck" %}onclick="send_recovery()" {% endif %} class="btn btn-lg btn-success btn-block" value="Sign in">
-	      </div>
-      </div>
-      </fieldset>
-      </FORM>
-      </div>
-        <div class="row">
-        <div class="col-md-12 mb-3" style="padding-left: 25px">
-            {% if request.session.mfa_methods|length > 1 %}
-                <a href="{%  url 'mfa_methods_list' %}">Select Another Method</a>
-            {% endif %}
-        </div>
-        </div>
-	      </div>
-              </div>
-</div>
-</div>
-{% include "modal.html" %}
--- a/mfa/templates/TOTP/Add.html
+++ b/mfa/templates/TOTP/Add.html
@@ -7,22 +7,10 @@
 	border: 1px solid #ccc;
 	border-radius: 3px;
 	padding: 15px;
-    }
+}
    .row{
        margin: 0px;
    }
-    .toolbtn {
-        border-radius: 7px;
-        cursor: pointer;
-    }
-    .toolbtn:hover {
-        background-color: gray;
-        transition: 0.2s;
-    }
-    .toolbtn:active {
-        background-color: green;
-        transition: 0.2s;
-    }
    </style>
 <script src="{% static 'mfa/js/qrious.min.js' %}" type="text/javascript"></script>
 <script type="text/javascript">
@@ -41,17 +29,8 @@
        })
    });
    function showKey() {
-        const htmlkey = `
-            <div class="row">
-                <div class="col-11">
-                    <pre id="totp_secret">`+window.key+`</pre>
-                </div>
-                <div class="col-1">
-                    <span onclick=navigator.clipboard.writeText($("#totp_secret").text()) class="fa fa-clipboard toolbtn"></span>
-                </div>
-            </div>`
        $("#modal-title").html("Your Secret Key")
-        $("#modal-body").html(htmlkey)
+        $("#modal-body").html("<pre>"+window.key+"</pre")
        $("#popUpModal").modal('show')
    }
    function verify() {
@@ -59,16 +38,13 @@
        $.ajax({
            "url":"{% url 'verify_otop' %}?key="+key+ "&answer="+answer,
            success:function (data) {
-            if (data =='Success')
-                $("#res").html("<div class='alert alert-success'>Your authenticator is registered successfully, <a href='{{redirect_html}}'> {{reg_success_msg}}</a></div>")
-      else if (data == "RECOVERY")
-      {
-         setTimeout(function (){location.href="{% url 'manage_recovery_codes' %}"},2500)
-        $("#res").html("<div class='alert alert-success'>Your authenticator is registered successfully, but <a href='{% url 'manage_recovery_codes' %}'>redirecting to {{ RECOVERY_METHOD }} method</a></div>")
-      }
+                if (data == "Error")
+                    alert("You entered wrong numbers, please try again")
                else
-        $("#res").html("<div class='alert alert-danger'>The code provided doesn't match the key, please try again or <a href='{% url 'mfa_home' %}'> Go to Security Home</a></div>")
-
+                {
+                    alert("Your authenticator is added successfully.")
+                    window.location.href="{{ redirect_html }}"
+                }
            }
        })
    }
@@ -87,26 +63,23 @@
 {% block content %}
 <br/>
 <br/>
-<div class="container d-flex justify-content-center">
+<div class="container">
    <div class="col-md-6 col-md-offset-3" id="two-factor-steps">
        <div class="row" align="center">
-            <h4>Adding a new {{ method.name }}</h4>
+            <h4>Adding Authenticator</h4>
        </div>
        <div class="row">

            <p>Scan the image below with the two-factor authentication app on your <a href="javascript:void(0)" onclick="showTOTP()">phone/PC</a>. If you can’t use a barcode,
                <a href="javascript:void(0)" onclick="showKey()">enter this text</a> instead. </p>
        </div>
-        <div id="res">

-        </div>
-        <div class="row" style="text-align: center">
+        <div class="row">

-            <div align="center" style="display: none;text-align: center;align-content: center" id="second_step">
+            <div align="center" style="display: none" id="second_step">

                <img id="qr"/>

-            </div>
            </div>
            <div class="row">

@@ -115,14 +88,17 @@

            </div>
            <div class="row">
-                <div class="offset-md-4 col-md-4">
+
+
                <input style="display: inline;width: 95%" maxlength="6" size="6" class="form-control" id="answer" placeholder="e.g 785481"/>
-                </div>
+
            </div>
            <div class="row" style="padding-top: 10px;">
-                <div class="col-md-4 offset-md-4" style="padding-left: 0px">
+                <div class="col-md-6" style="padding-left: 0px">
                    <button class="btn btn-success" onclick="verify()">Enable</button>
-                    <a href="{% url 'mfa_home' %}" class="btn btn-default btn-secondary" role="button">Cancel</a>
+                </div>
+                <div class="col-md-6" align="right" style="padding-right: 30px">
+                    <a href="{% url 'mfa_home' %}"><button class="btn btn-default">Cancel</button></a>
                </div>
            </div>
        </div>
--- a/mfa/templates/TOTP/recheck.html
+++ b/mfa/templates/TOTP/recheck.html
@@ -10,17 +10,17 @@
                            }
                        }
        })
+
    }
 </script>
-<div class='container'>
 <div class="row">

 <div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
-<div class="panel panel-default card">
-      <div class="panel-heading card-header">
+<div class="panel panel-default">
+      <div class="panel-heading">
 	      <strong> One Time Password</strong>
      </div>
-      <div class="panel-body card-body">
+      <div class="panel-body">

      <FORM METHOD="POST" ACTION="{% url 'totp_auth' %}" Id="formLogin" onSubmit="" name="FrontPage_Form1">

@@ -28,7 +28,7 @@
      {% csrf_token %}
          {%  if invalid %}
          <div class="alert alert-danger">
-              Sorry, The provided token is not valid.
+              {{ invalid_msg }}
          </div>
          {% endif %}
      {% if quota %}
@@ -39,31 +39,32 @@
      <fieldset>
      <div class="row">
      <div class="col-sm-12 col-md-12">
-        <p>Enter the 6-digits on your authenticator</p>
+        <p>Enter the 6-digits on your authenticator.</p>
      </div>
      </div>

      <div class="row">
 	  <div class="col-sm-12 col-md-12">
 	    <div class="form-group">
-	      <div class="input-group mb-3">
-		<span class="input-group-addon input-group-text">
-		<i class="glyphicon glyphicon-lock bi bi-lock"></i>
+	      <div class="input-group">
+		<span class="input-group-addon">
+		<i class="glyphicon glyphicon-lock"></i>
 		</span>
 		<input class="form-control" size="6" MaxLength="6" value="" placeholder="e.g 55552" name="otp" type="text" id="otp" autofocus>

 	      </div>
 	    </div>

-          <div class="form-group d-grid gap-2">
+          <div class="form-group">

-            <input type="{% if mode == "auth" %}submit{% elif mode == 'recheck'  %}button{% endif %}" {% if mode == "recheck" %}onclick="send_totp()" {% endif %} class="btn btn-lg btn-success btn-block" value="Sign in">	      </div>
+	      <input type="{% if mode == "auth" %}submit{% elif mode == 'recheck'  %}button{% endif %}" {% if mode == "recheck" %}onclick="send_totp()" {% endif %} class="btn btn-lg btn-success btn-block" value="Sign in">
+	      </div>
      </div>
      </fieldset>
      </FORM>
      </div>
        <div class="row">
-        <div class="col-md-12 mb-3" style="padding-left: 25px">
+        <div class="col-md-6" style="padding-left: 25px">
            {% if request.session.mfa_methods|length > 1 %}
                <a href="{%  url 'mfa_methods_list' %}">Select Another Method</a>
            {% endif %}
@@ -73,5 +74,3 @@
              </div>
 	      </div>
 	      </div>
-</div>
-{% include "modal.html" %}
--- a/mfa/templates/TrustedDevices/Add.html
+++ b/mfa/templates/TrustedDevices/Add.html
@@ -31,11 +31,11 @@
 <div class="row">

 <div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
-<div class="panel panel-default card">
-      <div class="panel-heading card-header">
+<div class="panel panel-default">
+      <div class="panel-heading">
 	      <strong> Add Trusted Device</strong>
      </div>
-      <div class="panel-body card-body">
+      <div class="panel-body">
        {%  if success %}
            <div class="alert alert-warning">
                Please check your PC window, to continue the process.
@@ -67,31 +67,31 @@
      <div class="row">
 	  <div class="col-sm-12 col-md-12">
 	    <div class="form-group">
-	      <div class="input-group mb-3">
-		<span class="input-group-addon input-group-text">
-		<i class="glyphicon glyphicon-user bi bi-person"></i>
+	      <div class="input-group">
+		<span class="input-group-addon">
+		<i class="glyphicon glyphicon-user"></i>
 		</span>
 		<input class="form-control" id="username" size="30" MaxLength="30" placeholder="Username" name="username" value="{{ username }}" type="text" autofocus autocomplete="on">

 	      </div>
 	    </div>
 	    <div class="form-group">
-		<div class="input-group mb-3">
-		<span class="input-group-addon input-group-text">
+		<div class="input-group">
+		<span class="input-group-addon">
 		<i class="fa fa-key"></i>
 		</span>
 		<input class="form-control" placeholder="e.g GAK-Y2M" id='key' style="text-transform: uppercase" name="key" type="text" size="9" MaxLength="9" value="{{ key }}">
 		</div>
 	    </div>
           <div class="form-group">
-		<span class="input-group mb-3">
+		<span class="input-group">
            <input id='agree' name="agree" type="checkbox"><span style="color: red"> I confirm that this device is mine and it is only used by me.</span>

 	    </div>
      {% comment %}
 	    <div class="form-group">
-	      <div class="input-group mb-3">
-	      <span class="input-group-addon input-group-text">
+	      <div class="input-group">
+	      <span class="input-group-addon">


 	      <select size="1" name="Institution_Code" style="font-size: 10pt; font-family: Calibri; height: 34px;width: 230px">
@@ -104,7 +104,7 @@
 	      </div>
 	      </div>
 	      {% endcomment %}
-	      <div class="form-group d-grid gap-2">
+	      <div class="form-group">
 	      <input type="submit" class="btn btn-lg btn-success btn-block" value="Trust Device">
 	      </div>
 	      </div>
@@ -113,7 +113,7 @@
 	      </form>
      {% endif %}
 	      </div>
-	      <div class="panel-footer card-footer">
+	      <div class="panel-footer ">


 	      </div>
--- a/mfa/templates/TrustedDevices/Done.html
+++ b/mfa/templates/TrustedDevices/Done.html
@@ -7,17 +7,17 @@
 <div class="row">

 <div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
-<div class="panel panel-default card">
-      <div class="panel-heading card-header">
+<div class="panel panel-default">
+      <div class="panel-heading">
 	      <strong> Add Trusted Device</strong>
      </div>
-      <div class="panel-body card-body">
+      <div class="panel-body">
            <div class="alert alert-success">
                Your device is now trusted, please try to <a href="{{ HOST }}{{ BASE_URL }}accounts/login/"> login</a>
            </div>

 	      </div>
-	      <div class="panel-footer card-footer">
+	      <div class="panel-footer ">


 	      </div>
--- a/mfa/templates/TrustedDevices/start.html
+++ b/mfa/templates/TrustedDevices/start.html
@@ -15,7 +15,7 @@
    function sendEmail() {
        $("#modal-title").html("Send Link")
        $("#modal-body").html("Sending Email, Please wait....");
-        $("#popUpModal").modal('show');
+        $("#popUpModal").modal();
        $.ajax({
            "url":"{% url 'td_sendemail' %}",
            success:function (data) {
@@ -60,7 +60,7 @@
                    $("#actionBtn").remove();
                    $("#modal-footer").prepend("<button id='actionBtn' class='btn btn-success' onclick='checkMFA()'>Trust Device</button>")
                    $("#modal-body").html(data)
-                    $("#popUpModal").modal('show');
+                    $("#popUpModal").modal()
                }
            }
        })
--- a/mfa/templates/U2F/Add.html
+++ b/mfa/templates/U2F/Add.html
@@ -13,7 +13,7 @@
    </style>
    <script src="{% static 'mfa/js/u2f-api.js' %}" type="text/javascript"></script>
    <script type="text/javascript">
-    function addToken() {
+    $(document).ready(function addToken() {
                data=JSON.parse('{{ token|safe }}')
                console.log(data)
                u2f.register(data.appId,data.registerRequests,data.registeredKeys,function (response) {
@@ -21,24 +21,15 @@
                        "url":"{% url 'bind_u2f' %}",method:"POST",
                        data:{"csrfmiddlewaretoken":"{{ csrf_token }}","response":JSON.stringify(response)},
                        success:function (data) {
-                        if (data =='OK')
-                            $("#res").html("<div class='alert alert-success'>Your device is registered successfully, <a href='{{redirect_html}}'> {{reg_success_msg}}</a></div>")
-                        else if (data == "RECOVERY")
+                            if (data == "OK")
                            {
-                            setTimeout(function (){location.href="{% url 'manage_recovery_codes' %}"},2500)
-                            $("#res").html("<div class='alert alert-success'>Your device is registered successfully, but <a href='{% url 'manage_recovery_codes' %}'>redirecting to {{ RECOVERY_METHOD }} method</a></div>")
+                                alert("Your device is added successfully.")
+                                window.location.href="{{ redirect_html }}"
                            }
-                        else
-                            $("#res").html("<div class='alert alert-danger'>Registration failed, please <a href='javascript:void(0)' onclick='addToken()'>try again</a> or <a href='{% url 'mfa_home' %}'> Go to Security Home</a></div>")
-                    },
-                        error: function (data)
-                        {
-                             $("#res").html("<div class='alert alert-danger'>Registration failed, please <a href='javascript:void(0)' onclick='addToken()'>try again</a> or <a href='{% url 'mfa_home' %}'> Go to Security Home</a></div>")
                        }
                    })
                },5000)
-            }
-    $(document).ready(addToken())
+            })

    </script>
 {% endblock %}
@@ -46,11 +37,9 @@
      <br/>
    <br/>
    <div class="container">
-
        <div class="col-md-6 col-md-offset-3" id="two-factor-steps">
-            <div id="res"></div>
            <div class="row" align="center">
-                <h4>Adding {{ method.name}}</h4>
+                <h4>Adding Security Key</h4>
            </div>
    <div class="row">
    <p style="color: green">Your secure Key should be flashing now, please press on button.</p>
--- a/mfa/templates/U2F/recheck.html
+++ b/mfa/templates/U2F/recheck.html
@@ -2,11 +2,11 @@
 <div class="row">

 <div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
-<div class="panel panel-default card">
-      <div class="panel-heading card-header">
-	      <strong> Verify your identity using {{ method.name }}</strong>
+<div class="panel panel-default">
+      <div class="panel-heading">
+	      <strong> Security Key</strong>
      </div>
-      <div class="panel-body card-body">
+      <div class="panel-body">

              <div class="row">
            <div style="padding-left: 15px" class="col-md-10 col-md-offset-1" id="main_paragraph" align="center">
@@ -24,7 +24,7 @@
          </div>

          <div class="row">
-          <div class="col-md-12 mb-3" style="padding-left: 15px">
+          <div style="padding-left: 15px">

            {% if request.session.mfa_methods|length > 1 %}
                <a href="{%  url 'mfa_methods_list' %}">Select Another Method</a>
--- a/mfa/templates/mfa_base.html
+++ b/mfa/templates/mfa_base.html
@@ -1,7 +0,0 @@
-{% extends 'base.html' %}
-{% block head %}
-{{ block.super }}
-{% endblock %}
-{% block content %}
-{{ block.super }}
-{% endblock %}
--- a/mfa/templates/mfa_check.html
+++ b/mfa/templates/mfa_check.html
@@ -24,7 +24,7 @@
                {
                    $("#modal-title").html("Recheck Indentity")
                    $("#modal-body").html(data["html"])
-                    $("#popUpModal").modal('show')
+                    $("#popUpModal").modal()
                }


--- a/mfa/templates/modal.html
+++ b/mfa/templates/modal.html
@@ -2,15 +2,15 @@
  <div class="modal-dialog" style="height: 80%;width: 80%;">
    <div class="modal-content" >
      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
        <h4 class="modal-title" id="modal-title"></h4>
-          <button type="button" class="close" data-dismiss="modal" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
      </div>
      <div class="modal-body" id="modal-body" >


          </div>
      <div class="modal-footer" id="modal-footer">
-        <button type="button" class="btn btn-default btn-secondary" id='btnModalClose' data-dismiss="modal" data-bs-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-default" id='btnModalClose' data-dismiss="modal">Close</button>
      </div>

    </div><!-- /.modal-content -->
--- a/mfa/templates/select_mfa_method.html
+++ b/mfa/templates/select_mfa_method.html
@@ -1,32 +1,29 @@
 {% extends "mfa_auth_base.html" %}
 {% block content %}
+    <br/>
 <br/>
-<div class='container'>
 <div class="row">

-<div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2 offset-2 col-8">
-<div class="panel panel-default card">
-      <div class="panel-heading card-header">
+<div class="col-sm-10 col-sm-offset-1 col-xs-12 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
+<div class="panel panel-default">
+      <div class="panel-heading">
 	      <strong> Select Second Verification Method</strong>
      </div>
-      <div class="panel-body card-body">
+      <div class="panel-body">
          <ul>
              {% for method in request.session.mfa_methods %}

              <li><a href="{% url "mfa_goto" method %}">
-                  {% if method == "TOTP" %}{% if 'TOTP' in RENAME_METHODS %}{{ RENAME_METHODS.TOTP }}{% else %}Authenticator App{% endif %}
-                  {% elif method == "Email" %}{% if 'Email' in RENAME_METHODS %}{{ RENAME_METHODS.Email }}{% else %}Send OTP by Email{% endif %}
-                  {% elif method == "U2F" %}{% if 'U2F' in RENAME_METHODS %}{{ RENAME_METHODS.U2F }}{% else %}Secure Key{% endif %}
-                  {% elif method == "FIDO2" %}{% if 'FIDO2' in RENAME_METHODS %}{{ RENAME_METHODS.FIDO2 }}{% else %}FIDO2 Secure Key{% endif %}
-                  {% elif method == "RECOVERY" %}{% if 'RECOVERY' in RENAME_METHODS %}{{ RENAME_METHODS.RECOVERY }}{% else %}Recovery Code{% endif %}
+                  {% if method == "TOTP" %}Authenticator App
+                  {% elif method == "Email" %}Send OTP by Email
+                  {% elif method == "U2F" %}Secure Key
+                  {% elif method == "FIDO2" %}FIDO2 Secure Key
                  {% endif %}
              </a> </li>
              {% endfor %}
          </ul>
      </div>
 </div>
-</div>
-
 </div>
 </div>
 {% endblock %}
--- a/mfa/tests.py
+++ b/mfa/tests.py
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
--- a/mfa/totp.py
+++ b/mfa/totp.py
@@ -1,90 +1,120 @@
-from django.shortcuts import render
-from django.views.decorators.cache import never_cache
-from django.http import HttpResponse
-from .Common import get_redirect_url
-from .models import *
-from django.template.context_processors import csrf
-import simplejson
-from django.conf import settings
-import pyotp
-from .views import login
 import datetime
-from django.utils import timezone
 import random
+import time
+
+import pyotp
+from django.conf import settings
+from django.http import HttpResponse, JsonResponse
+from django.shortcuts import render
+from django.template.context_processors import csrf
+from django.utils import timezone
+from django.views.decorators.cache import never_cache
+
+from .Common import get_redirect_url
+from .models import UserKey, OTPTracker
+from .views import login


-def verify_login(request,username,token):
-    for key in User_Keys.objects.filter(username=username,key_type = "TOTP"):
+def verify_login(request, username, token):
+    FAILURE_LIMIT = getattr("settings", "MFA_TOTP_FAILURE_LIMIT", 3)
+    start_time = timezone.now() + datetime.timedelta(
+        minutes=-1 * getattr(settings, "MFA_TOTP_FAILURE_WINDOW", 5)
+    )
+    if (
+        OTPTracker.objects.filter(
+            done_on__gt=start_time, actor=username, success=0
+        ).count()
+        >= FAILURE_LIMIT
+    ):
+        return [
+            False,
+            "Using this method is temporarily suspended on your account, use another method, or later again later ",
+        ]
+    for key in UserKey.objects.filter(username=username, key_type="TOTP"):
        totp = pyotp.TOTP(key.properties["secret_key"])
-        if  totp.verify(token,valid_window = 30):
-            key.last_used=timezone.now()
+        if totp.verify(token, valid_window=30):
+            if OTPTracker.objects.filter(actor=username, value=token).exists():
+                return [
+                    False,
+                    "This code is used before, please generate another token",
+                ]
+            OTPTracker.objects.create(actor=username, value=token, success=True)
+            key.last_used = timezone.now()
            key.save()
-            return [True,key.id]
-    return [False]
+            return [True, key.id]
+    OTPTracker.objects.create(actor=username, value=token, success=False)
+    return [False, "Invalid Token"]
+

 def recheck(request):
    context = csrf(request)
-    context["mode"]="recheck"
+    context["mode"] = "recheck"
    if request.method == "POST":
-        if verify_login(request,request.user.username, token=request.POST["otp"])[0]:
-            import time
+        if verify_login(request, request.user.username, token=request.POST["otp"]):
            request.session["mfa"]["rechecked_at"] = time.time()
-            return HttpResponse(simplejson.dumps({"recheck": True}), content_type="application/json")
+            return JsonResponse({"recheck": True})
        else:
-            return HttpResponse(simplejson.dumps({"recheck": False}), content_type="application/json")
-    return render(request,"TOTP/recheck.html", context)
+            return JsonResponse({"recheck": False})
+    return render(request, "TOTP/recheck.html", context)
+

@never_cache
 def auth(request):
-    context=csrf(request)
-    if request.method=="POST":
-        tokenLength = len(request.POST["otp"])
-        if tokenLength == 6:
-            #TOTO code check
-            res=verify_login(request,request.session["base_username"],token = request.POST["otp"])
+    context = csrf(request)
+    if request.method == "POST":
+        res = verify_login(
+            request, request.session["base_username"], token=request.POST["otp"]
+        )
        if res[0]:
-                mfa = {"verified": True, "method": "TOTP","id":res[1]}
+            mfa = {"verified": True, "method": "TOTP", "id": res[1]}
            if getattr(settings, "MFA_RECHECK", False):
-                    mfa["next_check"] = datetime.datetime.timestamp((datetime.datetime.now()
+                mfa["next_check"] = datetime.datetime.timestamp(
+                    (
+                        datetime.datetime.now()
                        + datetime.timedelta(
-                                seconds=random.randint(settings.MFA_RECHECK_MIN, settings.MFA_RECHECK_MAX))))
+                            seconds=random.randint(
+                                settings.MFA_RECHECK_MIN, settings.MFA_RECHECK_MAX
+                            )
+                        )
+                    )
+                )
            request.session["mfa"] = mfa
            return login(request)
-        context["invalid"]=True
-    return render(request,"TOTP/Auth.html", context)
+        context["invalid"] = True
+        context["invalid_msg"] = res[1]
+    return render(request, "TOTP/Auth.html", context)


-
-def getToken(request):
-    secret_key=pyotp.random_base32()
+def get_token(request):
+    secret_key = pyotp.random_base32()
    totp = pyotp.TOTP(secret_key)
-    request.session["new_mfa_answer"]=totp.now()
-    return HttpResponse(simplejson.dumps({"qr":pyotp.totp.TOTP(secret_key).provisioning_uri(str(request.user.username), issuer_name = settings.TOKEN_ISSUER_NAME),
-                         "secret_key": secret_key}))
+    request.session["new_mfa_answer"] = totp.now()
+    return JsonResponse(
+        {
+            "qr": pyotp.totp.TOTP(secret_key).provisioning_uri(
+                str(request.user.username), issuer_name=settings.TOKEN_ISSUER_NAME
+            ),
+            "secret_key": secret_key,
+        }
+    )
+
+
 def verify(request):
-    answer=request.GET["answer"]
-    secret_key=request.GET["key"]
+    answer = request.GET["answer"]
+    secret_key = request.GET["key"]
    totp = pyotp.TOTP(secret_key)
-    if totp.verify(answer,valid_window = 60):
-        uk=User_Keys()
-        uk.username=request.user.username
-        uk.properties={"secret_key":secret_key}
-        #uk.name="Authenticatior #%s"%User_Keys.objects.filter(username=user.username,type="TOTP")
-        uk.key_type="TOTP"
+    if totp.verify(answer, valid_window=60):
+        uk = UserKey()
+        uk.username = request.user.username
+        uk.properties = {"secret_key": secret_key}
+        uk.key_type = "TOTP"
        uk.save()
-        if getattr(settings, 'MFA_ENFORCE_RECOVERY_METHOD', False) and not User_Keys.objects.filter(key_type="RECOVERY",
-                                                                                                    username=request.user.username).exists():
-            request.session["mfa_reg"] = {"method": "TOTP",
-                                          "name": getattr(settings, "MFA_RENAME_METHODS", {}).get("TOTP", "TOTP")}
-            return HttpResponse("RECOVERY")
-        else:
        return HttpResponse("Success")
-    else: return HttpResponse("Error")
+    else:
+        return HttpResponse("Error")
+

@never_cache
 def start(request):
    """Start Adding Time One Time Password (TOTP)"""
-    context = get_redirect_url()
-    context["RECOVERY_METHOD"] = getattr(settings, "MFA_RENAME_METHODS", {}).get("RECOVERY", "Recovery codes")
-    context["method"] = {"name":getattr(settings,"MFA_RENAME_METHODS",{}).get("TOTP","Authenticator")}
-    return render(request,"TOTP/Add.html",context)
+    return render(request, "TOTP/Add.html", get_redirect_url())
--- a/mfa/urls.py
+++ b/mfa/urls.py
@@ -1,56 +1,41 @@
-from . import views,totp,U2F,TrustedDevice,helpers,FIDO2,Email,recovery
-#app_name='mfa'
+from django.urls import path
+
+from . import FIDO2, U2F, Email, TrustedDevice, helpers, totp, views

-try:
-    from django.urls import  re_path as url
-except:
-     from django.conf.urls import  url
 urlpatterns = [
-    url(r'totp/start/', totp.start , name="start_new_otop"),
-    url(r'totp/getToken', totp.getToken , name="get_new_otop"),
-    url(r'totp/verify', totp.verify, name="verify_otop"),
-    url(r'totp/auth', totp.auth, name="totp_auth"),
-    url(r'totp/recheck', totp.recheck, name="totp_recheck"),
-
-    url(r'recovery/start', recovery.start, name="manage_recovery_codes"),
-    url(r'recovery/getTokenLeft', recovery.getTokenLeft, name="get_recovery_token_left"),
-    url(r'recovery/genTokens', recovery.genTokens, name="regen_recovery_tokens"),
-    url(r'recovery/auth', recovery.auth, name="recovery_auth"),
-    url(r'recovery/recheck', recovery.recheck, name="recovery_recheck"),
-
-    url(r'email/start/', Email.start , name="start_email"),
-    url(r'email/auth/', Email.auth , name="email_auth"),
-
-    url(r'u2f/$', U2F.start, name="start_u2f"),
-    url(r'u2f/bind', U2F.bind, name="bind_u2f"),
-    url(r'u2f/auth', U2F.auth, name="u2f_auth"),
-    url(r'u2f/process_recheck', U2F.process_recheck, name="u2f_recheck"),
-    url(r'u2f/verify', U2F.verify, name="u2f_verify"),
-
-    url(r'fido2/$', FIDO2.start, name="start_fido2"),
-    url(r'fido2/auth', FIDO2.auth, name="fido2_auth"),
-    url(r'fido2/begin_auth', FIDO2.authenticate_begin, name="fido2_begin_auth"),
-    url(r'fido2/complete_auth', FIDO2.authenticate_complete, name="fido2_complete_auth"),
-    url(r'fido2/begin_reg', FIDO2.begin_registeration, name="fido2_begin_reg"),
-    url(r'fido2/complete_reg', FIDO2.complete_reg, name="fido2_complete_reg"),
-    url(r'fido2/recheck', FIDO2.recheck, name="fido2_recheck"),
-
-
-    url(r'td/$', TrustedDevice.start, name="start_td"),
-    url(r'td/add', TrustedDevice.add, name="add_td"),
-    url(r'td/send_link', TrustedDevice.send_email, name="td_sendemail"),
-    url(r'td/get-ua', TrustedDevice.getUserAgent, name="td_get_useragent"),
-    url(r'td/trust', TrustedDevice.trust_device, name="td_trust_device"),
-    url(r'u2f/checkTrusted', TrustedDevice.checkTrusted, name="td_checkTrusted"),
-    url(r'u2f/secure_device', TrustedDevice.getCookie, name="td_securedevice"),
-
-    url(r'^$', views.index, name="mfa_home"),
-    url(r'goto/(.*)', views.goto, name="mfa_goto"),
-    url(r'selct_method', views.show_methods, name="mfa_methods_list"),
-    url(r'recheck', helpers.recheck, name="mfa_recheck"),
-    url(r'toggleKey', views.toggleKey, name="toggle_key"),
-    url(r'delete', views.delKey, name="mfa_delKey"),
-    url(r'reset', views.reset_cookie, name="mfa_reset_cookie"),
-
-            ]
-# print(urlpatterns)
+    path("totp/start/", totp.start, name="start_new_otop"),
+    path("totp/getToken/", totp.get_token, name="get_new_otop"),
+    path("totp/verify/", totp.verify, name="verify_otop"),
+    path("totp/auth/", totp.auth, name="totp_auth"),
+    path("totp/recheck/", totp.recheck, name="totp_recheck"),
+    path("email/start/", Email.start, name="start_email"),
+    path("email/auth/", Email.auth, name="email_auth"),
+    path("u2f/", U2F.start, name="start_u2f"),
+    path("u2f/bind/", U2F.bind, name="bind_u2f"),
+    path("u2f/auth/", U2F.auth, name="u2f_auth"),
+    path("u2f/process_recheck/", U2F.process_recheck, name="u2f_recheck"),
+    path("u2f/verify/", U2F.verify, name="u2f_verify"),
+    path("fido2/", FIDO2.start, name="start_fido2"),
+    path("fido2/auth/", FIDO2.auth, name="fido2_auth"),
+    path("fido2/begin_auth/", FIDO2.authenticate_begin, name="fido2_begin_auth"),
+    path(
+        "fido2/complete_auth/", FIDO2.authenticate_complete, name="fido2_complete_auth"
+    ),
+    path("fido2/begin_reg/", FIDO2.begin_registeration, name="fido2_begin_reg"),
+    path("fido2/complete_reg/", FIDO2.complete_reg, name="fido2_complete_reg"),
+    path("fido2/recheck/", FIDO2.recheck, name="fido2_recheck"),
+    path("td/", TrustedDevice.start, name="start_td"),
+    path("td/add/", TrustedDevice.add, name="add_td"),
+    path("td/send_link/", TrustedDevice.send_email, name="td_sendemail"),
+    path("td/get-ua/", TrustedDevice.get_user_agent, name="td_get_useragent"),
+    path("td/trust/", TrustedDevice.trust_device, name="td_trust_device"),
+    path("u2f/checkTrusted/", TrustedDevice.check_trusted, name="td_checkTrusted"),
+    path("u2f/secure_device", TrustedDevice.get_cookie, name="td_securedevice"),
+    path("", views.index, name="mfa_home"),
+    path("goto/<method>/", views.goto, name="mfa_goto"),
+    path("selct_method/", views.show_methods, name="mfa_methods_list"),
+    path("recheck/", helpers.recheck, name="mfa_recheck"),
+    path("toggleKey/", views.toggle_key, name="toggle_key"),
+    path("delete/", views.del_key, name="mfa_delKey"),
+    path("reset/", views.reset_cookie, name="mfa_reset_cookie"),
+]
--- a/mfa/views.py
+++ b/mfa/views.py
@@ -1,104 +1,97 @@
 import importlib

-from django.shortcuts import render
-from django.http import HttpResponse,HttpResponseRedirect
-from .models import *
-try:
-    from django.urls import reverse
-except:
-    from django.core.urlresolvers import reverse
-from django.template.context_processors import csrf
-from django.template.context import RequestContext
 from django.conf import settings
-from . import TrustedDevice
 from django.contrib.auth.decorators import login_required
+from django.http import HttpResponse, HttpResponseRedirect
+from django.shortcuts import render
+from django.urls import reverse
 from user_agents import parse

+from . import TrustedDevice
+from .models import UserKey
+
+
@login_required
 def index(request):
-    keys=[]
-    context={"keys":User_Keys.objects.filter(username=request.user.username),"UNALLOWED_AUTHEN_METHODS":settings.MFA_UNALLOWED_METHODS
-             ,"HIDE_DISABLE":getattr(settings,"MFA_HIDE_DISABLE",[]),'RENAME_METHODS':getattr(settings,'MFA_RENAME_METHODS',{})}
+    keys = []
+    context = {
+        "keys": UserKey.objects.filter(username=request.user.username),
+        "UNALLOWED_AUTHEN_METHODS": settings.MFA_UNALLOWED_METHODS,
+        "HIDE_DISABLE": getattr(settings, "MFA_HIDE_DISABLE", []),
+    }
    for k in context["keys"]:
-        k.name = getattr(settings,'MFA_RENAME_METHODS',{}).get(k.key_type,k.key_type)
-        if k.key_type =="Trusted Device":
-            setattr(k,"device",parse(k.properties.get("user_agent","-----")))
+        if k.key_type == "Trusted Device":
+            setattr(k, "device", parse(k.properties.get("user_agent", "-----")))
        elif k.key_type == "FIDO2":
-            setattr(k,"device",k.properties.get("type","----"))
-        elif k.key_type == "RECOVERY":
-            context["recovery"] = k
-            continue
+            setattr(k, "device", k.properties.get("type", "----"))
        keys.append(k)
-    context["keys"]=keys
-    return render(request,"MFA.html",context)
+    context["keys"] = keys
+    return render(request, "MFA.html", context)

-def verify(request,username):
+
+def verify(request, username):
    request.session["base_username"] = username
-    #request.session["base_password"] = password
-    keys=User_Keys.objects.filter(username=username,enabled=1)
-    methods=list(set([k.key_type for k in keys]))
+    keys = UserKey.objects.filter(username=username, enabled=1)
+    methods = list(set([k.key_type for k in keys]))

-    if "Trusted Device" in methods and not request.session.get("checked_trusted_device",False):
+    if "Trusted Device" in methods and not request.session.get(
+        "checked_trusted_device", False
+    ):
        if TrustedDevice.verify(request):
            return login(request)
        methods.remove("Trusted Device")
    request.session["mfa_methods"] = methods
-
-    if len(methods)==1:
-        return HttpResponseRedirect(reverse(methods[0].lower()+"_auth"))
-    if getattr(settings,"MFA_ALWAYS_GO_TO_LAST_METHOD",False):
-        keys = keys.exclude(last_used__isnull=True).order_by("last_used")
-        if keys.count()>0:
-            return HttpResponseRedirect(reverse(keys[0].key_type.lower() + "_auth"))
+    if len(methods) == 1:
+        return HttpResponseRedirect(reverse(methods[0].lower() + "_auth"))
    return show_methods(request)

+
 def show_methods(request):
-    return render(request,"select_mfa_method.html", {'RENAME_METHODS':getattr(settings,'MFA_RENAME_METHODS',{})})
+    return render(request, "select_mfa_method.html", {})
+

 def reset_cookie(request):
-    response=HttpResponseRedirect(settings.LOGIN_URL)
+    response = HttpResponseRedirect(settings.LOGIN_URL)
    response.delete_cookie("base_username")
    return response

-def login(request,username = None):
-    from django.contrib import auth
-    from django.conf import settings
+
+def login(request):
    callable_func = __get_callable_function__(settings.MFA_LOGIN_CALLBACK)
-    if not username:
-        username = request.session["base_username"]
-    return callable_func(request,username=username)
+    return callable_func(request, username=request.session["base_username"])


@login_required
-def delKey(request):
-    key=User_Keys.objects.get(id=request.GET["id"])
+def del_key(request):
+    key = UserKey.objects.get(id=request.GET["id"])
    if key.username == request.user.username:
        key.delete()
        return HttpResponse("Deleted Successfully")
    else:
        return HttpResponse("Error: You own this token so you can't delete it")

+
 def __get_callable_function__(func_path):
-    import importlib
-    if not '.' in func_path:
+    if "." not in func_path:
        raise Exception("class Name should include modulename.classname")

    parsed_str = func_path.split(".")
-    module_name , func_name = ".".join(parsed_str[:-1]) , parsed_str[-1]
+    module_name, func_name = ".".join(parsed_str[:-1]), parsed_str[-1]
    imported_module = importlib.import_module(module_name)
-    callable_func = getattr(imported_module,func_name)
+    callable_func = getattr(imported_module, func_name)
    if not callable_func:
        raise Exception("Module does not have requested function")
    return callable_func

+
@login_required
-def toggleKey(request):
-    id=request.GET["id"]
-    q=User_Keys.objects.filter(username=request.user.username, id=id)
-    if q.count()==1:
-        key=q[0]
-        if not key.key_type in settings.MFA_HIDE_DISABLE:
-            key.enabled=not key.enabled
+def toggle_key(request):
+    id = request.GET["id"]
+    q = UserKey.objects.filter(username=request.user.username, id=id)
+    if q.count() == 1:
+        key = q[0]
+        if key.key_type not in settings.MFA_HIDE_DISABLE:
+            key.enabled = not key.enabled
            key.save()
            return HttpResponse("OK")
        else:
@@ -106,5 +99,6 @@ def toggleKey(request):
    else:
        return HttpResponse("Error")

-def goto(request,method):
-    return HttpResponseRedirect(reverse(method.lower()+"_auth"))
+
+def goto(request, method):
+    return HttpResponseRedirect(reverse(method.lower() + "_auth"))
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-django >= 2.2
+django >= 2.0
 jsonfield
 simplejson
 pyotp
@@ -6,5 +6,5 @@ python-u2flib-server
 ua-parser
 user-agents
 python-jose
-fido2 == 1.1.0
+fido2 == 0.9.1
 jsonLookup
--- a/setup.py
+++ b/setup.py
@@ -3,29 +3,28 @@
 from setuptools import find_packages, setup

 setup(
-    name='django-mfa2',
-    version='3.0',
-    description='Allows user to add 2FA to their accounts',
+    name="django-mfa2",
+    version="2.2.0",
+    description="Allows user to add 2FA to their accounts",
    long_description=open("README.md").read(),
    long_description_content_type="text/markdown",
-
-    author='Mohamed El-Kalioby',
-    author_email = 'mkalioby@mkalioby.com',
-    url = 'https://github.com/mkalioby/django-mfa2/',
-    download_url='https://github.com/mkalioby/django-mfa2/',
-    license='MIT',
+    author="Mohamed El-Kalioby",
+    author_email="mkalioby@mkalioby.com",
+    url="https://github.com/mkalioby/django-mfa2/",
+    download_url="https://github.com/mkalioby/django-mfa2/",
+    license="MIT",
    packages=find_packages(),
    install_requires=[
-        'django >= 2.0',
-        'jsonfield',
-        'simplejson',
-        'pyotp',
-        'python-u2flib-server',
-        'ua-parser',
-        'user-agents',
-        'python-jose',
-        'fido2 == 1.1.0',
-        'jsonLookup'
+        "django >= 2.0",
+        "jsonfield",
+        "simplejson",
+        "pyotp",
+        "python-u2flib-server",
+        "ua-parser",
+        "user-agents",
+        "python-jose",
+        "fido2 == 0.9.1",
+        "jsonLookup",
    ],
    python_requires=">=3.5",
    include_package_data=True,
@@ -39,8 +38,6 @@ setup(
        "Framework :: Django :: 2.2",
        "Framework :: Django :: 3.0",
        "Framework :: Django :: 3.1",
-        "Framework :: Django :: 3.2",
-        "Framework :: Django :: 4.0",
        "Intended Audience :: Developers",
        "Operating System :: OS Independent",
        "Programming Language :: Python",
@@ -49,8 +46,6 @@ setup(
        "Programming Language :: Python :: 3.6",
        "Programming Language :: Python :: 3.7",
        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
        "Topic :: Software Development :: Libraries :: Python Modules",
-]
+    ],
 )
Author	SHA1	Message	Date
Mohamed El-Kalioby	ca49e1623d	Controlling TOTP Authetication	2021-06-24 18:42:33 +03:00
Mohamed El-Kalioby	0b83758625	Throttling TOTP	2021-06-23 20:43:31 +03:00
Mohamed El-Kalioby	6d59258393	Merge pull request #50 from xi/cleanup	2021-06-23 19:50:11 +03:00
Tobias Bengfort	bb88f680a0	run black in CI	2021-06-23 12:15:50 +02:00
Tobias Bengfort	62bb50307e	use underscores for python functions	2021-06-23 12:15:50 +02:00
Tobias Bengfort	68e257d60e	rename model to UserKey	2021-06-23 12:15:49 +02:00
Tobias Bengfort	ba4e7f9a17	lint: fix boolean expressions	2021-06-23 12:15:25 +02:00
Tobias Bengfort	f4d8934ef5	use JsonResponse	2021-06-23 12:15:25 +02:00
Tobias Bengfort	81675207d3	rm urlresolvers compat has been removed in django 2.0 https://docs.djangoproject.com/en/1.10/internals/deprecation/#deprecation-removed-in-2-0	2021-06-23 12:15:25 +02:00
Tobias Bengfort	daece24c6d	use simplified URL routing syntax was introduced in django 2.0	2021-06-23 12:15:25 +02:00
Tobias Bengfort	f654debb98	rm compat for is_authenticated was removed in django 2.0 https://docs.djangoproject.com/en/3.1/releases/1.10/#user-is-auth-anon-deprecation	2021-06-23 12:15:25 +02:00
Tobias Bengfort	3d133b3fff	use args, *kwargs with super()	2021-06-23 12:15:25 +02:00
Tobias Bengfort	714fb68a65	rm python2 compat code	2021-06-23 12:15:25 +02:00
Tobias Bengfort	ec16539c34	cleanup code examples in README	2021-06-23 12:15:25 +02:00
Tobias Bengfort	e8ce96c404	fix typos	2021-06-23 12:15:25 +02:00
Tobias Bengfort	b18dfe2bb6	strip whitespace in docs	2021-06-23 12:15:25 +02:00
Tobias Bengfort	84f93444a3	fix unused imports	2021-06-23 12:15:25 +02:00
Tobias Bengfort	34fcca57c8	avoid star imports	2021-06-23 12:15:05 +02:00
Tobias Bengfort	174dba2878	sort imports (isort)	2021-06-23 12:14:29 +02:00
Tobias Bengfort	0945561136	avoid local imports	2021-06-23 08:54:51 +02:00
Tobias Bengfort	6b132683a7	run black on example and setup.py	2021-06-23 08:54:51 +02:00
Tobias Bengfort	d54cd20d9b	rm commented code	2021-06-23 08:54:51 +02:00
Tobias Bengfort	007872bd8a	rm empty files	2021-06-23 08:54:51 +02:00
Mohamed ElKalioby	8911a4f0b6	Add Code Style Black	2021-06-22 17:15:01 +03:00
Mohamed ElKalioby	9c126f06b5	Applied Black	2021-06-22 17:12:12 +03:00