fix: resolve ruff linting errors in MFA implementation

pull/22206/head
k-brahma-dify 10 months ago
parent 51be66720d
commit 53cc60972c

@ -14,7 +14,6 @@ from controllers.console.auth.error import (
EmailPasswordLoginLimitError,
InvalidEmailError,
InvalidTokenError,
MFARequiredError,
MFATokenRequiredError,
)
from controllers.console.error import (

@ -1,12 +1,8 @@
from typing import cast
import flask_login
from flask import request
from flask_restful import Resource, reqparse
from controllers.console.auth.error import (
TokenValidationError,
)
from controllers.console.wraps import account_initialization_required
from libs.login import login_required
from models.account import Account

@ -389,7 +389,8 @@ api.add_resource(EducationAutoCompleteApi, "/account/education/autocomplete")
# api.add_resource(AccountEmailVerifyApi, '/account/email-verify')
# MFA endpoints
from controllers.console.auth.mfa import MFASetupInitApi, MFASetupCompleteApi, MFADisableApi, MFAStatusApi
from controllers.console.auth.mfa import MFADisableApi, MFASetupCompleteApi, MFASetupInitApi, MFAStatusApi
api.add_resource(MFAStatusApi, "/account/mfa/status")
api.add_resource(MFASetupInitApi, "/account/mfa/setup")
api.add_resource(MFASetupCompleteApi, "/account/mfa/setup/complete")

@ -3,12 +3,9 @@ import io
import json
import secrets
from datetime import datetime
from typing import Optional
import pyotp
import qrcode
from sqlalchemy import and_
from sqlalchemy.orm import Session
from models.account import Account, AccountMFASettings
from models.engine import db

@ -1,13 +1,11 @@
import json
import unittest
from unittest.mock import Mock, patch
from datetime import datetime
from flask import Flask
from flask_restful import Api
from controllers.console.auth.login import LoginApi
from controllers.console.auth.error import MFARequiredError, MFATokenRequiredError
from models.account import Account, AccountMFASettings
@ -289,8 +287,8 @@ class TestMFAEndToEndFlow(unittest.TestCase):
@patch('services.mfa_service.db.session')
def test_complete_mfa_setup_flow(self, mock_session, mock_gen_codes, mock_verify, mock_gen_qr, mock_gen_secret):
"""Test complete MFA setup flow from init to completion."""
from services.mfa_service import MFAService
from models.account import Account
from services.mfa_service import MFAService
# Mock account
account = Mock(spec=Account)

@ -5,13 +5,7 @@ from unittest.mock import Mock, patch
from flask import Flask
from flask_restful import Api
from controllers.console.auth.mfa import (
MFASetupInitApi,
MFASetupCompleteApi,
MFADisableApi,
MFAStatusApi,
MFAVerifyApi
)
from controllers.console.auth.mfa import MFADisableApi, MFASetupCompleteApi, MFASetupInitApi, MFAStatusApi, MFAVerifyApi
from models.account import Account

@ -1,9 +1,7 @@
import json
import unittest
from unittest.mock import Mock, patch
from datetime import datetime
import pytest
from unittest.mock import Mock, patch
from models.account import Account, AccountMFASettings
from services.mfa_service import MFAService

Loading…
Cancel
Save