@vocollege/app 0.0.74 → 0.0.76
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/interceptor.js +1 -8
- package/dist/modules/VoApi/queries/users.d.ts +1 -0
- package/dist/modules/VoApi/queries/users.js +4 -3
- package/dist/modules/VoAuth.js +4 -0
- package/package.json +1 -1
- package/src/interceptor.ts +0 -11
- package/src/modules/VoApi/queries/users.ts +28 -0
- package/src/modules/VoAuth.ts +6 -0
package/dist/interceptor.js
CHANGED
|
@@ -112,15 +112,8 @@ var I18n_1 = __importDefault(require("./modules/Services/I18n"));
|
|
|
112
112
|
console.error("Interceptor", error_2);
|
|
113
113
|
return [3 /*break*/, 4];
|
|
114
114
|
case 4: return [3 /*break*/, 5];
|
|
115
|
-
case 5:
|
|
116
|
-
// redirect();
|
|
117
|
-
// console.error("Interceptor", error);
|
|
118
|
-
// return Promise.reject(error);
|
|
119
|
-
return [2 /*return*/, new Promise(function (resolve, reject) {
|
|
115
|
+
case 5: return [2 /*return*/, new Promise(function (resolve, reject) {
|
|
120
116
|
switch (status) {
|
|
121
|
-
// case 403:
|
|
122
|
-
// reject(error);
|
|
123
|
-
// break;
|
|
124
117
|
case 419:
|
|
125
118
|
react_toastify_1.toast.error(I18n_1.default.get.messages.sessionExpired);
|
|
126
119
|
setTimeout(function () {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export declare const GET_USERS_FIELDS: import("@apollo/client").DocumentNode;
|
|
2
2
|
export declare const GET_USER: import("@apollo/client").DocumentNode;
|
|
3
3
|
export declare const GET_USERS: import("@apollo/client").DocumentNode;
|
|
4
|
+
export declare const GET_USERS_SIMPLIFIED: import("@apollo/client").DocumentNode;
|
|
4
5
|
export declare const GET_ACCOUNT: import("@apollo/client").DocumentNode;
|
|
@@ -4,10 +4,11 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
|
|
|
4
4
|
return cooked;
|
|
5
5
|
};
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
exports.GET_ACCOUNT = exports.GET_USERS = exports.GET_USER = exports.GET_USERS_FIELDS = void 0;
|
|
7
|
+
exports.GET_ACCOUNT = exports.GET_USERS_SIMPLIFIED = exports.GET_USERS = exports.GET_USER = exports.GET_USERS_FIELDS = void 0;
|
|
8
8
|
var client_1 = require("@apollo/client");
|
|
9
9
|
exports.GET_USERS_FIELDS = (0, client_1.gql)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n fragment UsersFields on User {\n id\n name\n email\n active\n status\n updated_at\n created_at\n roles {\n id\n label\n type\n }\n groupRoles {\n id\n label\n type\n }\n groups {\n id\n name\n title\n }\n validig {\n id\n }\n }\n"], ["\n fragment UsersFields on User {\n id\n name\n email\n active\n status\n updated_at\n created_at\n roles {\n id\n label\n type\n }\n groupRoles {\n id\n label\n type\n }\n groups {\n id\n name\n title\n }\n validig {\n id\n }\n }\n"])));
|
|
10
10
|
exports.GET_USER = (0, client_1.gql)(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n query User($id: ID!) {\n user(id: $id) {\n id\n name\n email\n firstname\n lastname\n active\n personal_number\n address1\n address2\n postalcode\n town\n country\n phone1\n profession\n status\n gdpr\n description\n updated_at\n created_at\n images {\n id\n title\n filename\n filesize\n filetype\n url\n }\n roles {\n id\n label\n type\n }\n groupRoles {\n id\n label\n type\n }\n groups {\n id\n title\n type\n }\n }\n }\n"], ["\n query User($id: ID!) {\n user(id: $id) {\n id\n name\n email\n firstname\n lastname\n active\n personal_number\n address1\n address2\n postalcode\n town\n country\n phone1\n profession\n status\n gdpr\n description\n updated_at\n created_at\n images {\n id\n title\n filename\n filesize\n filetype\n url\n }\n roles {\n id\n label\n type\n }\n groupRoles {\n id\n label\n type\n }\n groups {\n id\n title\n type\n }\n }\n }\n"])));
|
|
11
11
|
exports.GET_USERS = (0, client_1.gql)(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n # query Users($page: Int!, $search: String) {\n # users(page: $page, search: $search) {\n # paginatorInfo {\n # total\n # currentPage\n # hasMorePages\n # }\n # data {\n # name\n # email\n # }\n # }\n # }\n\n query Users(\n $search: String\n $page: Int\n $limit: Int\n $orderBy: [GetUsersOrderByClause]\n $filters: [GetUsersFilter]\n ) {\n allGroups(categories: [\"region\", \"local\"]) {\n id\n title\n }\n roles {\n id\n name\n label\n }\n users(\n search: $search\n page: $page\n limit: $limit\n orderBy: $orderBy\n filters: $filters\n ) {\n paginatorInfo {\n total\n currentPage\n hasMorePages\n }\n data {\n ...UsersFields\n }\n }\n }\n ", "\n"], ["\n # query Users($page: Int!, $search: String) {\n # users(page: $page, search: $search) {\n # paginatorInfo {\n # total\n # currentPage\n # hasMorePages\n # }\n # data {\n # name\n # email\n # }\n # }\n # }\n\n query Users(\n $search: String\n $page: Int\n $limit: Int\n $orderBy: [GetUsersOrderByClause]\n $filters: [GetUsersFilter]\n ) {\n allGroups(categories: [\"region\", \"local\"]) {\n id\n title\n }\n roles {\n id\n name\n label\n }\n users(\n search: $search\n page: $page\n limit: $limit\n orderBy: $orderBy\n filters: $filters\n ) {\n paginatorInfo {\n total\n currentPage\n hasMorePages\n }\n data {\n ...UsersFields\n }\n }\n }\n ", "\n"])), exports.GET_USERS_FIELDS);
|
|
12
|
-
exports.
|
|
13
|
-
|
|
12
|
+
exports.GET_USERS_SIMPLIFIED = (0, client_1.gql)(templateObject_4 || (templateObject_4 = __makeTemplateObject(["\n query UsersSimplified(\n $search: String\n $page: Int\n $limit: Int\n $orderBy: [GetUsersOrderByClause]\n $filters: [GetUsersFilter]\n ) {\n users(\n search: $search\n page: $page\n limit: $limit\n orderBy: $orderBy\n filters: $filters\n ) {\n paginatorInfo {\n total\n currentPage\n hasMorePages\n }\n data {\n ...UsersFields\n }\n }\n }\n ", "\n"], ["\n query UsersSimplified(\n $search: String\n $page: Int\n $limit: Int\n $orderBy: [GetUsersOrderByClause]\n $filters: [GetUsersFilter]\n ) {\n users(\n search: $search\n page: $page\n limit: $limit\n orderBy: $orderBy\n filters: $filters\n ) {\n paginatorInfo {\n total\n currentPage\n hasMorePages\n }\n data {\n ...UsersFields\n }\n }\n }\n ", "\n"])), exports.GET_USERS_FIELDS);
|
|
13
|
+
exports.GET_ACCOUNT = (0, client_1.gql)(templateObject_5 || (templateObject_5 = __makeTemplateObject(["\n query Account($id: ID!) {\n user(id: $id) {\n id\n name\n email\n firstname\n lastname\n active\n personal_number\n address1\n address2\n postalcode\n town\n country\n phone1\n profession\n status\n description\n workplace\n gdpr\n images {\n id\n title\n filename\n filesize\n filetype\n url\n }\n }\n userSettings {\n publicDefaultPortfolio {\n id\n name\n disk\n }\n }\n }\n"], ["\n query Account($id: ID!) {\n user(id: $id) {\n id\n name\n email\n firstname\n lastname\n active\n personal_number\n address1\n address2\n postalcode\n town\n country\n phone1\n profession\n status\n description\n workplace\n gdpr\n images {\n id\n title\n filename\n filesize\n filetype\n url\n }\n }\n userSettings {\n publicDefaultPortfolio {\n id\n name\n disk\n }\n }\n }\n"])));
|
|
14
|
+
var templateObject_1, templateObject_2, templateObject_3, templateObject_4, templateObject_5;
|
package/dist/modules/VoAuth.js
CHANGED
|
@@ -258,6 +258,8 @@ var VoAuth = /** @class */ (function (_super) {
|
|
|
258
258
|
domain: VoConfig_1.default.get.AUTH_DOMAIN,
|
|
259
259
|
sameSite: "Lax",
|
|
260
260
|
});
|
|
261
|
+
Helpers.localStorage.remove(VoConfig_1.default.get.CURRENT_GROUP || "");
|
|
262
|
+
Helpers.localStorage.remove(VoConfig_1.default.get.MASQUERADE_USER || "");
|
|
261
263
|
delete axios_1.default.defaults.headers.common["Authorization"];
|
|
262
264
|
};
|
|
263
265
|
VoAuth.prototype.refreshToken = function () {
|
|
@@ -426,12 +428,14 @@ var VoAuth = /** @class */ (function (_super) {
|
|
|
426
428
|
js_cookie_1.default.remove(accessTokenKey, {
|
|
427
429
|
domain: VoConfig_1.default.get.AUTH_DOMAIN,
|
|
428
430
|
sameSite: "Lax",
|
|
431
|
+
expires: 1,
|
|
429
432
|
});
|
|
430
433
|
var tokenTypeKey = VoConfig_1.default.get.AUTH_STORAGE_TOKEN_TYPE || "";
|
|
431
434
|
Helpers.localStorage.remove(tokenTypeKey);
|
|
432
435
|
js_cookie_1.default.remove(tokenTypeKey, {
|
|
433
436
|
domain: VoConfig_1.default.get.AUTH_DOMAIN,
|
|
434
437
|
sameSite: "Lax",
|
|
438
|
+
expires: 12,
|
|
435
439
|
});
|
|
436
440
|
return {
|
|
437
441
|
state: state,
|
package/package.json
CHANGED
package/src/interceptor.ts
CHANGED
|
@@ -39,7 +39,6 @@ import I18n from "./modules/Services/I18n";
|
|
|
39
39
|
switch (status) {
|
|
40
40
|
case 400:
|
|
41
41
|
case 401:
|
|
42
|
-
// case 403:
|
|
43
42
|
try {
|
|
44
43
|
await VoAuth.refreshToken();
|
|
45
44
|
const token: any = VoAuth.getToken();
|
|
@@ -56,23 +55,13 @@ import I18n from "./modules/Services/I18n";
|
|
|
56
55
|
} catch (error) {
|
|
57
56
|
redirect();
|
|
58
57
|
console.error("Interceptor", error);
|
|
59
|
-
// return Promise.reject(error);
|
|
60
58
|
}
|
|
61
59
|
break;
|
|
62
|
-
// case 419:
|
|
63
|
-
// console.log("LOG OUT");
|
|
64
|
-
// break;
|
|
65
60
|
}
|
|
66
61
|
}
|
|
67
62
|
|
|
68
|
-
// redirect();
|
|
69
|
-
// console.error("Interceptor", error);
|
|
70
|
-
// return Promise.reject(error);
|
|
71
63
|
return new Promise((resolve, reject) => {
|
|
72
64
|
switch (status) {
|
|
73
|
-
// case 403:
|
|
74
|
-
// reject(error);
|
|
75
|
-
// break;
|
|
76
65
|
case 419:
|
|
77
66
|
toast.error(I18n.get.messages.sessionExpired);
|
|
78
67
|
setTimeout(() => {
|
|
@@ -130,6 +130,34 @@ export const GET_USERS = gql`
|
|
|
130
130
|
${GET_USERS_FIELDS}
|
|
131
131
|
`;
|
|
132
132
|
|
|
133
|
+
export const GET_USERS_SIMPLIFIED = gql`
|
|
134
|
+
query UsersSimplified(
|
|
135
|
+
$search: String
|
|
136
|
+
$page: Int
|
|
137
|
+
$limit: Int
|
|
138
|
+
$orderBy: [GetUsersOrderByClause]
|
|
139
|
+
$filters: [GetUsersFilter]
|
|
140
|
+
) {
|
|
141
|
+
users(
|
|
142
|
+
search: $search
|
|
143
|
+
page: $page
|
|
144
|
+
limit: $limit
|
|
145
|
+
orderBy: $orderBy
|
|
146
|
+
filters: $filters
|
|
147
|
+
) {
|
|
148
|
+
paginatorInfo {
|
|
149
|
+
total
|
|
150
|
+
currentPage
|
|
151
|
+
hasMorePages
|
|
152
|
+
}
|
|
153
|
+
data {
|
|
154
|
+
...UsersFields
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
${GET_USERS_FIELDS}
|
|
159
|
+
`;
|
|
160
|
+
|
|
133
161
|
export const GET_ACCOUNT = gql`
|
|
134
162
|
query Account($id: ID!) {
|
|
135
163
|
user(id: $id) {
|
package/src/modules/VoAuth.ts
CHANGED
|
@@ -169,6 +169,9 @@ class VoAuth extends VoBase {
|
|
|
169
169
|
sameSite: "Lax",
|
|
170
170
|
});
|
|
171
171
|
|
|
172
|
+
Helpers.localStorage.remove(VoConfig.get.CURRENT_GROUP || "");
|
|
173
|
+
Helpers.localStorage.remove(VoConfig.get.MASQUERADE_USER || "");
|
|
174
|
+
|
|
172
175
|
delete axios.defaults.headers.common["Authorization"];
|
|
173
176
|
}
|
|
174
177
|
async refreshToken() {
|
|
@@ -196,6 +199,7 @@ class VoAuth extends VoBase {
|
|
|
196
199
|
throw error;
|
|
197
200
|
}
|
|
198
201
|
}
|
|
202
|
+
|
|
199
203
|
check(forceRedirect = false, forceLoad = false): Promise<any> {
|
|
200
204
|
this.checkConfig();
|
|
201
205
|
return new Promise(async (resolve, reject) => {
|
|
@@ -300,6 +304,7 @@ class VoAuth extends VoBase {
|
|
|
300
304
|
JsCookies.remove(accessTokenKey, {
|
|
301
305
|
domain: VoConfig.get.AUTH_DOMAIN,
|
|
302
306
|
sameSite: "Lax",
|
|
307
|
+
expires: 1,
|
|
303
308
|
});
|
|
304
309
|
|
|
305
310
|
let tokenTypeKey = VoConfig.get.AUTH_STORAGE_TOKEN_TYPE || "";
|
|
@@ -307,6 +312,7 @@ class VoAuth extends VoBase {
|
|
|
307
312
|
JsCookies.remove(tokenTypeKey, {
|
|
308
313
|
domain: VoConfig.get.AUTH_DOMAIN,
|
|
309
314
|
sameSite: "Lax",
|
|
315
|
+
expires: 12,
|
|
310
316
|
});
|
|
311
317
|
|
|
312
318
|
return {
|