infinity-forge 0.38.1 → 0.38.3
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/system/infra/http/axios-http-client.js +6 -2
- package/dist/system/infra/http/axios-http-client.js.map +1 -1
- package/dist/system/presentation/context/auth/context.d.ts +1 -0
- package/dist/system/presentation/context/auth/context.js +18 -21
- package/dist/system/presentation/context/auth/context.js.map +1 -1
- package/dist/system/presentation/context/auth/interfaces.d.ts +0 -2
- package/package.json +1 -1
|
@@ -65,7 +65,7 @@ var AxiosHttpClient = /** @class */ (function () {
|
|
|
65
65
|
}
|
|
66
66
|
AxiosHttpClient.prototype.request = function (payload) {
|
|
67
67
|
return __awaiter(this, void 0, void 0, function () {
|
|
68
|
-
var method, newBody, requestPayload, contentType, _a, status, data, _b;
|
|
68
|
+
var method, newBody, requestPayload, contentType, _a, status, data, _b, urlParams, signOut;
|
|
69
69
|
var _c;
|
|
70
70
|
return __generator(this, function (_d) {
|
|
71
71
|
switch (_d.label) {
|
|
@@ -119,7 +119,11 @@ var AxiosHttpClient = /** @class */ (function () {
|
|
|
119
119
|
return [2 /*return*/, data];
|
|
120
120
|
case system_1.HttpStatusCode.unauthorized: {
|
|
121
121
|
if (process === null || process === void 0 ? void 0 : process.browser) {
|
|
122
|
-
|
|
122
|
+
urlParams = new URLSearchParams(window.location.search);
|
|
123
|
+
signOut = urlParams.get('signOut');
|
|
124
|
+
if (!signOut) {
|
|
125
|
+
window.location.href = '/sign-out?flag=' + ((_c = payload === null || payload === void 0 ? void 0 : payload.headers) === null || _c === void 0 ? void 0 : _c.flag);
|
|
126
|
+
}
|
|
123
127
|
}
|
|
124
128
|
throw new system_1.UnauthorizedError({ code: '401', message: '' });
|
|
125
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axios-http-client.js","sourceRoot":"","sources":["../../../../src/system/infra/http/axios-http-client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAsC;AAEtC,gDAAyB;AAEzB,mCASiB;AAGjB;IAAA;
|
|
1
|
+
{"version":3,"file":"axios-http-client.js","sourceRoot":"","sources":["../../../../src/system/infra/http/axios-http-client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAsC;AAEtC,gDAAyB;AAEzB,mCASiB;AAGjB;IAAA;IA+EA,CAAC;IA9EO,iCAAO,GAAb,UAAc,OAAoB;;;;;;;wBAC1B,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;wBAEvB,OAAO,GAAG,OAAO,CAAC,IAAI;4BAC1B,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,UAAC,EAAU;oCAAT,CAAC,QAAA,EAAE,KAAK,QAAA;gCAAM,OAAA,KAAK,KAAK,EAAE;4BAAZ,CAAY,CAAC,CAAC;4BACvF,CAAC,CAAC,SAAS,CAAA;wBAEP,cAAc,yBACf,OAAO,KACV,IAAI,EAAE,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,QAAQ,IAAI,OAAO,EACxD,MAAM,EAAE,CAAC,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,QAAQ,CAAC,IAAI,OAAO,EAC5D,OAAO,wBAAO,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,KAAE,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,eAAe,EAAE,CAAC,QAAQ,MAClG,CAAA;wBAEK,WAAW,GAAG,cAAc,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;6BAGlF,CAAA,OAAO,CAAC,MAAM,KAAK,MAAM,IAAI,WAAW,KAAK,yCAAyC,CAAA,EAAtF,wBAAsF;wBAClF,qBAAM,eAAK,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,cAAc,CAAC,OAAO,EAAE,CAAC,EAAA;;wBAAvF,KAAA,SAAuF,CAAA;;4BACvF,qBAAM,eAAK;6BACR,OAAO,CAAC,cAAc,CAAC;6BACvB,IAAI,CAAC,UAAC,CAAC;4BACN,OAAO,CAAC,CAAA;wBACV,CAAC,CAAC;6BACD,KAAK,CAAC,UAAC,KAAK;;4BACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;4BAClB,IAAI,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,CAAA,EAAE,CAAC;gCACrB,OAAO;oCACL,MAAM,EAAE,KAAK;oCACb,IAAI,EAAE,EAAE,OAAO,EAAE,8BAA8B,EAAE;iCAClD,CAAA;4BACH,CAAC;4BAED,OAAO;gCACL,IAAI,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,0CAAE,IAAI;gCAC3B,MAAM,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,0CAAE,MAAM;6BAChC,CAAA;wBACH,CAAC,CAAC,EAAA;;wBAlBJ,KAAA,SAkBI,CAAA;;;wBArBJ,OAqBI,EArBF,MAAM,YAAA,EAAE,IAAI,UAAA;wBAuBpB,QAAQ,MAAM,EAAE,CAAC;4BACf,KAAK,uBAAc,CAAC,EAAE;gCACpB,sBAAO,IAAI,EAAA;4BAEb,KAAK,uBAAc,CAAC,WAAW;gCAC7B,sBAAO,IAAI,EAAA;4BAEb,KAAK,uBAAc,CAAC,MAAM;gCACxB,sBAAO,IAAI,EAAA;4BAEb,KAAK,uBAAc,CAAC,SAAS;gCAC3B,sBAAO,IAAI,EAAA;4BAEb,KAAK,uBAAc,CAAC,YAAY,CAAC,CAAC,CAAC;gCACjC,IAAK,OAAe,aAAf,OAAO,uBAAP,OAAO,CAAU,OAAO,EAAE,CAAC;oCACxB,SAAS,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;oCACvD,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;oCACxC,IAAI,CAAC,OAAO,EAAE,CAAC;wCACb,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,iBAAiB,IAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,0CAAE,IAAI,CAAA,CAAA;oCACnE,CAAC;gCACH,CAAC;gCAED,MAAM,IAAI,0BAAiB,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAA;4BAC3D,CAAC;4BAED,KAAK,uBAAc,CAAC,mBAAmB;gCACrC,MAAM,IAAI,wBAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;4BAElD,KAAK,uBAAc,CAAC,QAAQ;gCAC1B,MAAM,IAAI,sBAAa,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;4BAEjE,KAAK,uBAAc,CAAC,UAAU;gCAC5B,MAAM,IAAI,wBAAe,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;4BAEnE,OAAO,CAAC,CAAC,CAAC;gCACR,MAAM,IAAI,wBAAe,CAAC,EAAE,OAAO,EAAE,uBAAuB,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;4BAC9E,CAAC;wBACH,CAAC;;;;;KACF;IA9EU,eAAe;QAD3B,IAAA,sBAAU,GAAE;OACA,eAAe,CA+E3B;IAAD,sBAAC;CAAA,AA/ED,IA+EC;AA/EY,0CAAe"}
|
|
@@ -10,6 +10,7 @@ export type AuthAdminProviderProps = {
|
|
|
10
10
|
interceptor?: {
|
|
11
11
|
disableInterceptor?: boolean;
|
|
12
12
|
};
|
|
13
|
+
initialUser?: any;
|
|
13
14
|
};
|
|
14
15
|
declare function AuthAdminProvider(props: AuthAdminProviderProps): import("react/jsx-runtime").JSX.Element;
|
|
15
16
|
declare function useAuthAdmin(): IAuthContextType & AuthAdminProviderProps;
|
|
@@ -79,8 +79,7 @@ var axios_1 = __importStar(require("axios"));
|
|
|
79
79
|
var system_1 = require("../../../../system/index.js");
|
|
80
80
|
var AuthContext = (0, react_1.createContext)({});
|
|
81
81
|
function AuthAdminProvider(props) {
|
|
82
|
-
var _a = (0, react_1.useState)(props.
|
|
83
|
-
var _b = (0, react_1.useState)(undefined), user = _b[0], setUser = _b[1];
|
|
82
|
+
var _a = (0, react_1.useState)(props.initialUser), user = _a[0], setUser = _a[1];
|
|
84
83
|
var router = (0, router_1.useRouter)();
|
|
85
84
|
var InjectedRemotes = (0, system_1.useInfraInjection)().InjectedRemotes;
|
|
86
85
|
function loadUser() {
|
|
@@ -124,30 +123,28 @@ function AuthAdminProvider(props) {
|
|
|
124
123
|
function GetUser() {
|
|
125
124
|
return user;
|
|
126
125
|
}
|
|
127
|
-
(0, swr_1.default)(user
|
|
126
|
+
(0, swr_1.default)(user === undefined && 'load_user', loadUser, { errorRetryCount: 1, revalidateOnFocus: false });
|
|
128
127
|
(0, react_1.useEffect)(function () {
|
|
129
128
|
var _a;
|
|
130
129
|
if (!((_a = props === null || props === void 0 ? void 0 : props.interceptor) === null || _a === void 0 ? void 0 : _a.disableInterceptor)) {
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
if (err
|
|
135
|
-
|
|
136
|
-
signOut();
|
|
137
|
-
}
|
|
138
|
-
if (((_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.status) === 401) {
|
|
139
|
-
signOut();
|
|
140
|
-
}
|
|
141
|
-
if (((_b = err === null || err === void 0 ? void 0 : err.response) === null || _b === void 0 ? void 0 : _b.status) === 403) {
|
|
142
|
-
router.push('/403');
|
|
143
|
-
}
|
|
130
|
+
axios_1.default.interceptors.response.use(function (r) { return r; }, function (err) {
|
|
131
|
+
var _a, _b;
|
|
132
|
+
if (err instanceof axios_1.AxiosError) {
|
|
133
|
+
if (err.code === 'ERR_NETWORK') {
|
|
134
|
+
signOut();
|
|
144
135
|
}
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
136
|
+
if (((_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.status) === 401) {
|
|
137
|
+
signOut();
|
|
138
|
+
}
|
|
139
|
+
if (((_b = err === null || err === void 0 ? void 0 : err.response) === null || _b === void 0 ? void 0 : _b.status) === 403) {
|
|
140
|
+
router.push('/403');
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
throw err;
|
|
144
|
+
});
|
|
148
145
|
}
|
|
149
|
-
}, [
|
|
150
|
-
return ((0, jsx_runtime_1.jsx)(AuthContext.Provider, { value: __assign({ user: user, signIn: signIn, signOut: signOut, GetUser: GetUser, loadUser: loadUser
|
|
146
|
+
}, []);
|
|
147
|
+
return ((0, jsx_runtime_1.jsx)(AuthContext.Provider, { value: __assign({ user: user, signIn: signIn, signOut: signOut, GetUser: GetUser, loadUser: loadUser }, props), children: props.children && props.children }));
|
|
151
148
|
}
|
|
152
149
|
exports.AuthAdminProvider = AuthAdminProvider;
|
|
153
150
|
function useAuthAdmin() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../src/system/presentation/context/auth/context.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAAsE;AAEtE,yCAAoC;AACpC,sCAAuC;AACvC,6CAAyC;AAEzC,mCAUiB;AAIjB,IAAM,WAAW,GAAG,IAAA,qBAAa,EAAC,EAA+C,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../src/system/presentation/context/auth/context.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import { AuthAdmin, UserAdmin } from '../../../../system/index.js';
|
|
2
|
-
import { Dispatch, SetStateAction } from 'react';
|
|
3
2
|
export interface IAuthContextType {
|
|
4
3
|
signOut(): void;
|
|
5
4
|
user: UserAdmin | undefined | null;
|
|
6
5
|
signIn(params: AuthAdmin.Params): void;
|
|
7
6
|
GetUser<T>(): T & UserAdmin;
|
|
8
7
|
loadUser(): Promise<void>;
|
|
9
|
-
setStartContext: Dispatch<SetStateAction<boolean>>;
|
|
10
8
|
}
|