zrb 0.0.51__tar.gz → 0.0.52__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.0.51
+Version: 0.0.52
 Summary: Your faithful companion
 Author-email: Go Frendi Gunawan <gofrendiasgard@gmail.com>
 Requires-Python: >=3.8
@@ -29,10 +29,11 @@ Project-URL: Homepage, https://github.com/state-alchemists/zaruba
 Provides-Extra: dev
 Provides-Extra: test
 
-# Zrb (WIP)
+# Zrb (WIP): Your Faithful Companion
 
-Your faithful companion.
+![](images/zrb/android-chrome-192x192.png)
 
+Zrb is a task runner to help you automate day-to-day tasks.
 # Installation
 
 ```bash

{zrb-0.0.51 → zrb-0.0.52}/README.md

@@ -1,7 +1,8 @@
-# Zrb (WIP)
+# Zrb (WIP): Your Faithful Companion
 
-Your faithful companion.
+![](images/zrb/android-chrome-192x192.png)
 
+Zrb is a task runner to help you automate day-to-day tasks.
 # Installation
 
 ```bash

zrb-0.0.52/images/fastapp/about.txt

@@ -0,0 +1,6 @@
+This favicon was generated using the following font:
+
+- Font Title: Lemon
+- Font Author: Copyright 2011 The Lemon Project Authors (https://github.com/etunni/lemon) with Reserved Font Name "Lemon"
+- Font Source: http://fonts.gstatic.com/s/lemon/v15/HI_EiYEVKqRMq0jBSZXAQ4-d.ttf
+- Font License: SIL Open Font License, 1.1 (http://scripts.sil.org/OFL))

zrb-0.0.52/images/fastapp/site.webmanifest

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

zrb-0.0.52/images/zrb/about.txt

@@ -0,0 +1,6 @@
+This favicon was generated using the following font:
+
+- Font Title: Lemon
+- Font Author: Copyright 2011 The Lemon Project Authors (https://github.com/etunni/lemon) with Reserved Font Name "Lemon"
+- Font Source: http://fonts.gstatic.com/s/lemon/v15/HI_EiYEVKqRMq0jBSZXAQ4-d.ttf
+- Font License: SIL Open Font License, 1.1 (http://scripts.sil.org/OFL))

zrb-0.0.52/images/zrb/site.webmanifest

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

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

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "zrb"
-version = "0.0.51"
+version = "0.0.52"
 authors = [
   { name="Go Frendi Gunawan", email="gofrendiasgard@gmail.com" },
 ]

{zrb-0.0.51 → zrb-0.0.52}/src/zrb/builtin/generator/fastapp/add.py

@@ -67,8 +67,9 @@ copy_resource = ResourceMaker(
     excludes=[
         '*/deployment/venv',
         '*/src/kebab-app-name/venv',
-        '*/src/kebab-app-name/frontend/node_modules',
-        '*/src/kebab-app-name/frontend/build',
+        '*/src/kebab-app-name/src/frontend/node_modules',
+        '*/src/kebab-app-name/src/frontend/build',
+        '*/src/kebab-app-name/src/frontend/.svelte-kit',
     ]
 )
 

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

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

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

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

{zrb-0.0.51 → zrb-0.0.52}/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",
+				"jwt-decode": "^3.1.2",
 				"process": "^0.11.10"
 			},
 			"devDependencies": {
@@ -1884,6 +1885,11 @@
 			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
 			"dev": true
 		},
+		"node_modules/jwt-decode": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
+			"integrity": "sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="
+		},
 		"node_modules/kleur": {
 			"version": "4.1.5",
 			"resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",

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

@@ -40,6 +40,7 @@
 	"dependencies": {
 		"axios": "^1.4.0",
 		"daisyui": "^2.51.6",
+		"jwt-decode": "^3.1.2",
 		"process": "^0.11.10"
 	}
 }

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

@@ -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-0.0.52/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/lib/auth/store.ts

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

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

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

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

@@ -5,8 +5,7 @@
 {#if 'submenus' in data && data.submenus}
     <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
     <li tabindex="0">
-        <!-- svelte-ignore a11y-invalid-attribute -->
-        <a href="#">
+        <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>

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

@@ -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-0.0.52/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/lib/cookie/cookie.ts

@@ -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-0.0.52/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/frontend/src/routes/+layout.svelte

@@ -0,0 +1,13 @@
+<script lang="ts">
+  	import "../app.css";
+	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>
+
+<title>{appTitle}</title>
+<Navigation data={navData} logo={logo} brand={appBrand}></Navigation>
+<div class="pl-10 pr-10">
+	<slot></slot>
+</div>

{zrb-0.0.51 → zrb-0.0.52}/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/module/auth/entity/user/api.py

@@ -10,6 +10,7 @@ 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
 
 
@@ -46,10 +47,10 @@ def register_auth_api(
             raise HTTPAPIException(error=e)
 
     @app.post('/api/v1/auth/refresh-token', response_model=TokenResponse)
-    async def refresh_token(token: str) -> TokenResponse:
+    async def refresh_token(data: RefreshTokenRequest) -> TokenResponse:
         try:
             token = await rpc_caller.call(
-                'auth_refresh_token', token=token
+                'auth_refresh_token', token=data.token
             )
             return TokenResponse(access_token=token, token_type='bearer')
         except Exception as e:
@@ -57,13 +58,13 @@ def register_auth_api(
 
     @app.post('/api/v1/auth/is-authorized', response_model=Mapping[str, bool])
     async def is_authorized(
-        permission_names: List[str],
+        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, *permission_names
+                'auth_is_user_authorized', id=user_id, *data.permission_names
             )
         except Exception as e:
             raise HTTPAPIException(error=e)

zrb-0.0.52/src/zrb/builtin/generator/fastapp/template/src/kebab-app-name/src/module/auth/schema/request.py

@@ -0,0 +1,10 @@
+from typing import List
+from pydantic import BaseModel
+
+
+class RefreshTokenRequest(BaseModel):
+    token: str
+
+
+class IsAuthorizedRequest(BaseModel):
+    permission_names: List[str]

{zrb-0.0.51 → zrb-0.0.52}/src/zrb/builtin/generator/project/template/.gitignore

@@ -1,3 +1,3 @@
 __pycache__
 venv
-.env
+/.env

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

@@ -1,3 +1,3 @@
-.env
+/.env
 __pycache__
 venv

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

@@ -1,23 +0,0 @@
-<script lang="ts">
-    import type {SingleNavData} from './type';
-    import Menu from './Menu.svelte';
-    export let logo: string;
-    export let brand: string;
-    export let data: SingleNavData[];
-    export let authTokenCookieKey: string;
-</script>
-
-<div class="navbar 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}
-        </ul>
-    </div>
-</div>
-{authTokenCookieKey}

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

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