fix(api/auth/loginapi.py, app.py, utils/PostgressConnect.py, utils/createLogger.py, utils/loadDotEnv.py): Review fix
https://g.codrs.ru/Hackaton/Backend/pulls/2#issuecomment-23 https://g.codrs.ru/Hackaton/Backend/pulls/2#issuecomment-31
This commit is contained in:
+13
-6
@@ -1,12 +1,19 @@
|
|||||||
from flask import Blueprint, request, jsonify
|
from flask import Blueprint, request, jsonify
|
||||||
from model.user import user
|
from model.user import user
|
||||||
|
from utils.createLogger import createLogger
|
||||||
|
|
||||||
loginBP = Blueprint("loginapi", __name__)
|
loginBP = Blueprint("loginapi", __name__)
|
||||||
|
log = createLogger("LoginAPI")
|
||||||
@loginBP.route('/api/login', methods = ['POST'])
|
@loginBP.route('/api/login', methods = ['POST'])
|
||||||
def login():
|
def login():
|
||||||
email = request.form['email']
|
if request.is_json:
|
||||||
password = request.form['password']
|
req = request.json
|
||||||
#if(isvalid(email, password)):
|
email = req['email']
|
||||||
us = user(email, password)
|
password = req['password']
|
||||||
return jsonify(us.toDictionary())
|
#if(isvalid(email, password)):
|
||||||
|
us = user(email, password)
|
||||||
|
log.debug("Respons is sended")
|
||||||
|
return jsonify(us.toDictionary())
|
||||||
|
else:
|
||||||
|
log.error("Request is not a JSON")
|
||||||
|
return "Request is not a json", 500
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
from flask import Flask
|
from flask import Flask
|
||||||
from api.auth.loginapi import loginBP
|
from api.auth.loginapi import loginBP
|
||||||
from utils.loadDotEnv import initializeENV
|
from utils.loadDotEnv import initializeENV
|
||||||
|
from utils.PostgressConnect import PSQLConnect, PSQLCursor
|
||||||
|
|
||||||
state = initializeENV()
|
state = initializeENV()
|
||||||
|
#conn = PSQLConnect()
|
||||||
|
#cur = PSQLCursor(conn)
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
import psycopg
|
import psycopg2
|
||||||
import os
|
import os
|
||||||
|
|
||||||
def PSQLConnect():
|
def PSQLConnect():
|
||||||
conn = psycopg.connect(os.getenv('POSTDRESS_CONNECTION'))
|
conn = psycopg2.connect(os.getenv('POSTDRESS_CONNECTION'))
|
||||||
return conn
|
return conn
|
||||||
|
|
||||||
def PSQLCursor(conn):
|
def PSQLCursor(conn):
|
||||||
cur = conn.cursor()
|
cur = conn.cursor()
|
||||||
return cur
|
return cur
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
import logging
|
||||||
|
|
||||||
|
def createLogger(name: str):
|
||||||
|
logger = logging.getLogger()
|
||||||
|
logger.propagate = False
|
||||||
|
return logger
|
||||||
+5
-2
@@ -1,12 +1,15 @@
|
|||||||
import os
|
import os
|
||||||
from dotenv import load_dotenv
|
from dotenv import load_dotenv
|
||||||
|
from .createLogger import createLogger
|
||||||
|
|
||||||
|
log = createLogger("ENV")
|
||||||
|
|
||||||
def initializeENV():
|
def initializeENV():
|
||||||
dotenv_path = '../.env'
|
dotenv_path = '../.env'
|
||||||
if os.path.exists(dotenv_path):
|
if os.path.exists(dotenv_path):
|
||||||
load_dotenv(dotenv_path)
|
load_dotenv(dotenv_path)
|
||||||
print('.env is loaded')
|
log.info('.env is loaded')
|
||||||
return 1
|
return 1
|
||||||
else:
|
else:
|
||||||
print('.env isn`t loaded')
|
log.error('.env isn`t loaded')
|
||||||
return 0
|
return 0
|
||||||
|
|||||||
Reference in New Issue
Block a user