api auth

app/__init__.py

@@ -58,11 +58,29 @@ def create_app(test_config=None):
                 response.headers["Cache-Control"] = "public, max-age=2592000, immutable"
         elif response.mimetype == "text/html":
             response.headers["Cache-Control"] = "no-store, no-cache, private, must-revalidate"
+            response.headers["Pragma"] = "no-cache"
+            response.headers["Expires"] = "0"
         return response
 
     @login_manager.user_loader
     def load_user(user_id): return db.session.get(User, int(user_id))
 
+    @login_manager.request_loader
+    def load_user_from_request(req):
+        header = req.headers.get("Authorization", "")
+        scheme, _, token = header.partition(" ")
+        if scheme.lower() != "bearer" or not token.strip():
+            return None
+        from .api_tokens import load_access_token
+        return load_access_token(token.strip())
+
+    @login_manager.unauthorized_handler
+    def unauthorized():
+        if request.path.startswith("/api/"):
+            return {"ok": False, "message": "Wymagane uwierzytelnienie Bearer lub aktywna sesja"}, 401
+        from flask import redirect
+        return redirect(url_for("auth.login", next=request.url))
+
     @app.context_processor
     def inject_theme():
         themes = _themes(app)

app/api.py

@@ -2,7 +2,7 @@ from collections import defaultdict
 from datetime import datetime, date
 from decimal import Decimal
 from functools import wraps
-from flask import Blueprint, jsonify, request, url_for
+from flask import Blueprint, jsonify, request, url_for, current_app
 from flask_login import current_user, login_required, login_user, logout_user
 from sqlalchemy import extract
 from sqlalchemy.exc import IntegrityError
@@ -11,6 +11,7 @@ from .models import User, Vehicle, FuelEntry, CompanySettings, AppSetting, Orlen
 from .services import calculate_costs, fetch_orlen_price, fetch_orlen_range, invoice_period, fetch_ure_stations, aggregate_ure_companies, POLISH_REGIONS
 from .station_catalog import sync_station_catalog
 from . import THEMES
+from .api_tokens import create_access_token
 
 api = Blueprint('api', __name__, url_prefix='/api')
 FUEL_TYPES = ('PB95','PB98','DIESEL','LPG')
@@ -57,6 +58,21 @@ def login():
     if not user or not user.check_password(d.get('password') or '') or not user.active: return fail('Nieprawidłowy e-mail lub hasło',401)
     login_user(user); return response({'user':user_dict(user),'redirect':url_for('main.dashboard')},'Zalogowano')
 
+@api.post('/auth/token')
+def token_login():
+    d = payload()
+    email = (d.get('email') or d.get('username') or '').strip().lower()
+    user = User.query.filter_by(email=email).first()
+    if not user or not user.check_password(d.get('password') or '') or not user.active:
+        return jsonify({'error':'invalid_grant','error_description':'Nieprawidłowy e-mail lub hasło'}), 401
+    expires_in = int(current_app.config['API_TOKEN_MAX_AGE_SECONDS'])
+    return jsonify({
+        'access_token': create_access_token(user),
+        'token_type': 'Bearer',
+        'expires_in': expires_in,
+        'user': user_dict(user),
+    })
+
 @api.post('/auth/logout')
 @login_required
 def logout(): logout_user(); return response({'redirect':url_for('auth.login')},'Wylogowano')

app/api_tokens.py

@@ -0,0 +1,42 @@
+from __future__ import annotations
+
+import hashlib
+from typing import Optional
+
+from flask import current_app
+from itsdangerous import BadSignature, SignatureExpired, URLSafeTimedSerializer
+
+from .extensions import db
+from .models import User
+
+TOKEN_SALT = "fueltrack-api-access-token-v1"
+
+
+def _serializer() -> URLSafeTimedSerializer:
+    return URLSafeTimedSerializer(current_app.config["SECRET_KEY"], salt=TOKEN_SALT)
+
+
+def _password_stamp(user: User) -> str:
+    """Unieważnia token po zmianie hasła bez przechowywania tokenów w bazie."""
+    return hashlib.sha256(user.password_hash.encode("utf-8")).hexdigest()[:16]
+
+
+def create_access_token(user: User) -> str:
+    return _serializer().dumps({"uid": user.id, "pwd": _password_stamp(user)})
+
+
+def load_access_token(token: str) -> Optional[User]:
+    try:
+        payload = _serializer().loads(
+            token,
+            max_age=int(current_app.config["API_TOKEN_MAX_AGE_SECONDS"]),
+        )
+        user = db.session.get(User, int(payload["uid"]))
+    except (BadSignature, SignatureExpired, KeyError, TypeError, ValueError):
+        return None
+
+    if not user or not user.active:
+        return None
+    if payload.get("pwd") != _password_stamp(user):
+        return None
+    return user

app/config.py

@@ -35,6 +35,7 @@ class Config:
     SECRET_KEY = env("SECRET_KEY", "dev-secret")
     SQLALCHEMY_DATABASE_URI = env("DATABASE_URL", "sqlite:////app/instance/fueltrack.db")
     SQLALCHEMY_TRACK_MODIFICATIONS = False
+    API_TOKEN_MAX_AGE_SECONDS = env_int("API_TOKEN_MAX_AGE_SECONDS", 28800)
 
     HTTP_TIMEOUT_SECONDS = env_float("HTTP_TIMEOUT_SECONDS", 30)
     ORLEN_TIMEOUT_SECONDS = env_float("ORLEN_TIMEOUT_SECONDS", 15)

app/openapi.py

@@ -5,15 +5,20 @@ docs = Blueprint('openapi', __name__)
 @docs.get('/openapi.json')
 def spec():
     return jsonify({
-      'openapi':'3.0.3','info':{'title':'FuelTrack API','version':'0.0.1','description':'REST API używane przez interfejs FuelTrack. Autoryzacja odbywa się przez sesję Flask (cookie).'},
-      'components':{'securitySchemes':{'sessionCookie':{'type':'apiKey','in':'cookie','name':'session'}},'schemas':{
+      'openapi':'3.0.3','info':{'title':'FuelTrack API','version':'0.1.0','description':'REST API FuelTrack. Dla integracji użyj logowania e-mailem i hasłem w OAuth2 Password, które zwraca token Bearer. Interfejs WWW może nadal używać sesji cookie.'},
+      'components':{'securitySchemes':{
+        'oauth2Password':{'type':'oauth2','flows':{'password':{'tokenUrl':'/api/auth/token','scopes':{}}}},
+        'bearerAuth':{'type':'http','scheme':'bearer','bearerFormat':'signed token'},
+        'sessionCookie':{'type':'apiKey','in':'cookie','name':'session'}
+      },'schemas':{
         'ApiResponse':{'type':'object','properties':{'ok':{'type':'boolean'},'message':{'type':'string'},'data':{}}},
         'User':{'type':'object','properties':{'id':{'type':'integer'},'name':{'type':'string'},'email':{'type':'string','format':'email'},'role':{'type':'string','enum':['user','boss','admin']},'active':{'type':'boolean'}}},
         'Vehicle':{'type':'object','properties':{'id':{'type':'integer'},'name':{'type':'string'},'registration':{'type':'string'},'fuel_type':{'type':'string','enum':['PB95','PB98','DIESEL','LPG']}}}
       }},
-      'security':[{'sessionCookie':[]}],
+      'security':[{'oauth2Password':[]},{'bearerAuth':[]},{'sessionCookie':[]}],
       'paths':{
         '/api/auth/login':{'post':{'tags':['Auth'],'security':[],'summary':'Logowanie','requestBody':{'required':True,'content':{'application/json':{'schema':{'type':'object','required':['email','password'],'properties':{'email':{'type':'string'},'password':{'type':'string'}}}}}},'responses':{'200':{'description':'Zalogowano'},'401':{'description':'Błędne dane'}}}},
+        '/api/auth/token':{'post':{'tags':['Auth'],'security':[],'summary':'Pobranie tokenu Bearer','description':'Endpoint zgodny z OAuth2 Password używany przez przycisk Authorize w Swagger UI. W polu username wpisz adres e-mail.','requestBody':{'required':True,'content':{'application/x-www-form-urlencoded':{'schema':{'type':'object','required':['username','password'],'properties':{'username':{'type':'string','format':'email','description':'Adres e-mail'},'password':{'type':'string','format':'password'}}}},'application/json':{'schema':{'type':'object','required':['email','password'],'properties':{'email':{'type':'string','format':'email'},'password':{'type':'string','format':'password'}}}}}},'responses':{'200':{'description':'Token wydany','content':{'application/json':{'schema':{'type':'object','properties':{'access_token':{'type':'string'},'token_type':{'type':'string','example':'Bearer'},'expires_in':{'type':'integer'}}}}}},'401':{'description':'Błędne dane logowania'}}}},
         '/api/auth/logout':{'post':{'tags':['Auth'],'summary':'Wylogowanie','responses':{'200':{'description':'Wylogowano'}}}},
         '/api/me':{'get':{'tags':['Auth'],'summary':'Bieżący użytkownik','responses':{'200':{'description':'Użytkownik'}}}},
         '/api/vehicles':{'get':{'tags':['Vehicles'],'summary':'Lista dostępnych pojazdów','responses':{'200':{'description':'Lista'}}},'post':{'tags':['Vehicles'],'summary':'Dodanie pojazdu','responses':{'201':{'description':'Utworzono'}}}},