Merged more fixes and fix the order on model-title and close btn

Merge branch 'bootstrap5' of https://github.com/ezrajrice/django-mfa2 into v2.5b2
v2.5b1
2022-06-19 16:34:14 +03:00 · 2022-06-19 16:25:21 +03:00 · 2022-06-16 20:01:07 +03:00 · 2022-06-13 17:18:00 +03:00 · 2022-06-13 16:47:31 +03:00 · 2022-06-07 08:39:08 -06:00
4 changed files with 8 additions and 11 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,7 @@
   * 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
+Thanks to @ezrajrice

 ## 2.4.0

--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Depends on
 * ua-parser
 * user-agents
 * python-jose
-* fido2==1.0.0
+* fido2==0.9.0

 # Installation
 1. using pip 
--- a/mfa/FIDO2.py
+++ b/mfa/FIDO2.py
@@ -16,7 +16,7 @@ from .views import login, reset_cookie
 import datetime
 from .Common import get_redirect_url
 from django.utils import timezone
-from django.http import JsonResponse
+

 def recheck(request):
    """Starts FIDO2 recheck"""
@@ -49,15 +49,13 @@ def begin_registeration(request):
 def complete_reg(request):
    """Completes the registeration, called by API"""
    try:
-        if not "fido_state" in request.session:
-            return JsonResponse({'status': 'ERR', "message": "FIDO Status can't be found, please try again"})
        data = cbor.decode(request.body)

        client_data = CollectedClientData(data['clientDataJSON'])
        att_obj = AttestationObject((data['attestationObject']))
        server = getServer()
        auth_data = server.register_complete(
-            request.session.pop('fido_state'),
+            request.session['fido_state'],
            client_data,
            att_obj
        )
@@ -77,7 +75,7 @@ def complete_reg(request):
            client.captureException()
        except:
            pass
-        return JsonResponse({'status': 'ERR', "message": "Error on server, please try again later"})
+        return HttpResponse(simplejson.dumps({'status': 'ERR', "message": "Error on server, please try again later"}))


 def start(request):
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from setuptools import find_packages, setup

 setup(
    name='django-mfa2',
-    version='2.5.0',
+    version='2.5.0b2',
    description='Allows user to add 2FA to their accounts',
    long_description=open("README.md").read(),
    long_description_content_type="text/markdown",
@@ -31,7 +31,7 @@ setup(
    include_package_data=True,
    zip_safe=False, # because we're including static files
    classifiers=[
-        "Development Status :: 5 - Production/Stable",
+        "Development Status :: 4 - Beta",
        "Environment :: Web Environment",
        "Framework :: Django",
        "Framework :: Django :: 2.0",
Author	SHA1	Message	Date
Mohamed ElKalioby	dfb60ac685	Merged more fixes and fix the order on model-title and close btn	2022-06-19 16:34:14 +03:00
Mohamed ElKalioby	12b4ef5c8e	Merge branch 'bootstrap5' of https://github.com/ezrajrice/django-mfa2 into v2.5b2	2022-06-19 16:25:21 +03:00
Mohamed ElKalioby	84b9d297d2	v2.5b1	2022-06-16 20:01:07 +03:00
Mohamed ElKalioby	1ebc5bfd2b	Upgrading to FIDO2==1.0.0	2022-06-13 17:18:00 +03:00
Mohamed ElKalioby	d8b10bcdc1	WIP: Upgrading Fido2	2022-06-13 16:47:31 +03:00
Nathan Swain	7b2c5727e4	Remove emtpy modal calls. modal('show') should work for all versions of bootstrap.	2022-06-07 08:39:08 -06:00
Nathan Swain	7eecd759f7	Additional tweaks for bootstrap5 support btn-default -> btn-secondary use mb-3 to add margin to bottom of input-groups use $.modal('show') to show modals use bi bi-trash icon (font-awesome doesn't seem to be included with bs5 data-bs-dismiss on the modal close buttons put recheck templates in container divs add input-group-text class to addon icons for input fields	2022-06-02 12:53:41 -06:00
Ezra Rice	7a9195a73e	BS v5 panels update	2022-06-02 13:21:28 -04:00
Ezra Rice	2278722914	Font Awesome icon update Updated class attribute to also support new version of FA v6 trash can	2022-06-02 13:16:36 -04:00
Ezra Rice	8ed847922e	BS v5 panels update	2022-06-02 12:54:16 -04:00
Ezra Rice	32fdbf1bc0	BS v5 panels update	2022-06-02 12:52:14 -04:00
Ezra Rice	7595b8d0c5	BS v5 buttons, panels, icons update BS v5 changed block buttons, panels -> cards, and icon classes.	2022-06-02 12:51:05 -04:00
Ezra Rice	b763c22297	BS v5 buttons, panels, icons update BS v5 changed block buttons, panels -> cards, and icon classes.	2022-06-02 12:43:53 -04:00
Ezra Rice	e4aaee6e1a	BS v5 buttons update Updated the display of buttons when used as an `<a>` tag. This change was made in BS4.	2022-06-02 12:42:28 -04:00
Ezra Rice	566b05f1e6	BS v5 panels update BootStrap v5 changed panels to cards	2022-06-02 12:32:09 -04:00
Ezra Rice	4a2839a4fb	BS v5 panels BootStrap v5 changed panels to cards	2022-06-02 12:30:27 -04:00
Ezra Rice	f655851f65	BS v5 buttons, panels, icons update BS v5 changed block buttons, panels -> cards, and icon classes.	2022-06-02 12:28:34 -04:00
Ezra Rice	8bea746d83	Update Add.html BS v5 changed block buttons, panels -> cards, and icon classes.	2022-06-02 12:24:25 -04:00
Mohamed ElKalioby	f6d25d7a79	Updated CHANGELOG	2022-06-01 20:23:37 +03:00
Mohamed ElKalioby	1f4be15fc5	Updated README and CHANGLOG	2022-05-30 17:43:00 +03:00
Mohamed ElKalioby	6ea99ff931	Fix issue in case of not Safari on iOS	2022-05-30 17:25:57 +03:00
Ezra Rice	660d5ca8f8	BootStrap5 Update MFA.html	2022-05-24 09:58:31 -04:00