namirasoft-account-react 1.3.17 → 1.3.18
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.
- package/dist/NSARouterMaker.js +2 -13
- package/dist/NSARouterMaker.js.map +1 -1
- package/package.json +6 -6
- package/src/NSARouterMaker.tsx +3 -14
- package/src/react-app-env.d.ts +1 -1
package/dist/NSARouterMaker.js
CHANGED
|
@@ -27,17 +27,8 @@ class NSARouterMaker {
|
|
|
27
27
|
}
|
|
28
28
|
init() {
|
|
29
29
|
var _a, _b;
|
|
30
|
-
let qStorage = this.getQuery("location");
|
|
31
|
-
let qAPI = this.getQuery("api");
|
|
32
30
|
let qToken = this.getQuery("token");
|
|
33
|
-
|
|
34
|
-
if (qAPI)
|
|
35
|
-
qStorage = "memory";
|
|
36
|
-
let storage;
|
|
37
|
-
if (qStorage === "memory")
|
|
38
|
-
storage = new namirasoft_core_1.IStorageMemory();
|
|
39
|
-
else
|
|
40
|
-
storage = new namirasoft_core_1.IStorageLocal();
|
|
31
|
+
let storage = new namirasoft_core_1.IStorageCookie({ domain: ".namirasoft.com", path: "/", sameSite: "Strict", httpOnly: "true", secure: "true" });
|
|
41
32
|
let token_manager = new namirasoft_account_1.TokenManager(storage, () => this.setState({}));
|
|
42
33
|
if (qToken)
|
|
43
34
|
token_manager.setValue(qToken, true);
|
|
@@ -77,9 +68,7 @@ class NSARouterMaker {
|
|
|
77
68
|
getLink(sub, customQuery) {
|
|
78
69
|
if (!customQuery)
|
|
79
70
|
customQuery = {};
|
|
80
|
-
|
|
81
|
-
let final = Object.assign(Object.assign({}, query), customQuery);
|
|
82
|
-
return namirasoft_core_1.URLOperation.getLink("", sub, final);
|
|
71
|
+
return namirasoft_core_1.URLOperation.getLink("", sub, customQuery);
|
|
83
72
|
}
|
|
84
73
|
redirect(sub, customQuery) {
|
|
85
74
|
let ans = this.getLink(sub, customQuery);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NSARouterMaker.js","sourceRoot":"","sources":["../src/NSARouterMaker.tsx"],"names":[],"mappings":";;;;;;;AAAA,gEAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"NSARouterMaker.js","sourceRoot":"","sources":["../src/NSARouterMaker.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"framework": "npm",
|
|
9
9
|
"application": "package",
|
|
10
10
|
"private": false,
|
|
11
|
-
"version": "1.3.
|
|
11
|
+
"version": "1.3.18",
|
|
12
12
|
"author": "Amir Abolhasani",
|
|
13
13
|
"license": "MIT",
|
|
14
14
|
"main": "./dist/index.js",
|
|
@@ -18,14 +18,14 @@
|
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
20
|
"@types/device-uuid": "^1.0.3",
|
|
21
|
-
"@types/react": "^18.3.
|
|
21
|
+
"@types/react": "^18.3.3",
|
|
22
22
|
"device-uuid": "^1.0.4",
|
|
23
|
-
"namirasoft-account": "^1.3.
|
|
24
|
-
"namirasoft-core": "^1.3.
|
|
25
|
-
"namirasoft-site-react": "^1.3.
|
|
23
|
+
"namirasoft-account": "^1.3.19",
|
|
24
|
+
"namirasoft-core": "^1.3.35",
|
|
25
|
+
"namirasoft-site-react": "^1.3.154",
|
|
26
26
|
"query-string": "^9.0.0",
|
|
27
27
|
"react": "^18.3.1",
|
|
28
|
-
"react-router-dom": "^6.23.
|
|
28
|
+
"react-router-dom": "^6.23.1",
|
|
29
29
|
"run": "^1.5.0"
|
|
30
30
|
},
|
|
31
31
|
"skip": {
|
package/src/NSARouterMaker.tsx
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import queryString, { ParsedQuery } from 'query-string';
|
|
2
|
-
import {
|
|
2
|
+
import { IStorageCookie, ObjectService, ParsedNameValue, URLOperation } from "namirasoft-core";
|
|
3
3
|
import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
|
|
4
4
|
import { INSARouterProps } from "./INSARouterProps";
|
|
5
5
|
import { INSARouterMaker } from "./INSARouterMaker";
|
|
@@ -35,17 +35,8 @@ export class NSARouterMaker
|
|
|
35
35
|
}
|
|
36
36
|
private init(): { props: INSARouterProps, inited: boolean }
|
|
37
37
|
{
|
|
38
|
-
let qStorage: string = this.getQuery("location");
|
|
39
|
-
let qAPI: string = this.getQuery("api");
|
|
40
38
|
let qToken: string = this.getQuery("token");
|
|
41
|
-
|
|
42
|
-
if (qAPI)
|
|
43
|
-
qStorage = "memory";
|
|
44
|
-
let storage: IStorage;
|
|
45
|
-
if (qStorage === "memory")
|
|
46
|
-
storage = new IStorageMemory();
|
|
47
|
-
else
|
|
48
|
-
storage = new IStorageLocal();
|
|
39
|
+
let storage = new IStorageCookie({ domain: ".namirasoft.com", path: "/", sameSite: "Strict", httpOnly: "true", secure: "true" });
|
|
49
40
|
let token_manager = new TokenManager(storage, () => this.setState({}));
|
|
50
41
|
if (qToken)
|
|
51
42
|
token_manager.setValue(qToken, true);
|
|
@@ -93,9 +84,7 @@ export class NSARouterMaker
|
|
|
93
84
|
{
|
|
94
85
|
if (!customQuery)
|
|
95
86
|
customQuery = {};
|
|
96
|
-
|
|
97
|
-
let final = { ...query, ...customQuery };
|
|
98
|
-
return URLOperation.getLink("", sub, final);
|
|
87
|
+
return URLOperation.getLink("", sub, customQuery);
|
|
99
88
|
}
|
|
100
89
|
redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void
|
|
101
90
|
{
|
package/src/react-app-env.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
/// <reference types="react-scripts" />
|
|
1
|
+
/// <reference types="react-scripts" />
|