namirasoft-account-react 1.5.4 → 1.5.6

package/src/NSARouterMaker.tsx

@@ -1,143 +1,143 @@
-import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
-import { EncodingOperation, EnvService, IStorage, IStorageCookie, ObjectService, ParsedNameValue, URLOperation } from "namirasoft-core";
-import { KeyOperation, LinkOperation, NSRouterMaker, NSRouterMakerProps } from 'namirasoft-site-react';
-import queryString, { ParsedQuery } from 'query-string';
-import type { NavigateFunction } from 'react-router-dom';
-import { NSARouterMakerConfig } from "./NSARouterMakerConfig";
-import { NSARouterMakerProps } from "./NSARouterMakerProps";
-import { NSAConsentPage } from './pages/NSAConsentPage';
-import { NSAEmailVerificationPage } from './pages/NSAEmailVerificationPage';
-import { NSAPhoneVerificationPage } from './pages/NSAPhoneVerificationPage';
-
-export class NSARouterMaker
-{
-    private product_id: string;
-    private storage: IStorage;
-    private setState: () => void;
-    private config: NSARouterMakerConfig;
-    private navigate: NavigateFunction;
-    constructor(product_id: string, storage: IStorage, setState: () => void, config: NSARouterMakerConfig, navigate: NavigateFunction)
-    {
-        this.product_id = product_id;
-        this.storage = storage;
-        this.setState = setState;
-        this.config = config;
-        this.navigate = navigate;
-        LinkOperation.setNavigate(navigate);
-        KeyOperation.start();
-        this.getProps = this.getProps.bind(this);
-        this.getQueryStrings = this.getQueryStrings.bind(this);
-        this.getQuery = this.getQuery.bind(this);
-        this.getLink = this.getLink.bind(this);
-        this.redirect = this.redirect.bind(this);
-        this.onRender = this.onRender.bind(this);
-    }
-    private getProps(ns_router_maker_props: NSRouterMakerProps): NSARouterMakerProps
-    {
-        let Cookies = process.env.REACT_APP_ACCOUNT_TOKEN;
-        let storage = new IStorageCookie({ domain: ".namirasoft.com", path: "/" }, Cookies);
-        let token_manager = new TokenManager(storage, () => { });
-
-        let REACT_APP_BASE_URL_ACCOUNT = new EnvService("REACT_APP_BASE_URL_ACCOUNT", true).getString();
-        let server = new NamirasoftAccountServer(REACT_APP_BASE_URL_ACCOUNT, token_manager, ns_router_maker_props.notifier.onError);
-
-        return {
-            product_id: this.product_id,
-            account: {
-                token_manager,
-                server,
-            },
-            url: {
-                getLink: this.getLink,
-                redirect: this.redirect,
-                getQueryStrings: this.getQueryStrings,
-                getQuery: this.getQuery,
-                navigate: this.navigate,
-            },
-            renderer: {
-                renderOnNSALayout: this.config.renderOnNSALayout
-            },
-            ...ns_router_maker_props
-        };
-    }
-    getQueryStrings(): ParsedQuery
-    {
-        return queryString.parse(window.location.search);
-    }
-    getQuery(name: string, base64: boolean = false, remove: boolean = false): string
-    {
-        let query = this.getQueryStrings();
-        let item = query[name];
-        let ans = new ObjectService(item).getString();
-        if (base64)
-            try
-            {
-                ans = EncodingOperation.Base64Decode(ans);
-            } catch (error)
-            {
-                ans = "";
-            }
-        if (remove)
-        {
-            const url = new URL(window.location.href);
-            url.searchParams.delete(name);
-            window.history.replaceState({}, '', url);
-        }
-
-        return ans;
-    }
-    getLink(sub: string, customQuery: { [name: string]: ParsedNameValue })
-    {
-        if (!customQuery)
-            customQuery = {};
-        return URLOperation.getLink("", sub, customQuery);
-    }
-    redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void
-    {
-        let ans = this.getLink(sub, customQuery);
-        LinkOperation.open(ans);
-    }
-    onRender(): React.JSX.Element
-    {
-        let maker = new NSRouterMaker(this.storage, this.setState, {
-            onRender: (ns_router_maker_props: NSRouterMakerProps) =>
-            {
-                let props = this.getProps(ns_router_maker_props);
-                let banned = false;
-                if (props.account.token_manager.exists())
-                {
-                    banned = props.account.token_manager.getUserData(user => user.banned, false);
-                    if (!banned)
-                    {
-                        let result = this.config.getCustomRender?.(props);
-                        if (result)
-                            return result;
-                        return <NSAConsentPage
-                            {...props}
-                            product_id={this.product_id}
-                            onAccepted={() =>
-                            {
-                                if (this.config.requirement.verification.email)
-                                {
-                                    let e_verified = props.account.token_manager.getUserData(u => u.e_verified, false);
-                                    if (!e_verified)
-                                        return this.config.renderOnNSALayout(props, <NSAEmailVerificationPage {...props} callback='' />);
-                                }
-                                if (this.config.requirement.verification.phone)
-                                {
-                                    let p_verified = props.account.token_manager.getUserData(u => u.p_verified, false);
-                                    if (!p_verified)
-                                        return this.config.renderOnNSALayout(props, <NSAPhoneVerificationPage {...props} callback='' />);
-                                }
-                                return this.config.onRenderOnLogin(props);
-                            }}
-                        />;
-                    }
-                }
-                return this.config.onRenderOnLogout(props, banned);
-            }
-        });
-
-        return maker.onRender();
-    }
+import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
+import { EncodingOperation, EnvService, IStorage, IStorageCookie, ObjectService, ParsedNameValue, URLOperation } from "namirasoft-core";
+import { KeyOperation, LinkOperation, NSRouterMaker, NSRouterMakerProps } from 'namirasoft-site-react';
+import queryString, { ParsedQuery } from 'query-string';
+import type { NavigateFunction } from 'react-router-dom';
+import { NSARouterMakerConfig } from "./NSARouterMakerConfig";
+import { NSARouterMakerProps } from "./NSARouterMakerProps";
+import { NSAConsentPage } from './pages/NSAConsentPage';
+import { NSAEmailVerificationPage } from './pages/NSAEmailVerificationPage';
+import { NSAPhoneVerificationPage } from './pages/NSAPhoneVerificationPage';
+
+export class NSARouterMaker
+{
+    private product_id: string;
+    private storage: IStorage;
+    private setState: () => void;
+    private config: NSARouterMakerConfig;
+    private navigate: NavigateFunction;
+    constructor(product_id: string, storage: IStorage, setState: () => void, config: NSARouterMakerConfig, navigate: NavigateFunction)
+    {
+        this.product_id = product_id;
+        this.storage = storage;
+        this.setState = setState;
+        this.config = config;
+        this.navigate = navigate;
+        LinkOperation.setNavigate(navigate);
+        KeyOperation.start();
+        this.getProps = this.getProps.bind(this);
+        this.getQueryStrings = this.getQueryStrings.bind(this);
+        this.getQuery = this.getQuery.bind(this);
+        this.getLink = this.getLink.bind(this);
+        this.redirect = this.redirect.bind(this);
+        this.onRender = this.onRender.bind(this);
+    }
+    private getProps(ns_router_maker_props: NSRouterMakerProps): NSARouterMakerProps
+    {
+        let Cookies = process.env.REACT_APP_ACCOUNT_TOKEN;
+        let storage = new IStorageCookie({ domain: ".namirasoft.com", path: "/" }, Cookies);
+        let token_manager = new TokenManager(storage, () => { });
+
+        let REACT_APP_BASE_URL_ACCOUNT = new EnvService("REACT_APP_BASE_URL_ACCOUNT", true).getString();
+        let server = new NamirasoftAccountServer(REACT_APP_BASE_URL_ACCOUNT, token_manager, ns_router_maker_props.notifier.onError);
+
+        return {
+            product_id: this.product_id,
+            account: {
+                token_manager,
+                server,
+            },
+            url: {
+                getLink: this.getLink,
+                redirect: this.redirect,
+                getQueryStrings: this.getQueryStrings,
+                getQuery: this.getQuery,
+                navigate: this.navigate,
+            },
+            renderer: {
+                renderOnNSALayout: this.config.renderOnNSALayout
+            },
+            ...ns_router_maker_props
+        };
+    }
+    getQueryStrings(): ParsedQuery
+    {
+        return queryString.parse(window.location.search);
+    }
+    getQuery(name: string, base64: boolean = false, remove: boolean = false): string
+    {
+        let query = this.getQueryStrings();
+        let item = query[name];
+        let ans = new ObjectService(item).getString();
+        if (base64)
+            try
+            {
+                ans = EncodingOperation.Base64Decode(ans);
+            } catch (error)
+            {
+                ans = "";
+            }
+        if (remove)
+        {
+            const url = new URL(window.location.href);
+            url.searchParams.delete(name);
+            window.history.replaceState({}, '', url);
+        }
+
+        return ans;
+    }
+    getLink(sub: string, customQuery: { [name: string]: ParsedNameValue })
+    {
+        if (!customQuery)
+            customQuery = {};
+        return URLOperation.getLink("", sub, customQuery);
+    }
+    redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void
+    {
+        let ans = this.getLink(sub, customQuery);
+        LinkOperation.open(ans);
+    }
+    onRender(): React.JSX.Element
+    {
+        let maker = new NSRouterMaker(this.storage, this.setState, {
+            onRender: (ns_router_maker_props: NSRouterMakerProps) =>
+            {
+                let props = this.getProps(ns_router_maker_props);
+                let banned = false;
+                if (props.account.token_manager.exists())
+                {
+                    banned = props.account.token_manager.getUserData(user => user.banned, false);
+                    if (!banned)
+                    {
+                        let result = this.config.getCustomRender?.(props);
+                        if (result)
+                            return result;
+                        return <NSAConsentPage
+                            {...props}
+                            product_id={this.product_id}
+                            onAccepted={() =>
+                            {
+                                if (this.config.requirement.verification.email)
+                                {
+                                    let e_verified = props.account.token_manager.getUserData(u => u.e_verified, false);
+                                    if (!e_verified)
+                                        return this.config.renderOnNSALayout(props, <NSAEmailVerificationPage {...props} callback='' />);
+                                }
+                                if (this.config.requirement.verification.phone)
+                                {
+                                    let p_verified = props.account.token_manager.getUserData(u => u.p_verified, false);
+                                    if (!p_verified)
+                                        return this.config.renderOnNSALayout(props, <NSAPhoneVerificationPage {...props} callback='' />);
+                                }
+                                return this.config.onRenderOnLogin(props);
+                            }}
+                        />;
+                    }
+                }
+                return this.config.onRenderOnLogout(props, banned);
+            }
+        });
+
+        return maker.onRender();
+    }
 };

package/src/NSARouterMakerConfig.ts

@@ -1,16 +1,16 @@
-import React from "react";
-import { NSARouterMakerProps } from "./NSARouterMakerProps";
-
-export interface NSARouterMakerConfig 
-{
-    onRenderOnLogin(props: NSARouterMakerProps): React.JSX.Element;
-    onRenderOnLogout(props: NSARouterMakerProps, banned: boolean): React.JSX.Element;
-    renderOnNSALayout(props: NSARouterMakerProps, children: React.JSX.Element): React.JSX.Element;
-    getCustomRender?: (props: NSARouterMakerProps) => React.JSX.Element | null;
-    requirement: {
-        verification: {
-            email: boolean;
-            phone: boolean;
-        };
-    };
+import React from "react";
+import { NSARouterMakerProps } from "./NSARouterMakerProps";
+
+export interface NSARouterMakerConfig 
+{
+    onRenderOnLogin(props: NSARouterMakerProps): React.JSX.Element;
+    onRenderOnLogout(props: NSARouterMakerProps, banned: boolean): React.JSX.Element;
+    renderOnNSALayout(props: NSARouterMakerProps, children: React.JSX.Element): React.JSX.Element;
+    getCustomRender?: (props: NSARouterMakerProps) => React.JSX.Element | null;
+    requirement: {
+        verification: {
+            email: boolean;
+            phone: boolean;
+        };
+    };
 }

package/src/NSARouterMakerProps.ts

@@ -1,25 +1,25 @@
-import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
-import { ParsedNameValue } from "namirasoft-core";
-import { NSRouterMakerProps } from "namirasoft-site-react";
-import { ParsedQuery } from "query-string";
-import { NavigateFunction } from "react-router-dom";
-
-export interface NSARouterMakerProps extends NSRouterMakerProps
-{
-    product_id: string;
-    account: {
-        token_manager: TokenManager
-        server: NamirasoftAccountServer;
-    },
-    url: {
-        getQueryStrings(): ParsedQuery;
-        getQuery(name: string, base64?: boolean, remove?: boolean): string;
-        getLink(sub: string, customQuery: { [name: string]: ParsedNameValue }): string;
-        redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void;
-        navigate: NavigateFunction;
-    },
-    renderer:
-    {
-        renderOnNSALayout(props: NSARouterMakerProps, children: React.JSX.Element): React.JSX.Element;
-    }
+import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
+import { ParsedNameValue } from "namirasoft-core";
+import { NSRouterMakerProps } from "namirasoft-site-react";
+import { ParsedQuery } from "query-string";
+import { NavigateFunction } from "react-router-dom";
+
+export interface NSARouterMakerProps extends NSRouterMakerProps
+{
+    product_id: string;
+    account: {
+        token_manager: TokenManager
+        server: NamirasoftAccountServer;
+    },
+    url: {
+        getQueryStrings(): ParsedQuery;
+        getQuery(name: string, base64?: boolean, remove?: boolean): string;
+        getLink(sub: string, customQuery: { [name: string]: ParsedNameValue }): string;
+        redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void;
+        navigate: NavigateFunction;
+    },
+    renderer:
+    {
+        renderOnNSALayout(props: NSARouterMakerProps, children: React.JSX.Element): React.JSX.Element;
+    }
 }

package/src/Router.tsx

@@ -1,46 +1,46 @@
-import { NSARouterMaker } from './NSARouterMaker';
-import { NSARouterMakerProps } from './NSARouterMakerProps';
-import { Routes, Route, useNavigate } from 'react-router-dom';
-import { NSNotFoundPage } from 'namirasoft-site-react';
-import { App } from './App';
-import { IStorageSession } from 'namirasoft-core';
-import { useState } from 'react';
-import { ProductUUID } from 'namirasoft-api-product';
-
-export default function Router()
-{
-    let [state, setState] = useState<number>(Math.random());
-
-    let navigate = useNavigate();
-
-    let maker = new NSARouterMaker(ProductUUID.NAMIRASOFT_INFRA, new IStorageSession(), () => { setState(state + Math.random()); }, {
-        onRenderOnLogin: (props: NSARouterMakerProps) =>
-        {
-            return (
-                <Routes>
-                    <Route path="/:id/view" element={<App {...props}></App>} />
-                    <Route path="*" element={<App {...props}></App>} />
-                </Routes>
-            );
-        },
-        onRenderOnLogout: (_: NSARouterMakerProps, __: boolean) =>
-        {
-            return (
-                <Routes>
-                    <Route path="*" element={<NSNotFoundPage></NSNotFoundPage>} />
-                </Routes>
-            );
-        },
-        renderOnNSALayout: (_, children) =>
-        {
-            return children;
-        },
-        requirement: {
-            verification: {
-                email: true,
-                phone: true
-            }
-        }
-    }, navigate);
-    return maker.onRender();
+import { NSARouterMaker } from './NSARouterMaker';
+import { NSARouterMakerProps } from './NSARouterMakerProps';
+import { Routes, Route, useNavigate } from 'react-router-dom';
+import { NSNotFoundPage } from 'namirasoft-site-react';
+import { App } from './App';
+import { IStorageSession } from 'namirasoft-core';
+import { useState } from 'react';
+import { ProductUUID } from 'namirasoft-api-product';
+
+export default function Router()
+{
+    let [state, setState] = useState<number>(Math.random());
+
+    let navigate = useNavigate();
+
+    let maker = new NSARouterMaker(ProductUUID.NAMIRASOFT_INFRA, new IStorageSession(), () => { setState(state + Math.random()); }, {
+        onRenderOnLogin: (props: NSARouterMakerProps) =>
+        {
+            return (
+                <Routes>
+                    <Route path="/:id/view" element={<App {...props}></App>} />
+                    <Route path="*" element={<App {...props}></App>} />
+                </Routes>
+            );
+        },
+        onRenderOnLogout: (_: NSARouterMakerProps, __: boolean) =>
+        {
+            return (
+                <Routes>
+                    <Route path="*" element={<NSNotFoundPage></NSNotFoundPage>} />
+                </Routes>
+            );
+        },
+        renderOnNSALayout: (_, children) =>
+        {
+            return children;
+        },
+        requirement: {
+            verification: {
+                email: true,
+                phone: true
+            }
+        }
+    }, navigate);
+    return maker.onRender();
 }

package/src/UseParams.tsx

@@ -1,19 +1,21 @@
-import { useEffect } from 'react';
-import { useParams } from 'react-router-dom';
-
-export interface UseParamsProps
-{
-    onLoaded: (p: any) => void
-}
-
-export function UseParams(props: UseParamsProps) 
-{
-    let p = useParams();
-
-    useEffect(() =>
-    {
-        props.onLoaded(p);
-        // eslint-disable-next-line
-    }, [p]);
-    return <></>;
+import { useEffect } from 'react';
+import { useLocation, useParams } from 'react-router-dom';
+
+export interface UseParamsProps
+{
+    onLoaded: (p: any) => void
+}
+
+export function UseParams(props: UseParamsProps) 
+{
+    let p = useParams();
+    let l = useLocation();
+    console.log({ l });
+    debugger
+    useEffect(() =>
+    {
+        props.onLoaded(p);
+        // eslint-disable-next-line
+    }, [p]);
+    return <></>;
 }

package/src/components/NSAAccessListDialog.module.css

@@ -1,72 +1,72 @@
-.nsa_access_list_dialog_container {
-	width: 302px;
-}
-
-.nsa_access_list_dialog_container p {
-	padding: 0;
-	margin: 0;
-}
-
-.nsa_access_list_dialog_item_id {
-	color: rgba(3, 119, 255, 1);
-	text-align: right;
-	font-weight: 600;
-	font-size: 16px;
-	cursor: pointer;
-	margin: 0;
-}
-
-.nsa_access_list_dialog_item_name {
-	color: rgba(20, 27, 92, 1);
-	font-weight: 600;
-	font-size: 16px;
-	text-align: left;
-	cursor: pointer;
-	margin: 0px;
-}
-
-.nsa_access_list_dialog_item_email {
-	color: rgba(20, 27, 92, 1);
-}
-
-.nsa_access_list_dialog_main_name {
-	color: rgba(20, 27, 92, 1);
-	font-weight: 600;
-	font-size: 24px;
-	text-align: center;
-	cursor: pointer;
-	margin: 0px;
-}
-
-.nsa_access_list_dialog_main_email {
-	color: rgba(20, 27, 92, 1);
-}
-
-.nsa_access_list_dialog_main_id {
-	color: rgba(3, 119, 255, 1);
-	text-align: center;
-	font-weight: 600;
-	font-size: 16px;
-	cursor: pointer;
-	margin: 0;
-}
-
-.nsa_access_list_dialog_users_container {
-	padding: 0px 16px 0px 16px;
-	display: flex;
-	cursor: pointer;
-	border: none;
-	background-color: rgba(224, 226, 235, 1);
-	border-radius: 8px;
-	align-items: center;
-	max-width: 100%;
-}
-
-.nsa_access_list_dialog_users_container:hover {
-	background-color: rgba(178, 187, 217, 1);
-	transition: all 0.3s ease-in-out;
-}
-
-.nsa_access_list_dialog_users_container img {
-	cursor: pointer;
+.nsa_access_list_dialog_container {
+	width: 302px;
+}
+
+.nsa_access_list_dialog_container p {
+	padding: 0;
+	margin: 0;
+}
+
+.nsa_access_list_dialog_item_id {
+	color: rgba(3, 119, 255, 1);
+	text-align: right;
+	font-weight: 600;
+	font-size: 16px;
+	cursor: pointer;
+	margin: 0;
+}
+
+.nsa_access_list_dialog_item_name {
+	color: rgba(20, 27, 92, 1);
+	font-weight: 600;
+	font-size: 16px;
+	text-align: left;
+	cursor: pointer;
+	margin: 0px;
+}
+
+.nsa_access_list_dialog_item_email {
+	color: rgba(20, 27, 92, 1);
+}
+
+.nsa_access_list_dialog_main_name {
+	color: rgba(20, 27, 92, 1);
+	font-weight: 600;
+	font-size: 24px;
+	text-align: center;
+	cursor: pointer;
+	margin: 0px;
+}
+
+.nsa_access_list_dialog_main_email {
+	color: rgba(20, 27, 92, 1);
+}
+
+.nsa_access_list_dialog_main_id {
+	color: rgba(3, 119, 255, 1);
+	text-align: center;
+	font-weight: 600;
+	font-size: 16px;
+	cursor: pointer;
+	margin: 0;
+}
+
+.nsa_access_list_dialog_users_container {
+	padding: 0px 16px 0px 16px;
+	display: flex;
+	cursor: pointer;
+	border: none;
+	background-color: rgba(224, 226, 235, 1);
+	border-radius: 8px;
+	align-items: center;
+	max-width: 100%;
+}
+
+.nsa_access_list_dialog_users_container:hover {
+	background-color: rgba(178, 187, 217, 1);
+	transition: all 0.3s ease-in-out;
+}
+
+.nsa_access_list_dialog_users_container img {
+	cursor: pointer;
 }