namirasoft-account-react 1.4.293 → 1.4.294

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,5 +1,4 @@
1
1
  import queryString from 'query-string';
2
- import axios from "axios";
3
2
  import { EncodingOperation, EnvService, IStorageCookie, ObjectService, URLOperation } from "namirasoft-core";
4
3
  import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
5
4
  import { NSRouterMaker } from 'namirasoft-site-react';
@@ -22,18 +21,7 @@ export class NSARouterMaker {
22
21
  let storage = new IStorageCookie({ domain: ".namirasoft.com", path: "/" }, Cookies);
23
22
  let token_manager = new TokenManager(storage, () => { });
24
23
  let REACT_APP_BASE_URL_ACCOUNT = new EnvService("REACT_APP_BASE_URL_ACCOUNT", true).getString();
25
- let REACT_APP_BASE_URL_ACCOUNT_CONSOLE = new EnvService("REACT_APP_BASE_URL_ACCOUNT_CONSOLE", true).getString();
26
- let server = new NamirasoftAccountServer(REACT_APP_BASE_URL_ACCOUNT, token_manager, (error) => {
27
- var _a;
28
- if (axios.isAxiosError(error))
29
- if (error.response)
30
- if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401) {
31
- token_manager.del();
32
- window.location.href = REACT_APP_BASE_URL_ACCOUNT_CONSOLE;
33
- return;
34
- }
35
- ns_router_maker_props.notifier.onError(error);
36
- });
24
+ let server = new NamirasoftAccountServer(REACT_APP_BASE_URL_ACCOUNT, token_manager, ns_router_maker_props.notifier.onError);
37
25
  return Object.assign({ account: {
38
26
  token_manager,
39
27
  server,
@@ -1 +1 @@
1
- {"version":3,"file":"NSARouterMaker.js","sourceRoot":"","sources":["../src/NSARouterMaker.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"NSARouterMaker.js","sourceRoot":"","sources":["../src/NSARouterMaker.tsx"],"names":[],"mappings":"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"}
@@ -12,6 +12,7 @@ import React, { createRef } from "react";
12
12
  import { NSBoxString } from 'namirasoft-site-react';
13
13
  import { NSSection, NSSpace, NSSpaceSizeType, NSButtonBlue } from 'namirasoft-site-react';
14
14
  import Styles from './NSAVerificationPage.module.css';
15
+ import { BaseServer } from "namirasoft-core";
15
16
  export class NSAVerificationPage extends React.Component {
16
17
  constructor(props) {
17
18
  super(props);
@@ -47,7 +48,11 @@ export class NSAVerificationPage extends React.Component {
47
48
  this.props.onFinished();
48
49
  onFinshied();
49
50
  }, 2000);
50
- }).catch(onFinshied);
51
+ }).catch(e => {
52
+ onFinshied();
53
+ if (BaseServer.isErrorCode(e, 410) || BaseServer.isErrorCode(e, 404))
54
+ this.setState({ isSendCode: false });
55
+ });
51
56
  }
52
57
  catch (error) {
53
58
  this.props.notifier.onError(error);
@@ -1 +1 @@
1
- {"version":3,"file":"NSAVerificationPage.js","sourceRoot":"","sources":["../../src/pages/NSAVerificationPage.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"NSAVerificationPage.js","sourceRoot":"","sources":["../../src/pages/NSAVerificationPage.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.4.293",
11
+ "version": "1.4.294",
12
12
  "author": "Amir Abolhasani",
13
13
  "license": "MIT",
14
14
  "main": "./dist/main.js",
@@ -26,10 +26,10 @@
26
26
  "@types/platform": "^1.3.6",
27
27
  "@types/react": "^18.3.13",
28
28
  "namirasoft-access": "^1.4.68",
29
- "namirasoft-account": "^1.4.72",
29
+ "namirasoft-account": "^1.4.73",
30
30
  "namirasoft-account-client": "^1.4.5",
31
31
  "namirasoft-api-product": "^1.4.26",
32
- "namirasoft-core": "^1.4.74",
32
+ "namirasoft-core": "^1.4.75",
33
33
  "namirasoft-field": "^1.4.21",
34
34
  "namirasoft-history": "^1.4.17",
35
35
  "namirasoft-message": "^1.4.20",
@@ -1,6 +1,5 @@
1
1
  import queryString, { ParsedQuery } from 'query-string';
2
2
  import rrd from 'react-router-dom';
3
- import axios from "axios";
4
3
  import { EncodingOperation, EnvService, IStorage, IStorageCookie, ObjectService, ParsedNameValue, URLOperation } from "namirasoft-core";
5
4
  import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
6
5
  import { NSRouterMaker, NSRouterMakerProps } from 'namirasoft-site-react';
@@ -37,21 +36,8 @@ export class NSARouterMaker
37
36
  let token_manager = new TokenManager(storage, () => { });
38
37
 
39
38
  let REACT_APP_BASE_URL_ACCOUNT = new EnvService("REACT_APP_BASE_URL_ACCOUNT", true).getString();
40
- let REACT_APP_BASE_URL_ACCOUNT_CONSOLE = new EnvService("REACT_APP_BASE_URL_ACCOUNT_CONSOLE", true).getString();
41
- let server = new NamirasoftAccountServer(REACT_APP_BASE_URL_ACCOUNT, token_manager, (error: Error) =>
42
- {
43
- // Todo this should be on every Server uses Account
44
- if (axios.isAxiosError(error))
45
- if (error.response)
46
- if (error.response?.status === 401)
47
- {
48
- token_manager.del();
49
- window.location.href = REACT_APP_BASE_URL_ACCOUNT_CONSOLE;
50
- return;
51
- }
52
- ns_router_maker_props.notifier.onError(error);
53
- });
54
-
39
+ let server = new NamirasoftAccountServer(REACT_APP_BASE_URL_ACCOUNT, token_manager, ns_router_maker_props.notifier.onError);
40
+
55
41
  return {
56
42
  account: {
57
43
  token_manager,
@@ -3,6 +3,7 @@ import { IBaseComponentProps, NSRouterMakerProps, NSBoxString } from 'namirasoft
3
3
  import { NSSection, NSSpace, NSSpaceSizeType, NSButtonBlue } from 'namirasoft-site-react';
4
4
  import { NSARouterMakerProps } from '../NSARouterMakerProps';
5
5
  import Styles from './NSAVerificationPage.module.css';
6
+ import { BaseServer } from "namirasoft-core";
6
7
 
7
8
  export interface NSAVerificationPageProps extends IBaseComponentProps, NSRouterMakerProps, NSARouterMakerProps
8
9
  {
@@ -60,7 +61,12 @@ export class NSAVerificationPage extends React.Component<NSAVerificationPageProp
60
61
  this.props.onFinished();
61
62
  onFinshied();
62
63
  }, 2000);
63
- }).catch(onFinshied);
64
+ }).catch(e =>
65
+ {
66
+ onFinshied();
67
+ if (BaseServer.isErrorCode(e, 410) || BaseServer.isErrorCode(e, 404))
68
+ this.setState({ isSendCode: false });
69
+ });
64
70
  } catch (error)
65
71
  {
66
72
  this.props.notifier.onError(error as Error);