Debug 1
This commit is contained in:
@@ -1,9 +1,6 @@
|
||||
from flask import request, Blueprint, render_template, session, current_app,redirect, url_for
|
||||
import os
|
||||
from .auth_route import route
|
||||
from Database.sql_provider import SQLProvider
|
||||
from flask import request, Blueprint, render_template, session, current_app, redirect, url_for
|
||||
from .auth_model import auth_model
|
||||
|
||||
sql_provider = SQLProvider(os.path.join(os.path.dirname(__file__), 'sql'))
|
||||
auth_bp = Blueprint('auth_bp', __name__, template_folder='templates')
|
||||
|
||||
@auth_bp.route('/', methods=['GET', 'POST'])
|
||||
@@ -13,7 +10,7 @@ def auth():
|
||||
else:
|
||||
data = request.form.to_dict()
|
||||
data['table'] = 'internal_users' if 'internal' in data else 'external_users'
|
||||
auth_data = route(current_app.config['db_config'], data, sql_provider, 'auth.sql')
|
||||
auth_data = auth_model(data)
|
||||
if auth_data.status:
|
||||
session.update({
|
||||
'login': auth_data.result[0]['login'],
|
||||
|
||||
25
App/Auth/auth_model.py
Normal file
25
App/Auth/auth_model.py
Normal file
@@ -0,0 +1,25 @@
|
||||
from dataclasses import dataclass
|
||||
from Database.select import select_list
|
||||
from Database.sql_provider import SQLProvider
|
||||
from flask import current_app
|
||||
import os
|
||||
|
||||
sql_provider = SQLProvider(os.path.join(os.path.dirname(__file__), 'sql'))
|
||||
@dataclass
|
||||
class InfoRespronse:
|
||||
result: tuple
|
||||
error_message: str
|
||||
status: bool
|
||||
|
||||
def auth_model(input_data) -> InfoRespronse:
|
||||
_sql = sql_provider.get('auth.sql', input_data)
|
||||
result = select_list(current_app.config['db_config'], _sql)
|
||||
if result is None:
|
||||
return InfoRespronse(result,
|
||||
error_message = 'Произошла ошибка на этапе авторизации',
|
||||
status=False)
|
||||
elif len(result) == 0:
|
||||
return InfoRespronse(result,
|
||||
error_message = 'Пользователь не найден',
|
||||
status=False)
|
||||
return InfoRespronse(result, error_message='', status=True)
|
||||
@@ -1,17 +0,0 @@
|
||||
from dataclasses import dataclass
|
||||
from Database.select import select_list
|
||||
@dataclass
|
||||
class InfoRespronse:
|
||||
result: tuple
|
||||
error_message: str
|
||||
status: bool
|
||||
|
||||
def route(db_config, input_data, sql_provider, name) -> InfoRespronse:
|
||||
_sql = sql_provider.get(name, input_data)
|
||||
# print("sql = ", _sql)
|
||||
result = select_list(db_config, _sql)
|
||||
if result is None:
|
||||
return InfoRespronse(result, error_message = 'Произошла ошибка на этапе авторизации', status=False)
|
||||
elif len(result) == 0:
|
||||
return InfoRespronse(result, error_message = 'Пользователь не найден', status=False)
|
||||
return InfoRespronse(result, error_message='', status=True)
|
||||
Reference in New Issue
Block a user