Merge branch 'master' of github.com:freenit-framework/backend

bin/freenit.sh

@@ -22,6 +22,15 @@ if [ -z "${TYPE}" ]; then
   help >&2
   exit 1
 fi
+
+case "${TYPE}" in
+  project|backend|react|svelte)
+    ;;
+  *)
+    help >&2
+    exit 1
+    ;;
+esac
 shift
 
 NAME="${1}"
@@ -494,4 +503,5 @@ EOF
   echo "DEVEL_MODE = YES" >vars.mk
 }
 
-project
+
+${TYPE}

freenit/api/auth.py

@@ -1,11 +1,11 @@
-from ..auth import cookieAuthentication, fastapiUsers
+from ..auth import authBackend, fastapiUsers
 from ..config import getConfig
 from .router import api
 
 config = getConfig()
 
 tags = ["auth"]
-api.include_router(fastapiUsers.get_auth_router(cookieAuthentication), prefix="/auth", tags=tags)
+api.include_router(fastapiUsers.get_auth_router(authBackend), prefix="/auth", tags=tags)
 api.include_router(fastapiUsers.get_register_router(), prefix="/auth", tags=tags)
 api.include_router(fastapiUsers.get_reset_password_router(), prefix="/auth", tags=tags)
 api.include_router(fastapiUsers.get_verify_router(), prefix="/auth", tags=tags)

freenit/auth.py

@@ -1,19 +1,22 @@
 from fastapi import Depends
 from fastapi_users import BaseUserManager, FastAPIUsers
-from fastapi_users.authentication import CookieAuthentication
+from fastapi_users.authentication import AuthenticationBackend, CookieTransport, JWTStrategy
 from fastapi_users.db import OrmarUserDatabase
 
 from .config import getConfig
 
 config = getConfig()
 auth = config.get_user()
-cookieAuthentication = CookieAuthentication(
-    secret=config.secret,
-    lifetime_seconds=3600,
-    cookie_secure=config.cookie_secure,
-)
-authBackends = [cookieAuthentication]
+cookie_transport = CookieTransport(cookie_max_age=3600,cookie_httponly=True)
+
+def get_jwt_strategy() -> JWTStrategy:
+    return JWTStrategy(secret=config.secret, lifetime_seconds=3600)
 
+authBackend = AuthenticationBackend(
+    name="freenit",
+    transport=cookie_transport,
+    get_strategy=get_jwt_strategy,
+)
 
 class UserManager(BaseUserManager[auth.UserCreate, auth.UserDB]):
     user_db_model = auth.UserDB
@@ -31,7 +34,7 @@ def get_user_manager(user_db: OrmarUserDatabase = Depends(get_user_db)):
 
 fastapiUsers = FastAPIUsers(
     get_user_manager,
-    authBackends,
+    [authBackend],
     auth.User,
     auth.UserCreate,
     auth.UserUpdate,

freenit/version.py

@@ -1 +1 @@
-version = "0.2.16"
+version = "0.2.18"

setup.py

@@ -52,6 +52,8 @@
             "isort",
         ],
         "test": [
+            "black",
+            "isort",
             "pytest-asyncio",
             "pytest-factoryboy",
         ],