@fullstackunicorn/create-root 1.0.28 → 1.0.29

package/assets/root.fullstackunicorn.dev/frontend/App.uri.js

@@ -51,10 +51,16 @@ uri.errors.error = `:lang/errors/:message`
 uri.auth = {}
 const { env } = constants
 
-uri.auth.client = {}
-uri.auth.client.login = `${env.SERVER_URL_AUTH}/auth/login`
-uri.auth.client.logout = `${env.SERVER_URL_AUTH}/auth/logout`
-uri.auth.client.refresh = `${env.SERVER_URL_AUTH}/auth/refresh`
+uri.auth.gateway = {}
+uri.auth.gateway.login = `${env.SERVER_URL_AUTH}/auth/login`
+uri.auth.gateway.logout = `${env.SERVER_URL_AUTH}/auth/logout`
+uri.auth.gateway.refresh = `${env.SERVER_URL_AUTH}/auth/refresh`
+
+uri.auth.bff = {}
+uri.auth.bff.login = `${env.SERVER_URL_BFF}/auth/login`
+uri.auth.bff.logout = `${env.SERVER_URL_BFF}/auth/logout`
+uri.auth.bff.sessionMe = `${env.SERVER_URL_BFF}/session/me`
+uri.auth.bff.bootstrap = `${env.SERVER_URL_BFF}/bootstrap`
 
 uri.auth.user = {}
 uri.auth.user.login = `${env.CLIENT_URL_AUTH}/auth?:type&:token`

package/assets/root.fullstackunicorn.dev/frontend/base/account/@use.js

@@ -1,6 +1,6 @@
-import { atom, useAtom, useSetAtom, useGetAtom, makeId } from '#@/imports/npm.js'
-import { useNavigateUrl } from '#@/imports/router.js'
-import { storage } from '#@/imports/storage.js'
+import { atom, useAtom, useSetAtom, useGetAtom } from '#@/imports/npm.js'
+import { getCurrentHref, useNavigate, useNavigateUrl } from '#@/imports/router.js'
+import { useSetAlerts } from '#@/base/alerts/@use.js'
 import { uri } from '#@/App.uri.js'
 import { abs } from '#@/abstracts/abs.js'
 import { api } from '#@/client/@api.js'
@@ -14,7 +14,7 @@ export const initializeUser = atom(
     (get) => get(isUserInitialized),
     async (get, set, value) => {
 
-        const userInit = await api.auth.init()
+        const userInit = await api.auth.bootstrap()
         const userInitialized = userInit?.id ? userInit : {}
 
         set(user, userInitialized)
@@ -38,16 +38,8 @@ export const useAuthLogin = () => {
 
         if (!types.includes(type)) return
 
-        const tokenRaw = {}
-        tokenRaw.nonce = makeId()
-        tokenRaw.request_type = type
-        tokenRaw.client_id = env.CLIENT_ID
-        tokenRaw.protocol = env.PROTOCOL_AUTH
-
-        storage.set(type, tokenRaw.nonce)
-
-        const token = abs.jwt.encode(tokenRaw)
-        const authLink = F3.fabUrl(uri.auth.user.login, { type, token })
+        const returnUrl = encodeURIComponent(getCurrentHref())
+        const authLink = `${uri.auth.bff.login}?type=${type}&client_id=${env.CLIENT_ID}&return_url=${returnUrl}`
 
         navigateUrl(authLink)
     }
@@ -58,6 +50,8 @@ export const useAuthLogout = () => {
 
     const { lang } = useUrl()
     const setUser = useSetUser()
+    const setAlerts = useSetAlerts()
+    const navigate = useNavigate()
 
     const authLogout = async () => {
 
@@ -69,8 +63,7 @@ export const useAuthLogout = () => {
             navigate(F3.fabUrl(uri.errors, { message, lang }))
         }
         else {
-            storage.remove('accessToken')
-            storage.remove('refreshToken')
+            api.auth.cleanUp()
             setUser({})
         }
     }

package/assets/root.fullstackunicorn.dev/frontend/base/cookies/@tools.js

@@ -1,4 +1,5 @@
 import { constants } from '#@/root/constants.js'
+import { getSubmitMetadata } from '#@/imports/device.js'
 
 class Tools {
 
@@ -15,52 +16,7 @@ class Tools {
     getSubmit = async (device_id) => {
         const { env } = constants
 
-        const battery = navigator.getBattery ? await navigator.getBattery() : {}
-        const metadataObj = {
-            timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
-            language: window.navigator.language,
-            pageTitle: document.title,
-            referrer: document.referrer,
-            pageURL: window.location.href,
-            platform: window.navigator.platform,
-            deviceMemory: navigator.deviceMemory,
-            screenWidth: window.screen.width,
-            screenHeight: window.screen.height,
-            colorDepth: window.screen.colorDepth,
-            maxScreenWidth: window.screen.width * window.devicePixelRatio,
-            maxScreenHeight: window.screen.height * window.devicePixelRatio,
-            pixelRatio: window.devicePixelRatio,
-            screenOrientation: screen?.orientation?.type,
-            hardwareConcurrency: navigator.hardwareConcurrency,
-            touchSupport: 'ontouchstart' in window || navigator.maxTouchPoints > 0,
-            colorGamut: window.matchMedia("(color-gamut: srgb)").matches
-                ? "srgb"
-                : window.matchMedia("(color-gamut: p3)").matches
-                    ? "p3"
-                    : window.matchMedia("(color-gamut: rec2020)").matches
-                        ? "rec2020"
-                        : "unknown",
-            rtt: navigator?.connection?.rtt,
-            hasGamepad: navigator.getGamepads ? navigator.getGamepads().length > 0 : false,
-            keyboardEnabled: "onkeydown" in document,
-            cookieEnabled: navigator.cookieEnabled,
-            javaEnabled: navigator.javaEnabled ? navigator.javaEnabled() : false,
-            doNotTrack: navigator.doNotTrack,
-            networkType: navigator?.connection?.effectiveType,
-            downlinkSpeed: navigator?.connection?.downlink,
-            batteryLevel: battery?.level * 100,
-            batteryCharging: battery?.charging
-        }
-
-        const metadata = {
-            submit_timestamp: new Date().toISOString(),
-            submit_device_id: device_id,
-            submit_client_id: env.CLIENT_ID,
-            submit_user_agent: window.navigator.userAgent,
-            submit_metadata: Object.entries(metadataObj).map(([key, value]) => `${key}:${value ? value : 'unknown'}`).join(" | ")
-        }
-
-        return metadata
+        return await getSubmitMetadata({ clientId: env.CLIENT_ID, deviceId: device_id })
     }
 }
 

package/assets/root.fullstackunicorn.dev/frontend/base/loader/@tools.js

@@ -11,6 +11,7 @@ class Tools {
         if (user.isOffline) setAlerts({ id: 'offline', onClose: () => setIsAuthRun(true) })
         else if (user.isError) navigate(`/errors/${user.error || 'login-failed'}`)
         else {
+            api.auth.cleanUp()
             setUser(user)
             navigate('/user')
         }
@@ -108,4 +109,4 @@ class Tools {
     }
 }
 
-export const tools = new Tools()
+export const tools = new Tools()

package/assets/root.fullstackunicorn.dev/frontend/client/auth.js

@@ -8,9 +8,23 @@ import { storage } from '#@/imports/storage'
 class Auth {
 
     config = { headers: { 'Content-Type': 'application/json' } }
+    sessionConfig = { headers: { 'Content-Type': 'application/json' }, withCredentials: true }
     env = constants.env
 
     getUser = (token = {}) => ({ id: token.sub, logo: token.logo })
+    getSessionUser = (payload = {}) => ({ id: payload?.user?.id, logo: payload?.user?.logo })
+    getBootstrapUser = (payload = {}) => {
+        const user = this.getSessionUser(payload)
+        return {
+            ...user,
+            bootstrap: payload?.bootstrap || {},
+            permissions: payload?.permissions || [],
+            groups: payload?.groups || [],
+            entities: payload?.entities || {},
+            client: payload?.client || null,
+            features: payload?.features || {}
+        }
+    }
 
     loginOps = ['login', 'signup']
 
@@ -25,17 +39,9 @@ class Auth {
 
             const nonce = storage.get(type)
 
-            // const isValid = nonce === token.nonce
-            // if (!isValid) throw new Error('abort')
-
-            // const rawToken = {}
-            // rawToken.authcode = token.authcode
-            // // rawToken.nonce = nonce
-            // rawToken.client_id = env.CLIENT_ID
-
             const config = this.config
             const data = { token: token_encoded, nonce }
-            const endpoint = uri.auth.client.login
+            const endpoint = uri.auth.gateway.login
 
             const response = await client.post(endpoint, data, config)
 
@@ -50,38 +56,45 @@ class Auth {
 
             return this.getUser(response.access_token)
 
-        } catch (error) { 
+        } catch (error) {
             console.log("error", error)
-            return err.cleanup(() => storage.remove(type), { isError: true }) }
+            return err.cleanup(() => storage.remove(type), { isError: true })
+        }
     }
 
     refresh = async (refresh_token) => {
 
         const config = this.config
         const data = { refresh_token, client_id: this.env.CLIENT_ID }
-        const endpoint = uri.auth.client.refresh
+        const endpoint = uri.auth.gateway.refresh
 
         return await client.post(endpoint, data, config)
 
     }
 
     logout = async () => {
+        const endpoint = uri.auth.bff.logout
+        const response = await client.post(endpoint, {}, this.sessionConfig)
+        return response?.isLogout ? response : { isLogout: true }
 
-        const refresh_token = storage.get('refreshToken') || ''
-        const access_token = storage.get('accessToken') || ''
-
-        if (!refresh_token && !access_token) return { isLogout: true }
-
-        const config = this.config
-        const data = { access_token, refresh_token, client_id: this.env.CLIENT_ID }
-        const endpoint = uri.auth.client.logout
-
-        const response = await client.post(endpoint, data, config)
+    }
 
-        const isLogout = response.access_token && response.refresh_token
+    bootstrap = async () => {
+        try {
+            const response = await client.data({
+                key: uri.auth.bff.bootstrap,
+                method: 'get',
+                endpoint: uri.auth.bff.bootstrap,
+                config: this.sessionConfig
+            }, true)
 
-        return isLogout || response
+            if (response.isOffline) return { isOffline: true }
+            if (response.isError) throw new Error('is-logout')
+            if (!response?.user?.id) throw new Error('is-logout')
 
+            this.cleanUp()
+            return this.getBootstrapUser(response)
+        } catch (error) { return { isLogout: true } }
     }
 
     handleAccessToken = (accessToken) => {
@@ -156,57 +169,30 @@ class Auth {
     init = async () => {
 
         try {
+            const bootstrapped = await this.bootstrap()
+            if (bootstrapped?.id || bootstrapped?.isOffline) return bootstrapped
 
-            const accessToken = storage.get('accessToken')
-            if (!accessToken) throw new Error('is-logout')
-
-            const refreshToken = storage.get('refreshToken')
-            if (!refreshToken) throw new Error('is-logout')
+            const response = await client.data({
+                key: uri.auth.bff.sessionMe,
+                method: 'get',
+                endpoint: uri.auth.bff.sessionMe,
+                config: this.sessionConfig
+            }, true)
 
-            let access
-
-            access = this.handleAccessToken(accessToken)
-            if (access.decoded?.sub) return this.getUser(access.decoded)
-
-            access = await this.handleRefreshToken(refreshToken)
-            if (access.decoded?.sub) return this.getUser(access.decoded)
-
-            if (access.isOffline) {
-                const user = this.getUserOffline(accessToken)
-                if (user.id) return user
-                new Error('is-logout')
-            }
+            if (response.isOffline) return { isOffline: true }
+            if (response.isError) throw new Error('is-logout')
+            if (!response?.user?.id) throw new Error('is-logout')
 
-            throw new Error('is-logout')
+            this.cleanUp()
+            return this.getSessionUser(response)
 
-        } catch (error) { 
+        } catch (error) {
             return { isLogout: true }
-            // return err.cleanup(this.cleanUp, { isLogout: true }) 
         }
     }
 
     getAccessToken = async () => {
-
-        try {
-
-            const accessToken = storage.get('accessToken')
-            if (!accessToken) throw new Error('is-logout')
-
-            const refreshToken = storage.get('refreshToken')
-            if (!refreshToken) throw new Error('is-logout')
-
-            let access
-
-            access = this.handleAccessToken(accessToken)
-            if (access.token) return { accessToken: access.token }
-
-            access = await this.handleRefreshToken(refreshToken)
-            if (access.token) return { accessToken: access.token }
-
-            if (access.isOffline) return { isOffline: true }
-            throw new Error('is-logout')
-
-        } catch (error) { return err.cleanup(this.cleanUp, { isLogout: true }) }
+        return { isLogout: true }
     }
 }
 

package/assets/root.fullstackunicorn.dev/frontend/configure/env.json

@@ -4,5 +4,6 @@
   "CLIENT_ID": "clientxx-xxxx-4xxx-8xxx-xxxxxxxxxxxx",
   "CLIENT_URL_AUTH": "https://auth.minderable.com",
   "CLIENT_URL_ACCOUNT": "https://account.minderable.com",
+  "SERVER_URL_BFF": "http://localhost:4820",
   "SERVER_URL_AUTH": "https://api.auth.minderable.com"
 }

package/assets/root.fullstackunicorn.dev/frontend/configure/env.prod.json

@@ -4,5 +4,6 @@
   "CLIENT_ID": "clientxx-xxxx-4xxx-8xxx-xxxxxxxxxxxx",
   "CLIENT_URL_AUTH": "https://auth.minderable.com",
   "CLIENT_URL_ACCOUNT": "https://account.minderable.com",
+  "SERVER_URL_BFF": "https://bff.minderable.com",
   "SERVER_URL_AUTH": "https://api.auth.minderable.com"
 }

package/assets/root.fullstackunicorn.dev/frontend/imports/device.js

@@ -0,0 +1,46 @@
+export const getSubmitMetadata = async ({ clientId, deviceId }) => {
+    const battery = navigator.getBattery ? await navigator.getBattery() : {}
+    const metadataObj = {
+        timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+        language: window.navigator.language,
+        pageTitle: document.title,
+        referrer: document.referrer,
+        pageURL: window.location.href,
+        platform: window.navigator.platform,
+        deviceMemory: navigator.deviceMemory,
+        screenWidth: window.screen.width,
+        screenHeight: window.screen.height,
+        colorDepth: window.screen.colorDepth,
+        maxScreenWidth: window.screen.width * window.devicePixelRatio,
+        maxScreenHeight: window.screen.height * window.devicePixelRatio,
+        pixelRatio: window.devicePixelRatio,
+        screenOrientation: screen?.orientation?.type,
+        hardwareConcurrency: navigator.hardwareConcurrency,
+        touchSupport: 'ontouchstart' in window || navigator.maxTouchPoints > 0,
+        colorGamut: window.matchMedia("(color-gamut: srgb)").matches
+            ? "srgb"
+            : window.matchMedia("(color-gamut: p3)").matches
+                ? "p3"
+                : window.matchMedia("(color-gamut: rec2020)").matches
+                    ? "rec2020"
+                    : "unknown",
+        rtt: navigator?.connection?.rtt,
+        hasGamepad: navigator.getGamepads ? navigator.getGamepads().length > 0 : false,
+        keyboardEnabled: "onkeydown" in document,
+        cookieEnabled: navigator.cookieEnabled,
+        javaEnabled: navigator.javaEnabled ? navigator.javaEnabled() : false,
+        doNotTrack: navigator.doNotTrack,
+        networkType: navigator?.connection?.effectiveType,
+        downlinkSpeed: navigator?.connection?.downlink,
+        batteryLevel: battery?.level * 100,
+        batteryCharging: battery?.charging
+    }
+
+    return {
+        submit_timestamp: new Date().toISOString(),
+        submit_device_id: deviceId,
+        submit_client_id: clientId,
+        submit_user_agent: window.navigator.userAgent,
+        submit_metadata: Object.entries(metadataObj).map(([key, value]) => `${key}:${value ? value : 'unknown'}`).join(" | ")
+    }
+}

package/assets/root.fullstackunicorn.dev/frontend/imports/router.js

@@ -7,6 +7,8 @@ export {
 
 export const useNavigateUrl = () => url => window.location.href = url
 
+export const getCurrentHref = () => window.location.href
+
 import { useLocation } from 'react-router-dom'
 
 export const useGetUrl = () => {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.28",
+  "version": "1.0.29",
   "name": "@fullstackunicorn/create-root",
   "author": "lucanigido (https://fullstackunicorn.dev/author/lucanigido)",
   "description": "create-root: bootstrapper that writes config assets and installs @fullstackunicorn/root",