namirasoft-account-react 1.3.8 → 1.3.10

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.
@@ -1,6 +1,7 @@
1
1
  import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
2
2
  import { Messenger } from "./Messenger";
3
3
  import { ParsedNameValue } from "namirasoft-core";
4
+ import { ParsedQuery } from "query-string";
4
5
  export interface IAccountProps {
5
6
  account: {
6
7
  token_manager: TokenManager;
@@ -8,6 +9,7 @@ export interface IAccountProps {
8
9
  };
9
10
  messenger: Messenger;
10
11
  url: {
12
+ getQueryStrings(): ParsedQuery;
11
13
  getQuery(name: string): string;
12
14
  getLink(sub: string, customQuery: {
13
15
  [name: string]: ParsedNameValue;
package/dist/Info.d.ts ADDED
@@ -0,0 +1,6 @@
1
+ import { ParsedQuery } from 'query-string';
2
+ export default class Info {
3
+ static getDeviceName(query: ParsedQuery): string | (string | null)[];
4
+ static getVersion(): string;
5
+ static getOS(query: ParsedQuery): string | (string | null)[];
6
+ }
package/dist/Info.js ADDED
@@ -0,0 +1,25 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ const device_uuid_1 = __importDefault(require("device-uuid"));
7
+ class Info {
8
+ static getDeviceName(query) {
9
+ var _a;
10
+ var du = new device_uuid_1.default.DeviceUUID().parse();
11
+ return (_a = query.device) !== null && _a !== void 0 ? _a : (du.platform + " " + du.version);
12
+ }
13
+ static getVersion() {
14
+ var du = new device_uuid_1.default.DeviceUUID().parse();
15
+ return du.version;
16
+ }
17
+ static getOS(query) {
18
+ var _a;
19
+ var du = new device_uuid_1.default.DeviceUUID().parse();
20
+ return (_a = query.os) !== null && _a !== void 0 ? _a : du.os;
21
+ }
22
+ }
23
+ exports.default = Info;
24
+ ;
25
+ //# sourceMappingURL=Info.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Info.js","sourceRoot":"","sources":["../src/Info.ts"],"names":[],"mappings":";;;;;AACA,8DAAqC;AAErC,MAAqB,IAAI;IAErB,MAAM,CAAC,aAAa,CAAC,KAAkB;;QAEnC,IAAI,EAAE,GAAG,IAAI,qBAAU,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,CAAC;QAC7C,OAAO,MAAA,KAAK,CAAC,MAAM,mCAAI,CAAC,EAAE,CAAC,QAAQ,GAAG,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,CAAC,UAAU;QAEb,IAAI,EAAE,GAAG,IAAI,qBAAU,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,CAAC;QAC7C,OAAO,EAAE,CAAC,OAAO,CAAC;IACtB,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,KAAkB;;QAE3B,IAAI,EAAE,GAAG,IAAI,qBAAU,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,CAAC;QAC7C,OAAO,MAAA,KAAK,CAAC,EAAE,mCAAI,EAAE,CAAC,EAAE,CAAC;IAC7B,CAAC;CACJ;AAjBD,uBAiBC;AAAA,CAAC"}
@@ -1,4 +1,5 @@
1
1
  /// <reference types="react" />
2
+ import { ParsedQuery } from 'query-string';
2
3
  import { ParsedNameValue } from "namirasoft-core";
3
4
  import { IRouterMaker } from "./IRouterMaker";
4
5
  import rrd from 'react-router-dom';
@@ -11,6 +12,7 @@ export declare class RouterMaker {
11
12
  private component;
12
13
  constructor(state: IRouterState | undefined, setState: React.Dispatch<React.SetStateAction<IRouterState | undefined>>, location: rrd.Location, navigate: rrd.NavigateFunction, component: IRouterMaker);
13
14
  private init;
15
+ getQueryStrings(): ParsedQuery;
14
16
  getQuery(name: string): string;
15
17
  getLink(sub: string, customQuery: {
16
18
  [name: string]: ParsedNameValue;
@@ -18,6 +18,7 @@ class RouterMaker {
18
18
  this.navigate = navigate;
19
19
  this.component = component;
20
20
  this.init = this.init.bind(this);
21
+ this.getQueryStrings = this.getQueryStrings.bind(this);
21
22
  this.getQuery = this.getQuery.bind(this);
22
23
  this.getLink = this.getLink.bind(this);
23
24
  this.redirect = this.redirect.bind(this);
@@ -60,6 +61,7 @@ class RouterMaker {
60
61
  url: {
61
62
  getLink: this.getLink,
62
63
  redirect: this.redirect,
64
+ getQueryStrings: this.getQueryStrings,
63
65
  getQuery: this.getQuery,
64
66
  },
65
67
  messenger,
@@ -69,8 +71,11 @@ class RouterMaker {
69
71
  inited = (_b = (_a = this.state) === null || _a === void 0 ? void 0 : _a.inited) !== null && _b !== void 0 ? _b : false;
70
72
  return { props, inited };
71
73
  }
74
+ getQueryStrings() {
75
+ return query_string_1.default.parse(this.location.search);
76
+ }
72
77
  getQuery(name) {
73
- let query = query_string_1.default.parse(this.location.search);
78
+ let query = this.getQueryStrings();
74
79
  let item = query[name];
75
80
  return new namirasoft_core_1.ObjectService(item).getString();
76
81
  }
@@ -1 +1 @@
1
- {"version":3,"file":"RouterMaker.js","sourceRoot":"","sources":["../src/RouterMaker.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RouterMaker.js","sourceRoot":"","sources":["../src/RouterMaker.tsx"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  export * from "./IAccountProps";
2
+ export * from "./Info";
2
3
  export * from "./IRouterMaker";
3
4
  export * from "./IRouterState";
4
5
  export * from "./Messenger";
package/dist/index.js CHANGED
@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./IAccountProps"), exports);
18
+ __exportStar(require("./Info"), exports);
18
19
  __exportStar(require("./IRouterMaker"), exports);
19
20
  __exportStar(require("./IRouterState"), exports);
20
21
  __exportStar(require("./Messenger"), exports);
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,iDAA+B;AAC/B,iDAA+B;AAC/B,8CAA4B;AAC5B,iDAA+B;AAC/B,qDAAmC;AACnC,gDAA8B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,yCAAuB;AACvB,iDAA+B;AAC/B,iDAA+B;AAC/B,8CAA4B;AAC5B,iDAA+B;AAC/B,qDAAmC;AACnC,gDAA8B"}
package/package.json CHANGED
@@ -8,18 +8,20 @@
8
8
  "framework": "npm",
9
9
  "application": "package",
10
10
  "private": false,
11
- "version": "1.3.8",
12
- "main": "./dist/index.js",
13
- "types": "./dist/index.d.ts",
11
+ "version": "1.3.10",
14
12
  "author": "Amir Abolhasani",
15
13
  "license": "MIT",
14
+ "main": "./dist/index.js",
15
+ "types": "./dist/index.d.ts",
16
16
  "scripts": {
17
17
  "build": ""
18
18
  },
19
19
  "dependencies": {
20
- "@types/react": "^18.2.71",
21
- "namirasoft-account": "^1.3.7",
22
- "namirasoft-core": "^1.3.11",
20
+ "@types/device-uuid": "^1.0.3",
21
+ "@types/react": "^18.2.77",
22
+ "device-uuid": "^1.0.4",
23
+ "namirasoft-account": "^1.3.8",
24
+ "namirasoft-core": "^1.3.18",
23
25
  "query-string": "^9.0.0",
24
26
  "react": "^18.2.0",
25
27
  "react-router-dom": "^6.22.3",
@@ -1,6 +1,7 @@
1
1
  import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
2
2
  import { Messenger } from "./Messenger";
3
3
  import { ParsedNameValue } from "namirasoft-core";
4
+ import { ParsedQuery } from "query-string";
4
5
 
5
6
  export interface IAccountProps
6
7
  {
@@ -10,6 +11,7 @@ export interface IAccountProps
10
11
  },
11
12
  messenger: Messenger;
12
13
  url: {
14
+ getQueryStrings(): ParsedQuery;
13
15
  getQuery(name: string): string;
14
16
  getLink(sub: string, customQuery: { [name: string]: ParsedNameValue }): string;
15
17
  redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void;
package/src/Info.ts ADDED
@@ -0,0 +1,21 @@
1
+ import { ParsedQuery } from 'query-string';
2
+ import DeviceUUID from "device-uuid";
3
+
4
+ export default class Info
5
+ {
6
+ static getDeviceName(query: ParsedQuery)
7
+ {
8
+ var du = new DeviceUUID.DeviceUUID().parse();
9
+ return query.device ?? (du.platform + " " + du.version);
10
+ }
11
+ static getVersion()
12
+ {
13
+ var du = new DeviceUUID.DeviceUUID().parse();
14
+ return du.version;
15
+ }
16
+ static getOS(query: ParsedQuery)
17
+ {
18
+ var du = new DeviceUUID.DeviceUUID().parse();
19
+ return query.os ?? du.os;
20
+ }
21
+ };
@@ -1,4 +1,4 @@
1
- import queryString from 'query-string';
1
+ import queryString, { ParsedQuery } from 'query-string';
2
2
  import { IStorage, IStorageLocal, IStorageMemory, ObjectService, ParsedNameValue, URLOperation } from "namirasoft-core";
3
3
  import { Messenger } from "./Messenger";
4
4
  import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
@@ -25,6 +25,7 @@ export class RouterMaker
25
25
  this.navigate = navigate;
26
26
  this.component = component;
27
27
  this.init = this.init.bind(this);
28
+ this.getQueryStrings = this.getQueryStrings.bind(this);
28
29
  this.getQuery = this.getQuery.bind(this);
29
30
  this.getLink = this.getLink.bind(this);
30
31
  this.redirect = this.redirect.bind(this);
@@ -68,6 +69,7 @@ export class RouterMaker
68
69
  url: {
69
70
  getLink: this.getLink,
70
71
  redirect: this.redirect,
72
+ getQueryStrings: this.getQueryStrings,
71
73
  getQuery: this.getQuery,
72
74
  },
73
75
  messenger,
@@ -77,9 +79,13 @@ export class RouterMaker
77
79
  inited = this.state?.inited ?? false;
78
80
  return { props, inited };
79
81
  }
82
+ getQueryStrings(): ParsedQuery
83
+ {
84
+ return queryString.parse(this.location.search);
85
+ }
80
86
  getQuery(name: string): string
81
87
  {
82
- let query = queryString.parse(this.location.search);
88
+ let query = this.getQueryStrings();
83
89
  let item = query[name];
84
90
  return new ObjectService(item).getString();
85
91
  }
package/src/index.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  export * from "./IAccountProps";
2
+ export * from "./Info";
2
3
  export * from "./IRouterMaker";
3
4
  export * from "./IRouterState";
4
5
  export * from "./Messenger";