zrb 0.0.52__tar.gz → 0.0.53__tar.gz

{zrb-0.0.52 → zrb-0.0.53}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.0.52
+Version: 0.0.53
 Summary: Your faithful companion
 Author-email: Go Frendi Gunawan <gofrendiasgard@gmail.com>
 Requires-Python: >=3.8
@@ -24,8 +24,8 @@ Requires-Dist: pytest==7.2.1 ; extra == "test"
 Requires-Dist: pytest-cov==4.0.0 ; extra == "test"
 Requires-Dist: pytest-xdist==3.2.0 ; extra == "test"
 Requires-Dist: pytest-asyncio==0.21.0 ; extra == "test"
-Project-URL: Bug Tracker, https://github.com/state-alchemists/zaruba/issues
-Project-URL: Homepage, https://github.com/state-alchemists/zaruba
+Project-URL: Bug Tracker, https://github.com/state-alchemists/zrb/issues
+Project-URL: Homepage, https://github.com/state-alchemists/zrb
 Provides-Extra: dev
 Provides-Extra: test
 

{zrb-0.0.52 → zrb-0.0.53}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "zrb"
-version = "0.0.52"
+version = "0.0.53"
 authors = [
   { name="Go Frendi Gunawan", email="gofrendiasgard@gmail.com" },
 ]
@@ -42,8 +42,8 @@ test = [
 ]
 
 [project.urls]
-"Homepage" = "https://github.com/state-alchemists/zaruba"
-"Bug Tracker" = "https://github.com/state-alchemists/zaruba/issues"
+"Homepage" = "https://github.com/state-alchemists/zrb"
+"Bug Tracker" = "https://github.com/state-alchemists/zrb/issues"
 
 [project.scripts]
 zrb = "zrb.__main__:cli"

{zrb-0.0.52 → zrb-0.0.53}/src/zrb/builtin/generator/fastapp/template/_automate/snake_app_name/cmd/start.sh

@@ -3,4 +3,4 @@ echo "Activate venv"
 source venv/bin/activate
 
 echo "Start app"
-uvicorn main:app --host {{env.get("APP_HOST", "0.0.0.0")}} --port {{env.get("APP_PORT", "8080")}} {{ "--reload" if util.to_boolean(env.get("APP_RELOAD", "true")) else "" }}
+uvicorn main:app --host {{env.get("APP_HOST", "0.0.0.0")}} --port {{env.get("APP_PORT", "8080")}} {{ "--reload --reload-include index.html" if util.to_boolean(env.get("APP_RELOAD", "true")) else "" }}

{zrb-0.0.52 → zrb-0.0.53}/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/.gitignore

@@ -1,4 +1,4 @@
-/.env
+.env
 frontend/build
 frontend/build
 __pycache__

{zrb-0.0.52 → zrb-0.0.53}/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/config.py

@@ -13,13 +13,22 @@ app_host = os.getenv('APP_HOST', '0.0.0.0')
 app_port = int(os.getenv('APP_PORT', '8080'))
 app_reload = str_to_boolean(os.getenv('APP_RELOAD', 'true'))
 app_max_not_ready = int(os.getenv('APP_MAX_NOT_READY', '10'))
-app_auth_token_cookie_key = os.getenv(
-    'PUBLIC_AUTH_TOKEN_COOKIE_KEY', 'auth_token'
+
+app_auth_access_token_cookie_key = os.getenv(
+    'PUBLIC_AUTH_ACCESS_TOKEN_COOKIE_KEY', 'access_token'
+)
+app_auth_refresh_token_cookie_key = os.getenv(
+    'PUBLIC_AUTH_REFRESH_TOKEN_COOKIE_KEY', 'refresh_token'
 )
-app_auth_token_expire_seconds = int(os.getenv(
-    'APP_AUTH_TOKEN_EXPIRE_SECONDS', '300'
+
+app_auth_access_token_type = os.getenv('APP_AUTH_ACCESS_TOKEN_TYPE', 'jwt')
+app_auth_access_token_expire_seconds = int(os.getenv(
+    'APP_AUTH_ACCESS_TOKEN_EXPIRE_SECONDS', '300'
+))
+app_auth_refresh_token_type = os.getenv('APP_AUTH_REFRESH_TOKEN_TYPE', 'jwt')
+app_auth_refresh_token_expire_seconds = int(os.getenv(
+    'APP_AUTH_REFRESH_TOKEN_EXPIRE_SECONDS', '86400'
 ))
-app_auth_token_type = os.getenv('APP_AUTH_TOKEN_TYPE', 'jwt')
 app_auth_jwt_token_secret_key = os.getenv(
     'APP_AUTH_JWT_TOKEN_SECRET_KEY', 'secret'
 )

zrb-0.0.53/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/.env.local

@@ -0,0 +1,4 @@
+PUBLIC_BRAND=
+PUBLIC_TITLE=
+PUBLIC_AUTH_ACCESS_TOKEN_COOKIE_KEY=
+PUBLIC_AUTH_REFRESH_TOKEN_COOKIE_KEY=

{zrb-0.0.52 → zrb-0.0.53}/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/.gitignore

@@ -3,7 +3,7 @@ node_modules
 /build
 /.svelte-kit
 /package
-# .env
+.env
 # .env.*
 !.env.example
 vite.config.js.timestamp-*

{zrb-0.0.52 → zrb-0.0.53}/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/package-lock.json

@@ -10,6 +10,7 @@
 			"dependencies": {
 				"axios": "^1.4.0",
 				"daisyui": "^2.51.6",
+				"js-cookie": "^3.0.5",
 				"jwt-decode": "^3.1.2",
 				"process": "^0.11.10"
 			},
@@ -18,6 +19,7 @@
 				"@sveltejs/adapter-auto": "^2.0.0",
 				"@sveltejs/adapter-static": "^2.0.1",
 				"@sveltejs/kit": "^1.5.0",
+				"@types/js-cookie": "^3.0.3",
 				"@typescript-eslint/eslint-plugin": "^5.45.0",
 				"@typescript-eslint/parser": "^5.45.0",
 				"autoprefixer": "^10.4.14",
@@ -352,6 +354,12 @@
 			"integrity": "sha512-COUnqfB2+ckwXXSFInsFdOAWQzCCx+a5hq2ruyj+Vjund94RJQd4LG2u9hnvJrTgunKAaax7ancBYlDrNYxA0g==",
 			"dev": true
 		},
+		"node_modules/@types/js-cookie": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@types/js-cookie/-/js-cookie-3.0.3.tgz",
+			"integrity": "sha512-Xe7IImK09HP1sv2M/aI+48a20VX+TdRJucfq4vfRVy6nWN8PYPOEnlMRSgxJAgYQIXJVL8dZ4/ilAM7dWNaOww==",
+			"dev": true
+		},
 		"node_modules/@types/json-schema": {
 			"version": "7.0.11",
 			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
@@ -1851,6 +1859,14 @@
 				"jiti": "bin/jiti.js"
 			}
 		},
+		"node_modules/js-cookie": {
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
+			"integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==",
+			"engines": {
+				"node": ">=14"
+			}
+		},
 		"node_modules/js-sdsl": {
 			"version": "4.4.0",
 			"resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz",

{zrb-0.0.52 → zrb-0.0.53}/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/package.json

@@ -19,6 +19,7 @@
 		"@sveltejs/adapter-auto": "^2.0.0",
 		"@sveltejs/adapter-static": "^2.0.1",
 		"@sveltejs/kit": "^1.5.0",
+		"@types/js-cookie": "^3.0.3",
 		"@typescript-eslint/eslint-plugin": "^5.45.0",
 		"@typescript-eslint/parser": "^5.45.0",
 		"autoprefixer": "^10.4.14",
@@ -40,6 +41,7 @@
 	"dependencies": {
 		"axios": "^1.4.0",
 		"daisyui": "^2.51.6",
+		"js-cookie": "^3.0.5",
 		"jwt-decode": "^3.1.2",
 		"process": "^0.11.10"
 	}

zrb-0.0.53/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/lib/auth/helper.ts

@@ -0,0 +1,146 @@
+import axios from 'axios';
+import jwt_decode from 'jwt-decode';
+import { authAccessTokenCookieKey, authRefreshTokenCookieKey, isAuthorizedApiUrl, loginApiUrl, refreshTokenApiUrl } from '../config/app';
+import { userIdStore, userNameStore } from './store';
+import type { AccessTokenData } from './type';
+import Cookies from 'js-cookie';
+
+
+export async function getAuthorization(permissions: string[]): Promise<{[key: string]: boolean}> {
+    try {
+        const accessToken = await ensureAccessToken();
+        if (accessToken == '') {
+            return {};
+        }
+        const response = await axios.post(
+            isAuthorizedApiUrl,
+            {permission_names: permissions},
+            {
+                headers: { Authorization: `Bearer ${accessToken}` }
+            }
+        );
+        if (response && response.status == 200 && response.data) {
+            return response.data;
+        }
+        throw new Error('Invalid response');
+    } catch(error) {
+        console.error(error);
+    }
+    return {};
+}
+
+export async function initAuthStore() {
+    try {
+        const accessToken = await ensureAccessToken();
+        if (accessToken) {
+            setAuthStoreByAccessToken(accessToken);
+        }
+    } catch(error) {
+        console.error(error);
+    }
+}
+
+export async function ensureAccessToken(): Promise<string> {
+    try {
+        const oldAccessToken = getOldAccessToken();
+        if (oldAccessToken) {
+            const oldAccessTokenData: AccessTokenData = decodeAccessToken(oldAccessToken);
+            const { expireAt } = oldAccessTokenData;
+            const now = new Date();
+            if (now.getTime()/1000 < expireAt) {
+                return oldAccessToken;
+            }
+        }
+        const oldRefreshToken = getOldRefreshToken();
+        if (oldRefreshToken) {
+            const response = await axios.post(
+                refreshTokenApiUrl,
+                {access_token: oldAccessToken},
+                {
+                    headers: { Authorization: `Bearer ${oldRefreshToken}` }
+                }
+            );
+            if (response && response.status == 200 && response.data && response.data.access_token && response.data.refresh_token) {
+                const newAccessToken: string = response.data.access_token;
+                const newRefreshToken: string = response.data.refresh_token;
+                saveToken(newAccessToken, newRefreshToken);
+                setAuthStoreByAccessToken(newAccessToken);
+                return newAccessToken;
+            }
+            throw new Error('Invalid refresh-token response');
+        }
+        throw new Error('Cannot refresh token');
+    } catch(error) {
+        logout();
+        throw(error);
+    }
+}
+
+function getOldRefreshToken(): string | null {
+    return localStorage.getItem(authRefreshTokenCookieKey); 
+}
+
+function getOldAccessToken(): string | undefined {
+    return Cookies.get(authAccessTokenCookieKey); 
+}
+
+export async function login(identity: string, password: string): Promise<boolean> {
+    try {
+        const response = await axios.post(loginApiUrl, {identity, password});
+        if (response && response.status == 200 && response.data && response.data.access_token && response.data.refresh_token) {
+            const accessToken: string = response.data.access_token;
+            const refreshToken: string = response.data.refresh_token;
+            saveToken(accessToken, refreshToken);
+            setAuthStoreByAccessToken(accessToken);
+            return true;
+        }
+    } catch(error) {
+        console.error(error);
+    }
+    logout();
+    return false;
+}
+
+function saveToken(accessToken: string, refreshToken: string) {
+    Cookies.set(authAccessTokenCookieKey, accessToken);
+    localStorage.setItem(authRefreshTokenCookieKey, refreshToken);
+}
+
+export function logout() {
+    Cookies.remove(authAccessTokenCookieKey);
+    localStorage.removeItem(authRefreshTokenCookieKey);
+    unsetAuthStore();
+}
+
+function unsetAuthStore() {
+    setAuthStore('', '');
+}
+
+function setAuthStoreByAccessToken(accessToken: string) {
+    const tokenData = decodeAccessToken(accessToken);
+    setAuthStore(tokenData.sub.userId, tokenData.sub.userName);
+}
+
+function setAuthStore(newUserId: string, newUserName: string) {
+    userIdStore.set(newUserId);
+    userNameStore.set(newUserName);
+}
+
+function decodeAccessToken(accessToken: string): AccessTokenData {
+    const jwtTokenData: {
+        exp: number,
+        sub: {
+            user_id: string,
+            username: string,
+            expire_seconds: number
+        }
+    } = jwt_decode(accessToken);
+    return {
+        sub: {
+            userId: jwtTokenData.sub.user_id,
+            userName: jwtTokenData.sub.username,
+            expireSeconds: jwtTokenData.sub.expire_seconds,
+        },
+        expireAt: jwtTokenData.exp
+    }
+}

zrb-0.0.53/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/lib/auth/type.ts

@@ -0,0 +1,10 @@
+export interface AccessTokenData {
+    sub: AccessTokenDataSub;
+    expireAt: number;
+}
+
+export interface AccessTokenDataSub {
+    userId: string;
+    userName: string;
+    expireSeconds: number;
+}

zrb-0.0.53/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/lib/components/navigation/Menu.svelte

@@ -0,0 +1,23 @@
+<script lang="ts">
+    import type {SingleNavData} from './type';
+    export let singleNavData: SingleNavData;
+    export let authorization: {[permission: string]: boolean} = {};
+</script>
+{#if (!singleNavData.permission || singleNavData.permission == '' ||  (authorization[singleNavData.permission]))}
+    {#if 'submenus' in singleNavData && singleNavData.submenus}
+        <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+        <li tabindex="0">
+            <a href="#top">
+                {singleNavData.title}
+                <svg class="fill-current" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24"><path d="M7.41,8.58L12,13.17L16.59,8.58L18,10L12,16L6,10L7.41,8.58Z"/></svg>
+            </a>
+            <ul class="p-2 bg-base-100">
+                {#each singleNavData.submenus as submenu}
+                    <svelte:self singleNavData={submenu} authorization={authorization} />
+                {/each}
+            </ul>
+        </li>
+    {:else}
+        <li><a href={singleNavData.url} class="px-4">{singleNavData.title}</a></li>
+    {/if}
+{/if}

{zrb-0.0.52 → zrb-0.0.53}/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/lib/components/navigation/Navigation.svelte

@@ -3,31 +3,34 @@
     import { onMount } from 'svelte';
     import Menu from './Menu.svelte';
     import type { SingleNavData } from './type';
-    import { login, logout, refreshToken } from '../../auth/auth';
+    import { getAuthorization, initAuthStore, login, logout } from '../../auth/helper';
     import { userIdStore } from '../../auth/store';
+	import { getNavDataPermissions } from './helper';
 
     export let logo: string;
     export let brand: string;
-    export let data: SingleNavData[];
+    export let navData: SingleNavData[];
     export let loginTitle: string = 'Login';
     export let logoutTitle: string = 'Logout';
-    export let loginApiUrl: string = '/api/v1/auth/login';
-    export let refreshTokenApiUrl: string = '/api/v1/auth/refresh-token';
+
+    const navDataPermissions = getNavDataPermissions(navData);
 
     let identity: string;
     let password: string;
-
     let userId = '';
-    userIdStore.subscribe((value) => {
+    let authorization: {[key: string]: boolean} = {};
+
+    userIdStore.subscribe(async (value) => {
         userId = value;
+        authorization = await getAuthorization(navDataPermissions);
     });
 
     onMount(async() => {
-        await refreshToken(refreshTokenApiUrl);
+        await initAuthStore();
     });
 
     async function onLoginClick() {
-        const loginSuccess = await login(loginApiUrl, identity, password);
+        const loginSuccess = await login(identity, password);
         if (loginSuccess) {
             await goto('/');
             return;
@@ -41,15 +44,15 @@
     }
 </script>
 
-<div class="navbar sticky top-0 bg-base-100">
+<div class="navbar sticky top-0 bg-base-100 z-50">
     <div class="flex-1">
         <img class="h-8 mr-3" src={logo} alt="Logo">
         <a href="/" class="btn btn-ghost normal-case text-xl">{brand}</a>
     </div>
     <div class="flex-none">
         <ul class="menu menu-horizontal px-1">
-            {#each data as menuData}
-                <Menu data={menuData} />
+            {#each navData as singleNavData}
+                <Menu singleNavData={singleNavData} authorization={authorization} />
             {/each}
             {#if userId == ''}
                 <li><a href="#login-modal" class="px-4">{loginTitle}</a></li>

zrb-0.0.53/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/lib/components/navigation/helper.ts

@@ -0,0 +1,18 @@
+import type { SingleNavData } from "./type";
+
+export function getNavDataPermissions(navData: SingleNavData[]): string[] {
+    let permissions: string[] = [];
+    for (const singleNavData of navData) {
+        if (singleNavData.permission && singleNavData.permission != '') {
+            permissions.push(singleNavData.permission);
+        }
+        if (singleNavData.submenus) {
+            const subPermissions: string[] = getNavDataPermissions(singleNavData.submenus);
+            const uniqueSubPermissions = subPermissions.filter((value) => {
+                return permissions.indexOf(value) === -1
+            });
+            permissions = permissions.concat(uniqueSubPermissions)
+        }
+    }
+    return permissions
+}

zrb-0.0.53/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/lib/config/app.ts

@@ -0,0 +1,9 @@
+import {PUBLIC_BRAND, PUBLIC_TITLE, PUBLIC_AUTH_ACCESS_TOKEN_COOKIE_KEY, PUBLIC_AUTH_REFRESH_TOKEN_COOKIE_KEY} from '$env/static/public';
+export const appBrand = PUBLIC_BRAND || 'PascalAppName';
+export const appTitle = PUBLIC_TITLE || 'PascalAppName';
+export const authAccessTokenCookieKey = PUBLIC_AUTH_ACCESS_TOKEN_COOKIE_KEY || 'access_token';
+export const authRefreshTokenCookieKey = PUBLIC_AUTH_REFRESH_TOKEN_COOKIE_KEY || 'refresh_token';
+
+export const loginApiUrl: string = '/api/v1/auth/login';
+export const refreshTokenApiUrl: string = '/api/v1/auth/refresh-token';
+export const isAuthorizedApiUrl: string = '/api/v1/auth/is-authorized';

zrb-0.0.53/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/lib/config/navData.ts

@@ -0,0 +1,14 @@
+import type { SingleNavData } from '../components/navigation/type'
+
+export const navData: SingleNavData[] = [
+    {title: 'Home', url: '/'},
+    {
+        title: 'Auth',
+        url: '#',
+        submenus: [
+            {title: 'Permission', url: '/auth/permission', permission: 'auth:permission:get'},
+            {title: 'Group', url: '/auth/group', permission: 'auth:group:get'},
+            {title: 'User', url: '/auth/user', permission: 'auth:user:get'},
+        ]
+    },
+]

zrb-0.0.53/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/lib/error/helper.ts

@@ -0,0 +1,12 @@
+import axios from 'axios';
+
+export function getErrorMessage(error: unknown): string {
+    if (axios.isAxiosError(error)) {
+        let errorMessage = error.message;
+        if (error.response?.data?.detail) {
+            errorMessage += JSON.stringify(error.response.data.detail);
+        }
+        return errorMessage;
+    }
+    return error + '';
+}

zrb-0.0.53/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/routes/+error.svelte

@@ -0,0 +1,8 @@
+<script lang="ts">
+    import { page } from '$app/stores';
+</script>
+<div class="flex flex-col justify-center items-center">
+    <h1 class="text-5xl">{$page.status}</h1>
+    <p class="text-3xl">{$page.error?.message}</p>
+    <a class="btn btn-primary mt-5" href="/">Let's go home</a>
+</div>

{zrb-0.0.52 → zrb-0.0.53}/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/routes/+layout.svelte

@@ -1,13 +1,14 @@
 <script lang="ts">
-  	import "../app.css";
+    import { onMount } from 'svelte';
 	import Navigation from '$lib/components/navigation/Navigation.svelte';
 	import { navData } from '$lib/config/navData';
-	import { appBrand, appTitle } from '$lib/config/config';
+	import { appBrand, appTitle } from '$lib/config/app';
 	import logo from '/static/logo.png';
+  	import "../app.css";
 </script>
 
 <title>{appTitle}</title>
-<Navigation data={navData} logo={logo} brand={appBrand}></Navigation>
+<Navigation navData={navData} logo={logo} brand={appBrand}></Navigation>
 <div class="pl-10 pr-10">
 	<slot></slot>
 </div>

zrb-0.0.53/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/routes/+page.svelte

@@ -0,0 +1,2 @@
+<h1 class="text-3xl font-bold underline">Welcome to PascalAppName</h1>
+<p>Visit <a href="https://kit.svelte.dev">kit.svelte.dev</a> to read the documentation</p>

zrb-0.0.53/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/module/auth/component/__init__.py

@@ -0,0 +1,21 @@
+from module.auth.component.authorizer import authorizer
+from module.auth.component.base import Base
+from module.auth.component.password_hasher import password_hasher
+from module.auth.component.access_token_scheme import access_token_scheme
+from module.auth.component.access_token_util import access_token_util
+from module.auth.component.bearer_token_scheme import bearer_token_scheme
+from module.auth.component.refresh_token_util import refresh_token_util
+from module.auth.component.user import (
+    admin_user, admin_user_password, guest_user
+)
+
+assert authorizer
+assert Base
+assert password_hasher
+assert access_token_scheme
+assert access_token_util
+assert bearer_token_scheme
+assert refresh_token_util
+assert admin_user
+assert admin_user_password
+assert guest_user

zrb-0.0.53/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/module/auth/component/access_token_scheme.py

@@ -0,0 +1,14 @@
+from module.auth.core import (
+    AccessTokenScheme, create_oauth2_bearer_access_token_scheme
+)
+from module.auth.component.access_token_util import access_token_util
+from module.auth.component.user import guest_user
+from config import app_auth_access_token_cookie_key
+
+
+access_token_scheme: AccessTokenScheme = create_oauth2_bearer_access_token_scheme( # noqa
+    guest_user=guest_user,
+    access_token_util=access_token_util,
+    token_url='/api/v1/auth/login-oauth',
+    token_cookie_key=app_auth_access_token_cookie_key
+)

zrb-0.0.53/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/module/auth/component/access_token_util.py

@@ -0,0 +1,17 @@
+from config import (
+    app_auth_access_token_type, app_auth_jwt_token_algorithm,
+    app_auth_jwt_token_secret_key
+)
+from module.auth.core import AccessTokenUtil, JWTAccessTokenUtil
+
+
+def init_token_util() -> AccessTokenUtil:
+    if app_auth_access_token_type.lower() == 'jwt':
+        return JWTAccessTokenUtil(
+            secret_key=app_auth_jwt_token_secret_key,
+            algorithm=app_auth_jwt_token_algorithm
+        )
+    raise ValueError(f'Invalid auth token type: {app_auth_access_token_type}')
+
+
+access_token_util = init_token_util()

zrb-0.0.53/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/module/auth/component/bearer_token_scheme.py

@@ -0,0 +1,5 @@
+from fastapi.security import OAuth2PasswordBearer
+
+bearer_token_scheme = OAuth2PasswordBearer(
+    tokenUrl='/api/v1/auth/login-oauth', auto_error=False
+)

{zrb-0.0.52 → zrb-0.0.53}/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/module/auth/component/model/user_model.py

@@ -1,7 +1,10 @@
-from config import app_auth_token_expire_seconds, app_auth_admin_active
+from config import (
+    app_auth_admin_active, app_auth_access_token_expire_seconds,
+    app_auth_refresh_token_expire_seconds
+)
 from module.auth.component.repo.user_repo import user_repo
 from module.auth.entity.user.model import UserModel
-from module.auth.component import token_util
+from module.auth.component import access_token_util, refresh_token_util
 from module.auth.component.user import (
     admin_user, admin_user_password, guest_user
 )
@@ -11,8 +14,10 @@ from module.auth.component.model.permission_model import permission_model
 user_model: UserModel = UserModel(
     repo=user_repo,
     permission_model=permission_model,
-    token_util=token_util,
-    expire_seconds=app_auth_token_expire_seconds,
+    access_token_util=access_token_util,
+    access_token_expire_seconds=app_auth_access_token_expire_seconds,
+    refresh_token_util=refresh_token_util,
+    refresh_token_expire_seconds=app_auth_refresh_token_expire_seconds,
     guest_user=guest_user,
     admin_user=admin_user if app_auth_admin_active else None,
     admin_user_password=admin_user_password