PyPI - zrb - Versions diffs - 0.0.50__py3-none-any.whl → 0.0.52__py3-none-any.whl - Mend

zrb 0.0.50py3-none-any.whl → 0.0.52py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (63) hide show

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/package.json CHANGED Viewed

@@ -36,5 +36,11 @@
 		"vite": "^4.2.0",
 		"vitest": "^0.25.3"
 	},
-	"type": "module"
+	"type": "module",
+	"dependencies": {
+		"axios": "^1.4.0",
+		"daisyui": "^2.51.6",
+		"jwt-decode": "^3.1.2",
+		"process": "^0.11.10"
+	}
 }

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/app.html CHANGED Viewed

@@ -6,7 +6,7 @@
 		<meta name="viewport" content="width=device-width" />
 		%sveltekit.head%
 	</head>
-	<body data-sveltekit-preload-data="hover">
+	<body data-sveltekit-preload-data="hover" data-theme="emerald">
 		<div style="display: contents">%sveltekit.body%</div>
 	</body>
 </html>

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

@@ -0,0 +1,83 @@
+import axios from 'axios';
+import jwt_decode from 'jwt-decode';
+import { appAuthTokenCookieKey } from '../config/config';
+import { getCookie, setCookie, unsetCookie } from '../cookie/cookie';
+import { userIdStore, userNameStore } from './store';
+import type { TokenData } from './type';
+export async function refreshToken(refreshTokenUrl: string): Promise<boolean> {
+    try {
+        const oldToken: string = getCookie(appAuthTokenCookieKey);
+        const oldTokenData: TokenData = decodeToken(oldToken);
+        const { expireAt } = oldTokenData;
+        const now = new Date();
+        if (now.getTime()/1000 > expireAt) {
+            throw new Error('Expired token');
+        }
+        const response = await axios.post(refreshTokenUrl, {token: oldToken});
+        if (response && response.status == 200 && response.data && response.data.access_token) {
+            const newToken: string = response.data.access_token;
+            setCookie(appAuthTokenCookieKey, newToken);
+            setAuthStoreByToken(newToken);
+            return true;
+        }
+    } catch(error) {
+        console.error(error);
+    }
+    logout();
+    return false;
+}
+export async function login(loginUrl: string, identity: string, password: string): Promise<boolean> {
+    try {
+        const response = await axios.post(loginUrl, {identity, password});
+        if (response && response.status == 200 && response.data && response.data.access_token) {
+            const token: string = response.data.access_token;
+            setCookie(appAuthTokenCookieKey, token);
+            setAuthStoreByToken(token);
+            return true;
+        }
+    } catch(error) {
+        console.error(error);
+    }
+    logout();
+    return false;
+}
+export function logout() {
+    unsetCookie(appAuthTokenCookieKey)
+    unsetAuthStore();
+}
+function unsetAuthStore() {
+    setAuthStore('', '');
+}
+function setAuthStoreByToken(token: string) {
+    const tokenData = decodeToken(token);
+    setAuthStore(tokenData.sub.userId, tokenData.sub.userName);
+}
+function setAuthStore(newUserId: string, newUserName: string) {
+    userIdStore.set(newUserId);
+    userNameStore.set(newUserName);
+}
+function decodeToken(token: string): TokenData {
+    const jwtTokenData: {
+        exp: number,
+        sub: {
+            user_id: string,
+            username: string,
+            expire_seconds: number
+        }
+    } = jwt_decode(token);
+    return {
+        sub: {
+            userId: jwtTokenData.sub.user_id,
+            userName: jwtTokenData.sub.username,
+            expireSeconds: jwtTokenData.sub.expire_seconds,
+        },
+        expireAt: jwtTokenData.exp
+    }
+}

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/lib/auth/store.ts ADDED Viewed

@@ -0,0 +1,4 @@
+import { writable } from 'svelte/store';
+export const userIdStore = writable('');
+export const userNameStore = writable('');

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

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

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

@@ -0,0 +1,20 @@
+<script lang="ts">
+    import type {SingleNavData} from './type';
+    export let data: SingleNavData;
+</script>
+{#if 'submenus' in data && data.submenus}
+    <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+    <li tabindex="0">
+        <a href="#top">
+            Parent
+            <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 z-10">
+            {#each data.submenus as submenu}
+                <svelte:self data={submenu} />
+            {/each}
+        </ul>
+      </li>
+{:else}
+    <li><a href={data.url} class="px-4">{data.title}</a></li>
+{/if}

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/lib/components/navigation/Navigation.svelte ADDED Viewed

@@ -0,0 +1,77 @@
+<script lang="ts">
+    import { goto } from '$app/navigation';
+    import { onMount } from 'svelte';
+    import Menu from './Menu.svelte';
+    import type { SingleNavData } from './type';
+    import { login, logout, refreshToken } from '../../auth/auth';
+    import { userIdStore } from '../../auth/store';
+    export let logo: string;
+    export let brand: string;
+    export let data: 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';
+    let identity: string;
+    let password: string;
+    let userId = '';
+    userIdStore.subscribe((value) => {
+        userId = value;
+    });
+    onMount(async() => {
+        await refreshToken(refreshTokenApiUrl);
+    });
+    async function onLoginClick() {
+        const loginSuccess = await login(loginApiUrl, identity, password);
+        if (loginSuccess) {
+            await goto('/');
+            return;
+        }
+        alert('salah');
+    }
+    async function onLogoutClick() {
+        logout();
+        await goto('/');
+    }
+</script>
+<div class="navbar sticky top-0 bg-base-100">
+    <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}
+            {#if userId == ''}
+                <li><a href="#login-modal" class="px-4">{loginTitle}</a></li>
+            {:else}
+                <li><a href="#top" class="px-4" on:click={onLogoutClick}>{logoutTitle}</a></li>
+            {/if}
+        </ul>
+    </div>
+</div>
+<div class="modal" id="login-modal">
+    <form class="modal-box">
+        <div class="mb-6">
+            <label class="block text-gray-700 font-bold mb-2" for="identity">Identity</label>
+            <input class="w-full px-3 py-2 border rounded-lg text-gray-700 focus:outline-none focus:shadow-outline" id="identity" type="text" placeholder="Enter your username/email/phone" bind:value={identity} />
+        </div>
+        <div class="mb-6">
+            <label class="block text-gray-700 font-bold mb-2" for="password">Password</label>
+            <input class="w-full px-3 py-2 border rounded-lg text-gray-700 focus:outline-none focus:shadow-outline" id="password" type="password" placeholder="Enter your password" bind:value={password} />
+        </div>
+        <div class="modal-action">
+            <a href="#top" class="btn btn-primary" on:click={onLoginClick}>Sign in</a>
+        </div>
+    </form>
+</div>

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/lib/components/navigation/type.ts ADDED Viewed

@@ -0,0 +1,6 @@
+export interface SingleNavData {
+    url: string;
+    title: string;
+    permission?: string;
+    submenus?: SingleNavData[];
+}

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

@@ -0,0 +1,4 @@
+import {PUBLIC_BRAND, PUBLIC_TITLE, PUBLIC_AUTH_TOKEN_COOKIE_KEY} from '$env/static/public';
+export const appBrand = PUBLIC_BRAND || 'PascalAppName';
+export const appTitle = PUBLIC_TITLE || 'PascalAppName';
+export const appAuthTokenCookieKey = PUBLIC_AUTH_TOKEN_COOKIE_KEY || 'auth_token';

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

@@ -0,0 +1,25 @@
+import type { SingleNavData } from '../components/navigation/type'
+export const navData: SingleNavData[] = [
+    {title: "Home", url: "/"},
+    {
+        title: "Auth",
+        url: "#",
+        submenus: [
+            {title: "Permission", url: "auth/permission"},
+            {title: "Group", url: "auth/group"},
+            {title: "User", url: "auth/user"},
+        ]
+    },
+    {title: "About", url: "/about"},
+    {title: "Greetings, Lord", url: "/greetings/Lord"},
+    {
+        title: "Test",
+        url: "#",
+        submenus: [
+            {title: "Sub 1", url: "/"},
+            {title: "Sub 2 long long title", url: "/about"}
+        ]
+    },
+    {title: "Sample url", url: "/sample"},
+]

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/lib/cookie/cookie.ts ADDED Viewed

@@ -0,0 +1,19 @@
+export function setCookie(cookieName: string, cookieValue: string) {
+    document.cookie = cookieName + '=' + cookieValue + ';path=/';
+}
+export function unsetCookie(cookieName: string) {
+    document.cookie = cookieName + '=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/'
+}
+export function getCookie(cookieName: string): string {
+    let valuePrefix = cookieName + '=';
+    let cookieParts = document.cookie.split(';');
+    for(let partIndex = 0; partIndex < cookieParts.length; partIndex++) {
+        let cookiePart = cookieParts[partIndex].trim();
+        if (cookiePart.indexOf(valuePrefix) == 0) {
+            return cookiePart.substring(valuePrefix.length, cookiePart.length);
+        }
+    }
+    return '';
+}

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/routes/+layout.svelte CHANGED Viewed

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

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/routes/greetings/[slug]/+page.js CHANGED Viewed

@@ -1,6 +1,6 @@
 export function load({ params }) {
-	return {
-        title: 'hello ' + params.slug,
-        content: 'hello ' + params.slug
-	};
+    return {
+        title: 'Greetings, ' + params.slug,
+        content: 'Hello ' + params.slug
+    };
 }

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/routes/greetings/[slug]/+page.svelte CHANGED Viewed

@@ -1,9 +1,5 @@
-<h1>Greetings</h1>
-<h1>{data.title}</h1>
-<div>{@html data.content}</div>
 <script>
 	export let data;
-</script>
+</script>
+<h1>{data.title}</h1>
+<div>{@html data.content}</div>

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

@@ -0,0 +1,37 @@
+<script lang="ts">
+    let data = [
+        {"id": "abc", "name": "Cy Ganderton", "job": "Quality Control Specialist", "favorite_color": "Blue"},
+        {"id": "def", "name": "Hart Hagerty", "job": "Desktop Support Tehcnician", "favorite_color": "Purple"},
+        {"id": "ghi", "name": "Brice Syre", "job": "Tax Accountant", "favorite_color": "Red"},
+    ]
+</script>
+<div class="overflow-x-auto">
+    <table class="table w-full">
+        <!-- head -->
+        <thead>
+            <tr>
+                <th></th>
+                <th>Name</th>
+                <th>Job</th>
+                <th>Favorite Color</th>
+                <th></th>
+            </tr>
+        </thead>
+        <tbody>
+            {#each data as row}
+                <tr>
+                    <th>{row.id}</th>
+                    <td>{row.name}</td>
+                    <td>{row.job}</td>
+                    <td>{row.favorite_color}</td>
+                    <td>
+                        <a class="btn" href="insert/{row.id}">Insert</a>
+                        <a class="btn" href="update/{row.id}">Update</a>
+                        <a class="btn btn-accent" href="delete/{row.id}">Delete</a>
+                    </td>
+                </tr>
+            {/each}
+        </tbody>
+    </table>
+</div>

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/routes/sample/delete/[id]/+page.svelte ADDED Viewed

	@@ -0,0 +1 @@
1	+ Deleting

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/static/favicon.png CHANGED Viewed

Binary file

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/static/logo.png ADDED Viewed

Binary file

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/tailwind.config.js CHANGED Viewed

@@ -4,6 +4,6 @@ export default {
   theme: {
     extend: {},
   },
-  plugins: [],
+  plugins: [require("daisyui")],
 }

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/module/auth/api.py CHANGED Viewed

@@ -11,7 +11,7 @@ from module.auth.entity.group.api import (
 )
 from module.auth.entity.user.api import (
     register_api as register_user_api,
-    register_login_api as register_user_login_api
+    register_auth_api as register_user_login_api
 )

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/module/auth/component/authorizer.py CHANGED Viewed

@@ -5,5 +5,5 @@ authorizer: Authorizer = RPCAuthorizer(
     rpc_caller=rpc_caller,
     is_admin_rpc_name='auth_user_is_admin',
     is_guest_rpc_name='auth_user_is_guest',
-    is_having_permission_rpc_name='auth_user_is_having_permission'
+    is_user_authorized_rpc_name='auth_is_user_authorized'
 )

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/module/auth/component/token_scheme.py CHANGED Viewed

@@ -6,6 +6,6 @@ from module.auth.component.user import guest_user
 token_scheme: TokenScheme = create_oauth2_bearer_token_scheme(
     guest_user=guest_user,
     token_util=token_util,
-    token_url='/api/v1/login-oauth',
+    token_url='/api/v1/auth/login-oauth',
     token_cookie_key='auth_token'
 )

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/module/auth/core/authorizer/authorizer.py CHANGED Viewed

@@ -12,6 +12,6 @@ class Authorizer(ABC):
     @abstractmethod
     async def is_having_permission(
-        self, user_id: str, permission_name
+        self, user_id: str, *permission_names: str
     ) -> bool:
         pass

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/module/auth/core/authorizer/rpc_authorizer.py CHANGED Viewed

@@ -9,12 +9,12 @@ class RPCAuthorizer(Authorizer):
         rpc_caller: Caller,
         is_admin_rpc_name: str,
         is_guest_rpc_name: str,
-        is_having_permission_rpc_name: str,
+        is_user_authorized_rpc_name: str,
     ):
         self.rpc_caller = rpc_caller
         self.is_admin_rpc_name = is_admin_rpc_name
         self.is_guest_rpc_name = is_guest_rpc_name
-        self.is_having_permission_rpc_name = is_having_permission_rpc_name
+        self.is_user_authorized_rpc_name = is_user_authorized_rpc_name
     async def is_admin(self, user_id: str) -> bool:
         return await self.rpc_caller.call(
@@ -27,8 +27,12 @@ class RPCAuthorizer(Authorizer):
         )
     async def is_having_permission(
-        self, user_id: str, permission_name
+        self, user_id: str, *permission_names: str
     ) -> bool:
-        return await self.rpc_caller.call(
-            self.is_having_permission_rpc_name, user_id, permission_name
+        permission_map = await self.rpc_caller.call(
+            self.is_user_authorized_rpc_name, user_id, *permission_names
         )
+        for permission in permission_map:
+            if not permission_map[permission]:
+                return False
+        return True

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/module/auth/core/token_scheme/oauth2_bearer_token_scheme.py CHANGED Viewed

@@ -12,7 +12,7 @@ def create_oauth2_bearer_token_scheme(
     guest_user: User,
     token_util: TokenUtil,
     token_url: str,
-    token_cookie_key: str = 'auth_token'
+    token_cookie_key: str
 ) -> TokenScheme:
     oauth2_scheme = OAuth2PasswordBearer(

zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/module/auth/entity/user/api.py CHANGED Viewed

@@ -1,4 +1,4 @@
-from typing import Annotated
+from typing import Annotated, List, Mapping
 from fastapi import FastAPI, Depends
 from fastapi.security import OAuth2PasswordRequestForm
 from logging import Logger
@@ -10,10 +10,11 @@ from module.auth.schema.user import (
     User, UserData, UserResult, UserLogin
 )
 from module.auth.schema.token import TokenData, TokenResponse
+from module.auth.schema.request import RefreshTokenRequest, IsAuthorizedRequest
 from module.auth.component import token_scheme
-def register_login_api(
+def register_auth_api(
     logger: Logger,
     app: FastAPI,
     authorizer: Authorizer,
@@ -22,7 +23,7 @@ def register_login_api(
 ):
     logger.info('🥪 Register Login API for "auth.user"')
-    @app.post('/api/v1/login-oauth', response_model=TokenResponse)
+    @app.post('/api/v1/auth/login-oauth', response_model=TokenResponse)
     async def login_oauth(
         form_data: Annotated[OAuth2PasswordRequestForm, Depends()]
     ) -> TokenResponse:
@@ -30,21 +31,44 @@ def register_login_api(
             identity=form_data.username,
             password=form_data.password
         )
-        return await _login(data=data)
+        return await _create_token(data=data)
-    @app.post('/api/v1/login', response_model=TokenResponse)
+    @app.post('/api/v1/auth/login', response_model=TokenResponse)
     async def login(data: UserLogin) -> TokenResponse:
-        return await _login(data=data)
+        return await _create_token(data=data)
-    async def _login(data: UserLogin) -> TokenResponse:
+    async def _create_token(data: UserLogin) -> TokenResponse:
         try:
             token = await rpc_caller.call(
-                'auth_login', login_data=data.dict()
+                'auth_create_token', login_data=data.dict()
             )
             return TokenResponse(access_token=token, token_type='bearer')
         except Exception as e:
             raise HTTPAPIException(error=e)
+    @app.post('/api/v1/auth/refresh-token', response_model=TokenResponse)
+    async def refresh_token(data: RefreshTokenRequest) -> TokenResponse:
+        try:
+            token = await rpc_caller.call(
+                'auth_refresh_token', token=data.token
+            )
+            return TokenResponse(access_token=token, token_type='bearer')
+        except Exception as e:
+            raise HTTPAPIException(error=e)
+    @app.post('/api/v1/auth/is-authorized', response_model=Mapping[str, bool])
+    async def is_authorized(
+        data: IsAuthorizedRequest,
+        user_token_data: TokenData = Depends(token_scheme)
+    ) -> Mapping[str, str]:
+        try:
+            user_id = user_token_data.user_id
+            return await rpc_caller.call(
+                'auth_is_user_authorized', id=user_id, *data.permission_names
+            )
+        except Exception as e:
+            raise HTTPAPIException(error=e)
 def register_api(
     logger: Logger,

zrb 0.0.50__py3-none-any.whl → 0.0.52__py3-none-any.whl

zrb 0.0.50py3-none-any.whl → 0.0.52py3-none-any.whl