namirasoft-account-react 1.4.19 → 1.4.21

package/src/NSARouterMaker.tsx

@@ -1,143 +1,143 @@
-import queryString, { ParsedQuery } from 'query-string';
-import rrd from 'react-router-dom';
-import axios from "axios";
-import { EnvService, IStorageCookie, ObjectService, ParsedNameValue, URLOperation } from "namirasoft-core";
-import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
-import { INSRouterProps, NSRouterMaker } from 'namirasoft-site-react';
-import { INSARouterProps } from "./INSARouterProps";
-import { INSARouterMaker } from "./INSARouterMaker";
-import { INSARouterState } from "./INSARouterState";
-
-export class NSARouterMaker
-{
-    private ns_router_maker_props!: INSRouterProps;
-    private state: INSARouterState | undefined;
-    private setState: React.Dispatch<React.SetStateAction<INSARouterState | undefined>>;
-    private location: rrd.Location;
-    private navigate: rrd.NavigateFunction;
-    private component: INSARouterMaker;
-    constructor(state: INSARouterState | undefined, setState: React.Dispatch<React.SetStateAction<INSARouterState | undefined>>,
-        location: rrd.Location, navigate: rrd.NavigateFunction,
-        component: INSARouterMaker)
-    {
-        this.state = state;
-        this.setState = setState;
-        this.location = location;
-        this.navigate = navigate;
-        this.component = component;
-        this.init = this.init.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.onComponentDidMount = this.onComponentDidMount.bind(this);
-        this.onRender = this.onRender.bind(this);
-    }
-    private init(): { props: INSARouterProps, inited: boolean }
-    {
-        let qToken: string = this.getQuery("token");
-        let Cookies = process.env.REACT_APP_ACCOUNT_TOKEN;
-        let storage = new IStorageCookie({ domain: ".namirasoft.com", path: "/" }, Cookies);
-        let token_manager = new TokenManager(storage, () => this.setState({}));
-        if (qToken)
-            token_manager.setValue(qToken, true);
-
-
-        let REACT_APP_BASE_URL_ACCOUNT = new EnvService("REACT_APP_BASE_URL_ACCOUNT", true).getString();
-        let REACT_APP_BASE_URL_ACCOUNT_CONSOLE = new EnvService("REACT_APP_BASE_URL_ACCOUNT_CONSOLE", true).getString();
-        let server = new NamirasoftAccountServer(REACT_APP_BASE_URL_ACCOUNT, token_manager, (error: Error) =>
-        {
-            if (axios.isAxiosError(error))
-                if (error.response)
-                    if (error.response?.status === 401)
-                    {
-                        token_manager.del();
-                        window.location.href = REACT_APP_BASE_URL_ACCOUNT_CONSOLE;
-                        return;
-                    }
-            this.ns_router_maker_props.notifier.onError(error);
-        });
-        let props: INSARouterProps = {
-            account: {
-                token_manager,
-                server,
-            },
-            url: {
-                getLink: this.getLink,
-                redirect: this.redirect,
-                getQueryStrings: this.getQueryStrings,
-                getQuery: this.getQuery,
-            },
-            ...this.ns_router_maker_props
-        };
-        let inited = true;
-        if (qToken)
-            inited = this.state?.inited ?? false;
-        return { props, inited };
-    }
-    getQueryStrings(): ParsedQuery
-    {
-        return queryString.parse(this.location.search);
-    }
-    getQuery(name: string): string
-    {
-        let query = this.getQueryStrings();
-        let item = query[name];
-        return new ObjectService(item).getString();
-    }
-    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);
-        this.navigate(ans);
-    }
-    onComponentDidMount(): void
-    {
-        let { inited, props } = this.init();
-        this.setState({ notifications: [], inited });
-        let token = this.getQuery("token");
-        if (token)
-        {
-            if (!props.account.token_manager.getUserData(u => u.id, ""))
-            {
-                props.account.server.session.Current()
-                    .then(response =>
-                    {
-                        props.account.token_manager.set(response, false);
-                        this.setState({ inited: true });
-                    })
-                    .catch(() =>
-                    {
-                        this.setState({ inited: true });
-                    });
-            }
-        }
-    }
-    onRender(): React.JSX.Element
-    {
-        let maker = new NSRouterMaker(this.state, this.setState, {
-            onRender: (ns_router_maker_props: INSRouterProps) =>
-            {
-                this.ns_router_maker_props = ns_router_maker_props;
-                let { inited, props } = this.init();
-                if (!inited)
-                    return <></>;
-                let banned = false;
-                if (props.account.token_manager.exists())
-                {
-                    banned = props.account.token_manager.getUserData(user => user.banned, false);
-                    if (!banned)
-                        return this.component.onRenderOnLogin(props);
-                }
-                return this.component.onRenderOnLogout(props, banned);
-            }
-        });
-
-        return maker.onRender();
-    }
+import queryString, { ParsedQuery } from 'query-string';
+import rrd from 'react-router-dom';
+import axios from "axios";
+import { EnvService, IStorageCookie, ObjectService, ParsedNameValue, URLOperation } from "namirasoft-core";
+import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
+import { INSRouterProps, NSRouterMaker } from 'namirasoft-site-react';
+import { INSARouterProps } from "./INSARouterProps";
+import { INSARouterMaker } from "./INSARouterMaker";
+import { INSARouterState } from "./INSARouterState";
+
+export class NSARouterMaker
+{
+    private ns_router_maker_props!: INSRouterProps;
+    private state: INSARouterState | undefined;
+    private setState: React.Dispatch<React.SetStateAction<INSARouterState | undefined>>;
+    private location: rrd.Location;
+    private navigate: rrd.NavigateFunction;
+    private component: INSARouterMaker;
+    constructor(state: INSARouterState | undefined, setState: React.Dispatch<React.SetStateAction<INSARouterState | undefined>>,
+        location: rrd.Location, navigate: rrd.NavigateFunction,
+        component: INSARouterMaker)
+    {
+        this.state = state;
+        this.setState = setState;
+        this.location = location;
+        this.navigate = navigate;
+        this.component = component;
+        this.init = this.init.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.onComponentDidMount = this.onComponentDidMount.bind(this);
+        this.onRender = this.onRender.bind(this);
+    }
+    private init(): { props: INSARouterProps, inited: boolean }
+    {
+        let qToken: string = this.getQuery("token");
+        let Cookies = process.env.REACT_APP_ACCOUNT_TOKEN;
+        let storage = new IStorageCookie({ domain: ".namirasoft.com", path: "/" }, Cookies);
+        let token_manager = new TokenManager(storage, () => this.setState({}));
+        if (qToken)
+            token_manager.setValue(qToken, true);
+
+
+        let REACT_APP_BASE_URL_ACCOUNT = new EnvService("REACT_APP_BASE_URL_ACCOUNT", true).getString();
+        let REACT_APP_BASE_URL_ACCOUNT_CONSOLE = new EnvService("REACT_APP_BASE_URL_ACCOUNT_CONSOLE", true).getString();
+        let server = new NamirasoftAccountServer(REACT_APP_BASE_URL_ACCOUNT, token_manager, (error: Error) =>
+        {
+            if (axios.isAxiosError(error))
+                if (error.response)
+                    if (error.response?.status === 401)
+                    {
+                        token_manager.del();
+                        window.location.href = REACT_APP_BASE_URL_ACCOUNT_CONSOLE;
+                        return;
+                    }
+            this.ns_router_maker_props.notifier.onError(error);
+        });
+        let props: INSARouterProps = {
+            account: {
+                token_manager,
+                server,
+            },
+            url: {
+                getLink: this.getLink,
+                redirect: this.redirect,
+                getQueryStrings: this.getQueryStrings,
+                getQuery: this.getQuery,
+            },
+            ...this.ns_router_maker_props
+        };
+        let inited = true;
+        if (qToken)
+            inited = this.state?.inited ?? false;
+        return { props, inited };
+    }
+    getQueryStrings(): ParsedQuery
+    {
+        return queryString.parse(this.location.search);
+    }
+    getQuery(name: string): string
+    {
+        let query = this.getQueryStrings();
+        let item = query[name];
+        return new ObjectService(item).getString();
+    }
+    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);
+        this.navigate(ans);
+    }
+    onComponentDidMount(): void
+    {
+        let { inited, props } = this.init();
+        this.setState({ notifications: [], inited });
+        let token = this.getQuery("token");
+        if (token)
+        {
+            if (!props.account.token_manager.getUserData(u => u.id, ""))
+            {
+                props.account.server.session.Current()
+                    .then(response =>
+                    {
+                        props.account.token_manager.set(response, false);
+                        this.setState({ inited: true });
+                    })
+                    .catch(() =>
+                    {
+                        this.setState({ inited: true });
+                    });
+            }
+        }
+    }
+    onRender(): React.JSX.Element
+    {
+        let maker = new NSRouterMaker(this.state, this.setState, {
+            onRender: (ns_router_maker_props: INSRouterProps) =>
+            {
+                this.ns_router_maker_props = ns_router_maker_props;
+                let { inited, props } = this.init();
+                if (!inited)
+                    return <></>;
+                let banned = false;
+                if (props.account.token_manager.exists())
+                {
+                    banned = props.account.token_manager.getUserData(user => user.banned, false);
+                    if (!banned)
+                        return this.component.onRenderOnLogin(props);
+                }
+                return this.component.onRenderOnLogout(props, banned);
+            }
+        });
+
+        return maker.onRender();
+    }
 };

package/src/Router.tsx

@@ -1,40 +1,40 @@
-import { NSARouterMaker } from './NSARouterMaker';
-import { INSARouterState } from './INSARouterState';
-import { INSARouterProps } from './INSARouterProps';
-import { useEffect, useState } from 'react';
-import { Routes, Route, useLocation, useNavigate } from 'react-router-dom';
-import { NSNotFoundPage } from 'namirasoft-site-react';
-import { App } from './App';
-
-
-export default function Router()
-{
-    let [state, setState] = useState<INSARouterState>();
-    let location = useLocation();
-    let navigate = useNavigate();
-    const maker = new NSARouterMaker(state, setState, location, navigate, {
-        onRenderOnLogin: (props: INSARouterProps) =>
-        {
-            return (
-                <>
-                    <Routes>
-                        <Route path="*" element={<App {...props}></App>} />
-                    </Routes>
-                </>
-            );
-        },
-        onRenderOnLogout: (_: INSARouterProps, __: boolean) =>
-        {
-            return (
-                <Routes>
-                    <Route path="*" element={<NSNotFoundPage></NSNotFoundPage>} />
-                </Routes>
-            );
-        }
-    });
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps 
-    useEffect(maker.onComponentDidMount, []);
-
-    return maker.onRender();
+import { NSARouterMaker } from './NSARouterMaker';
+import { INSARouterState } from './INSARouterState';
+import { INSARouterProps } from './INSARouterProps';
+import { useEffect, useState } from 'react';
+import { Routes, Route, useLocation, useNavigate } from 'react-router-dom';
+import { NSNotFoundPage } from 'namirasoft-site-react';
+import { App } from './App';
+
+
+export default function Router()
+{
+    let [state, setState] = useState<INSARouterState>();
+    let location = useLocation();
+    let navigate = useNavigate();
+    const maker = new NSARouterMaker(state, setState, location, navigate, {
+        onRenderOnLogin: (props: INSARouterProps) =>
+        {
+            return (
+                <>
+                    <Routes>
+                        <Route path="*" element={<App {...props}></App>} />
+                    </Routes>
+                </>
+            );
+        },
+        onRenderOnLogout: (_: INSARouterProps, __: boolean) =>
+        {
+            return (
+                <Routes>
+                    <Route path="*" element={<NSNotFoundPage></NSNotFoundPage>} />
+                </Routes>
+            );
+        }
+    });
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps 
+    useEffect(maker.onComponentDidMount, []);
+
+    return maker.onRender();
 }

package/src/components/NSAAccessListDialog.module.css

@@ -1,87 +1,87 @@
-.ns_access_container {
-	width: 300px;
-}
-
-.ns_access_container h6 {
-	color: rgba(20, 27, 92, 1);
-	text-align: left;
-	font-weight: 300;
-	font-size: 16px;
-	cursor: default;
-}
-
-.ns_access_container h2 {
-	color: rgba(3, 119, 255, 1);
-	text-align: center;
-	font-weight: 600;
-	font-size: 16px;
-	cursor: default;
-	margin: 0;
-}
-
-.ns_access_container h4 {
-	color: rgba(20, 27, 92, 1);
-	font-weight: 600;
-	font-size: 16px;
-	text-align: left;
-	cursor: default;
-}
-
-.ns_access_content h6 {
-	text-align: center;
-	padding: 0;
-	margin: 0;
-}
-
-.ns_access_account_container {
-	display: flex;
-	cursor: pointer;
-	border: none;
-	background-color: rgba(244, 246, 255, 1);
-	border-radius: 8px;
-	align-items: center;
-	gap: 10px;
-	width: 326px;
-	max-width: 100%;
-}
-
-.ns_access_account_container:hover {
-	background-color: rgba(178, 187, 217, 1);
-	transition: all 0.3s ease-in-out;
-}
-
-
-.ns_access_account_container img {
-	cursor: pointer;
-}
-
-.ns_access_account_info {
-	display: flex;
-	flex-direction: row;
-	justify-content: left;
-	align-items: flex-start;
-	padding: 8px;
-}
-
-.nsa_close_icon {
-	cursor: pointer;
-}
-
-.nsa_toast_background {
-	width: 100vw;
-	height: 100vh;
-	background-color: #00000059;
-	position: fixed;
-	top: 0;
-	left: 0;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	cursor: default;
-}
-
-.ns_line {
-	border-left: none !important;
-	border-right: none !important;
-	width: 100% !important;
+.ns_access_container {
+	width: 300px;
+}
+
+.ns_access_container h6 {
+	color: rgba(20, 27, 92, 1);
+	text-align: left;
+	font-weight: 300;
+	font-size: 16px;
+	cursor: default;
+}
+
+.ns_access_container h2 {
+	color: rgba(3, 119, 255, 1);
+	text-align: center;
+	font-weight: 600;
+	font-size: 16px;
+	cursor: default;
+	margin: 0;
+}
+
+.ns_access_container h4 {
+	color: rgba(20, 27, 92, 1);
+	font-weight: 600;
+	font-size: 16px;
+	text-align: left;
+	cursor: default;
+}
+
+.ns_access_content h6 {
+	text-align: center;
+	padding: 0;
+	margin: 0;
+}
+
+.ns_access_account_container {
+	display: flex;
+	cursor: pointer;
+	border: none;
+	background-color: rgba(244, 246, 255, 1);
+	border-radius: 8px;
+	align-items: center;
+	gap: 10px;
+	width: 326px;
+	max-width: 100%;
+}
+
+.ns_access_account_container:hover {
+	background-color: rgba(178, 187, 217, 1);
+	transition: all 0.3s ease-in-out;
+}
+
+
+.ns_access_account_container img {
+	cursor: pointer;
+}
+
+.ns_access_account_info {
+	display: flex;
+	flex-direction: row;
+	justify-content: left;
+	align-items: flex-start;
+	padding: 8px;
+}
+
+.nsa_close_icon {
+	cursor: pointer;
+}
+
+.nsa_toast_background {
+	width: 100vw;
+	height: 100vh;
+	background-color: #00000059;
+	position: fixed;
+	top: 0;
+	left: 0;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	cursor: default;
+}
+
+.ns_line {
+	border-left: none !important;
+	border-right: none !important;
+	width: 100% !important;
 }