Compare commits
11 Commits
feat/db-init
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
| 12be29340b | |||
| 9d01ead120 | |||
| 5bac4c720b | |||
| cdf195306e | |||
| 90f1a6245c | |||
| 532266c98e | |||
| f99c0e8148 | |||
| 2a7c74286c | |||
| 920c51b4f0 | |||
| 2b7fecb248 | |||
| ce48859079 |
+28
@@ -0,0 +1,28 @@
|
|||||||
|
from flask import Blueprint, request, jsonify
|
||||||
|
from model.user import User
|
||||||
|
|
||||||
|
auth = Blueprint("auth", __name__)
|
||||||
|
|
||||||
|
|
||||||
|
@auth.route('/login', methods = ['POST'])
|
||||||
|
def login():
|
||||||
|
if request.is_json:
|
||||||
|
req = request.json
|
||||||
|
|
||||||
|
email = req.get('email')
|
||||||
|
password = req.get('password')
|
||||||
|
|
||||||
|
if not email or not password:
|
||||||
|
return "Request must have email and password", 400
|
||||||
|
|
||||||
|
if len(email.strip()) < 4 or '@' not in email or '.' not in email:
|
||||||
|
return "Email is incorrect", 400
|
||||||
|
|
||||||
|
if len(password.strip()) < 8:
|
||||||
|
return "Password is too short", 400
|
||||||
|
|
||||||
|
user = User(email, password)
|
||||||
|
return jsonify(user.toJson())
|
||||||
|
|
||||||
|
else:
|
||||||
|
return "Request is not a json", 400
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
from flask import Blueprint, request, jsonify
|
|
||||||
from model.user import user
|
|
||||||
|
|
||||||
loginBP = Blueprint("loginapi", __name__)
|
|
||||||
|
|
||||||
@loginBP.route('/api/login', methods = ['POST'])
|
|
||||||
def login():
|
|
||||||
email = request.form['email']
|
|
||||||
password = request.form['password']
|
|
||||||
#if(isvalid(email, password)):
|
|
||||||
us = user(email, password)
|
|
||||||
return jsonify(us.toDictionary())
|
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
from flask import Blueprint, request, jsonify
|
||||||
|
from model.user import User
|
||||||
|
#from module.db.repositories.robot_reposytory import update_robot get_by_id
|
||||||
|
from loguru import logger as log
|
||||||
|
robots = Blueprint("robots", __name__)
|
||||||
|
|
||||||
|
robots.route('/data', methods = ['POST'])
|
||||||
|
def data():
|
||||||
|
if request.headers.get("Authorization"):
|
||||||
|
if request.is_json:
|
||||||
|
req = request.json
|
||||||
|
|
||||||
|
id = req.get('robot_id')
|
||||||
|
tms = req.get('timestamp')
|
||||||
|
loc = req.get('location')
|
||||||
|
scanRes = req.get('scan_results')
|
||||||
|
battery = req.get('battery_level')
|
||||||
|
|
||||||
|
if update_robot(id, "received", battery, loc["zone"], loc["row"], loc["self"]):
|
||||||
|
res = {"status": "received", "message_id": "123"} #for that moment i don`t now what is message
|
||||||
|
return jsonify(res)
|
||||||
|
else:
|
||||||
|
log.error('failed to update robot data')
|
||||||
|
return("Server error")
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
from app import app
|
||||||
|
from flask_socketio import SocketIO, emit
|
||||||
|
from loguru import logger as log
|
||||||
|
#from module.db.repositories.robot_reposytory import update_robot get_by_id get_all
|
||||||
|
#from module.db.repositories.inventory_repository import get_all as getRecords
|
||||||
|
ws = socketIO(app)
|
||||||
|
|
||||||
|
@ws.on('connect')
|
||||||
|
def is_connect():
|
||||||
|
log.info('client is connected')
|
||||||
|
|
||||||
|
@ws.on('disconnect')
|
||||||
|
def is_disconnect():
|
||||||
|
log.info('client is disconnected')
|
||||||
|
|
||||||
|
@ws.on('robot_update')
|
||||||
|
def robotUpdate():
|
||||||
|
robots = get_all()
|
||||||
|
emit('response', jsonify({"type": "robot_update", "data": {robots.toJSON()}})
|
||||||
|
|
||||||
|
@ws.on('inventory_alert')
|
||||||
|
def robotUpdate():
|
||||||
|
records = getRecords()
|
||||||
|
emit('response', jsonify({"type": "inventory_alert", "data": {records.toJSON()}})
|
||||||
|
|
||||||
|
|
||||||
@@ -1,9 +1,15 @@
|
|||||||
|
from sys import exit
|
||||||
from flask import Flask
|
from flask import Flask
|
||||||
from api.auth.loginapi import loginBP
|
from api.auth import auth
|
||||||
from utils.loadDotEnv import initializeENV
|
from utils.loadDotEnv import initializeENV
|
||||||
|
from utils.PostgressConnect import PSQLConnect, PSQLCursor
|
||||||
|
|
||||||
state = initializeENV()
|
if not initializeENV():
|
||||||
|
exit(-1)
|
||||||
|
|
||||||
|
#conn = PSQLConnect()
|
||||||
|
#cur = PSQLCursor(conn)
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
|
|
||||||
app.register_blueprint(loginBP)
|
app.register_blueprint(auth, url_prefix='/api/auth')
|
||||||
|
|||||||
+3
-1
@@ -1,4 +1,6 @@
|
|||||||
flask==3.1.2
|
flask==3.1.2
|
||||||
|
flask-socketio
|
||||||
python-dotenv
|
python-dotenv
|
||||||
psycopg-binary
|
psycopg2-binary
|
||||||
pyjwt
|
pyjwt
|
||||||
|
loguru
|
||||||
|
|||||||
+2
-2
@@ -3,7 +3,7 @@ import json
|
|||||||
from utils.token import generateKey
|
from utils.token import generateKey
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class user:
|
class User:
|
||||||
id: int
|
id: int
|
||||||
name: str
|
name: str
|
||||||
role: str
|
role: str
|
||||||
@@ -16,5 +16,5 @@ class user:
|
|||||||
self.role = 'Backend'#us['role']
|
self.role = 'Backend'#us['role']
|
||||||
self.token = generateKey(email, passwd)
|
self.token = generateKey(email, passwd)
|
||||||
|
|
||||||
def toDictionary(self):
|
def toJson(self):
|
||||||
return {"user": {"id": self.id, "name": self.name, "role": self.role}, "token": self.token}
|
return {"user": {"id": self.id, "name": self.name, "role": self.role}, "token": self.token}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import psycopg
|
import psycopg2
|
||||||
import os
|
import os
|
||||||
|
|
||||||
def PSQLConnect():
|
def PSQLConnect():
|
||||||
conn = psycopg.connect(os.getenv('POSTDRESS_CONNECTION'))
|
conn = psycopg2.connect(os.getenv('POSTGRES_URL'))
|
||||||
return conn
|
return conn
|
||||||
|
|
||||||
def PSQLCursor(conn):
|
def PSQLCursor(conn):
|
||||||
|
|||||||
+10
-8
@@ -1,12 +1,14 @@
|
|||||||
import os
|
import os
|
||||||
from dotenv import load_dotenv
|
from dotenv import load_dotenv
|
||||||
|
from loguru import logger as log
|
||||||
|
|
||||||
def initializeENV():
|
DOTENV_PATH = '.env'
|
||||||
dotenv_path = '../.env'
|
|
||||||
if os.path.exists(dotenv_path):
|
def initializeENV() -> bool:
|
||||||
load_dotenv(dotenv_path)
|
if os.path.exists(DOTENV_PATH):
|
||||||
print('.env is loaded')
|
load_dotenv(DOTENV_PATH)
|
||||||
return 1
|
log.info('.env is loaded')
|
||||||
|
return True
|
||||||
else:
|
else:
|
||||||
print('.env isn`t loaded')
|
log.error('.env isn`t loaded')
|
||||||
return 0
|
return False
|
||||||
|
|||||||
+2
-1
@@ -1,7 +1,8 @@
|
|||||||
import jwt
|
import jwt
|
||||||
import os
|
import os
|
||||||
|
from time import time
|
||||||
|
|
||||||
def generateKey(email, passwd):
|
def generateKey(email, passwd):
|
||||||
key = os.getenv('KEY')
|
key = os.getenv('KEY')
|
||||||
encoded = jwt.encode({email: passwd}, key, algorithm="HS256")
|
encoded = jwt.encode({email: passwd, 'iat': time()}, key, algorithm="HS256")
|
||||||
return encoded
|
return encoded
|
||||||
|
|||||||
Reference in New Issue
Block a user