diff --git a/app/auth/views/fido.py b/app/auth/views/fido.py index b9f11fa1..cd6c14d3 100644 --- a/app/auth/views/fido.py +++ b/app/auth/views/fido.py @@ -1,8 +1,7 @@ import json import secrets -import webauthn -from app.config import RP_ID, URL +import webauthn from flask import request, render_template, redirect, url_for, flash, session from flask_login import login_user from flask_wtf import FlaskForm @@ -10,9 +9,10 @@ from wtforms import HiddenField, validators from app.auth.base import auth_bp from app.config import MFA_USER_ID +from app.config import RP_ID, URL +from app.extensions import db from app.log import LOG from app.models import User -from app.extensions import db class FidoTokenForm(FlaskForm): diff --git a/app/config.py b/app/config.py index 77efb9c2..f8baba98 100644 --- a/app/config.py +++ b/app/config.py @@ -2,9 +2,9 @@ import os import random import string import subprocess +from urllib.parse import urlparse from dotenv import load_dotenv -from urllib.parse import urlparse SHA1 = subprocess.getoutput("git rev-parse HEAD") ROOT_DIR = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) diff --git a/app/dashboard/views/fido_setup.py b/app/dashboard/views/fido_setup.py index 85d074a1..e9432e6c 100644 --- a/app/dashboard/views/fido_setup.py +++ b/app/dashboard/views/fido_setup.py @@ -1,15 +1,14 @@ -import uuid import json import secrets -import webauthn -from app.config import RP_ID, URL -from urllib.parse import urlparse +import uuid +import webauthn from flask import render_template, flash, redirect, url_for, session from flask_login import login_required, current_user from flask_wtf import FlaskForm from wtforms import HiddenField, validators +from app.config import RP_ID, URL from app.dashboard.base import dashboard_bp from app.extensions import db from app.log import LOG diff --git a/app/dashboard/views/index.py b/app/dashboard/views/index.py index 29772e13..56b0fe4c 100644 --- a/app/dashboard/views/index.py +++ b/app/dashboard/views/index.py @@ -16,8 +16,6 @@ from app.models import ( AliasGeneratorEnum, User, EmailLog, - CustomDomain, - Directory, ) diff --git a/app/dashboard/views/referral.py b/app/dashboard/views/referral.py index 29f37c32..93129309 100644 --- a/app/dashboard/views/referral.py +++ b/app/dashboard/views/referral.py @@ -4,7 +4,7 @@ from flask_login import login_required, current_user from app.dashboard.base import dashboard_bp from app.extensions import db from app.log import LOG -from app.models import Referral, User +from app.models import Referral from app.utils import random_string diff --git a/app/oauth/views/authorize.py b/app/oauth/views/authorize.py index 33f4bcd2..9187f10b 100644 --- a/app/oauth/views/authorize.py +++ b/app/oauth/views/authorize.py @@ -5,10 +5,10 @@ from flask import request, render_template, redirect, flash from flask_login import current_user from itsdangerous import SignatureExpired -from app.config import EMAIL_DOMAIN, ALIAS_DOMAINS, DISABLE_ALIAS_SUFFIX +from app.config import EMAIL_DOMAIN +from app.dashboard.views.custom_alias import available_suffixes, signer from app.email_utils import get_email_domain_part from app.extensions import db -from app.dashboard.views.custom_alias import available_suffixes, signer from app.jose_utils import make_id_token from app.log import LOG from app.models import ( @@ -30,7 +30,7 @@ from app.oauth_models import ( SUPPORTED_OPENID_FLOWS_STR, response_types_to_str, ) -from app.utils import random_string, encode_url, random_word +from app.utils import random_string, encode_url @oauth_bp.route("/authorize", methods=["GET", "POST"]) diff --git a/app/paddle_utils.py b/app/paddle_utils.py index cb782e90..a7a35155 100644 --- a/app/paddle_utils.py +++ b/app/paddle_utils.py @@ -10,13 +10,11 @@ import collections import phpserialize import requests from Crypto.Hash import SHA1 - # Crypto can be found at https://pypi.org/project/pycryptodome/ from Crypto.PublicKey import RSA from Crypto.Signature import PKCS1_v1_5 from app.config import PADDLE_PUBLIC_KEY_PATH, PADDLE_VENDOR_ID, PADDLE_AUTH_CODE - # Your Paddle public key. from app.log import LOG