@qoretechnologies/reqraft 0.7.5 → 0.7.6

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 +1 @@
1
- {"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../src/utils/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,oBAAoB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;CACrD;AAED,MAAM,WAAW,qBAAqB,CAAC,CAAC;IACtC,IAAI,EAAE,CAAC,CAAC;IACR,EAAE,EAAE,OAAO,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,eAAO,MAAM,WAAW,EAAE,mBAIzB,CAAC;AAIF,eAAO,MAAM,UAAU,6EAKpB,mBAAmB,SAQrB,CAAC;AA+BF,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,wBAAsB,KAAK,CAAC,CAAC,EAAE,EAC7B,GAAG,EACH,MAAc,EACd,IAAI,EACJ,KAAY,EACZ,WAAgC,GACjC,EAAE,mBAAmB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAuDzD"}
1
+ {"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../src/utils/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,oBAAoB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;CACrD;AAED,MAAM,WAAW,qBAAqB,CAAC,CAAC;IACtC,IAAI,EAAE,CAAC,CAAC;IACR,EAAE,EAAE,OAAO,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,eAAO,MAAM,WAAW,EAAE,mBAIzB,CAAC;AAIF,eAAO,MAAM,UAAU,6EAKpB,mBAAmB,SAQrB,CAAC;AA6BF,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED,wBAAsB,KAAK,CAAC,CAAC,EAAE,EAC7B,GAAG,EACH,MAAc,EACd,IAAI,EACJ,KAAY,EACZ,WAAgC,GACjC,EAAE,mBAAmB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CA+CzD"}
@@ -56,22 +56,18 @@ var setupFetch = function (_a) {
56
56
  exports.setupFetch = setupFetch;
57
57
  function doFetchData(url_1) {
58
58
  return __awaiter(this, arguments, void 0, function (url, method, body) {
59
+ var headers;
59
60
  if (method === void 0) { method = 'GET'; }
60
61
  return __generator(this, function (_a) {
61
- if (!exports.fetchConfig.instanceToken && !exports.fetchConfig.instanceRbacDisabled) {
62
- return [2 /*return*/, new Response(JSON.stringify({}), {
63
- status: 401,
64
- statusText: 'Unauthorized',
65
- })];
62
+ headers = {
63
+ 'Content-Type': 'application/json',
64
+ };
65
+ if (exports.fetchConfig.instanceToken && !exports.fetchConfig.instanceRbacDisabled) {
66
+ headers['Authorization'] = "Bearer ".concat(exports.fetchConfig.instanceToken);
66
67
  }
67
68
  return [2 /*return*/, fetch("".concat(exports.fetchConfig.instance, "api/latest/").concat(url), {
68
69
  method: method,
69
- headers: {
70
- 'Content-Type': 'application/json',
71
- Authorization: exports.fetchConfig.instanceRbacDisabled
72
- ? undefined
73
- : "Bearer ".concat(exports.fetchConfig.instanceToken),
74
- },
70
+ headers: headers,
75
71
  body: JSON.stringify(body),
76
72
  }).catch(function (error) {
77
73
  return new Response(JSON.stringify({}), {
@@ -101,11 +97,6 @@ function query(_a) {
101
97
  case 0: return [4 /*yield*/, doFetchData(url, method, body)];
102
98
  case 1:
103
99
  response = _a.sent();
104
- if (response.status === 401 &&
105
- process.env.NODE_ENV !== 'test' &&
106
- process.env.NODE_ENV !== 'storybook') {
107
- window.location.href = exports.fetchConfig.unauthorizedRedirect(window.location.pathname);
108
- }
109
100
  clone = response.clone();
110
101
  _a.label = 2;
111
102
  case 2:
@@ -1 +1 @@
1
- {"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/utils/fetch.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/utils/fetch.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"websocket.d.ts","sourceRoot":"","sources":["../../src/utils/websocket.ts"],"names":[],"mappings":";AAIA,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;IAC9B,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,IAAI,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;IACpC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;IAC/B,cAAc,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;CAChC;AAED,qBAAa,wBAAwB;IACnC,OAAc,aAAa,EAAE,uBAAuB,CAMlD;IACF,OAAc,WAAW,EAAE,MAAM,CAC/B,MAAM,EACN;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC,OAAO,CAAA;KAAE,CACjE,CAAM;WAEO,QAAQ;WAOR,UAAU,CACtB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,iBAAiB,EAC9B,OAAO,EAAE,CAAC,EAAE,EAAE,KAAK,GAAG,YAAY,GAAG,UAAU,KAAK,IAAI;WAS5C,aAAa,CACzB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,iBAAiB,EAC9B,OAAO,EAAE,CAAC,EAAE,EAAE,KAAK,GAAG,YAAY,GAAG,UAAU,KAAK,IAAI;CAI3D;AAED,qBAAa,gBAAgB;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,MAAM,CAAK;IAC3B,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC;IAClC,OAAO,EAAE,uBAAuB,CAAC;IACxC,SAAgB,QAAQ,EAAE,MAAM,CAC9B,MAAM,EACN;QAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;QAAC,KAAK,EAAE,CAAC,EAAE,EAAE,KAAK,KAAK,IAAI,CAAA;KAAE,CAC9D,CAAM;IACA,MAAM,EAAE,SAAS,CAAC;gBAEb,MAAM,EAAE,uBAAuB;IASpC,UAAU,CACf,KAAK,EAAE,MAAM,iBAAiB,EAC9B,OAAO,EAAE,CAAC,EAAE,EAAE,KAAK,GAAG,YAAY,GAAG,UAAU,KAAK,IAAI;IAWnD,aAAa,CAAC,EAAE,EAAE,MAAM;IAY/B,OAAO,CAAC,YAAY;IAUb,OAAO;IAwDP,IAAI,CAAC,IAAI,EAAE,MAAM;IAIX,iBAAiB;YAchB,YAAY;IASnB,cAAc,CAAC,SAAS,EAAE,MAAM;IA4BhC,MAAM;IAcN,KAAK;IAIL,iBAAiB;IAMxB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,aAAa;CAMtB"}
1
+ {"version":3,"file":"websocket.d.ts","sourceRoot":"","sources":["../../src/utils/websocket.ts"],"names":[],"mappings":";AAIA,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;IAC9B,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,IAAI,CAAC;IACvC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;IACpC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;IAC/B,cAAc,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;CAChC;AAED,qBAAa,wBAAwB;IACnC,OAAc,aAAa,EAAE,uBAAuB,CAMlD;IACF,OAAc,WAAW,EAAE,MAAM,CAC/B,MAAM,EACN;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC,OAAO,CAAA;KAAE,CACjE,CAAM;WAEO,QAAQ;WAOR,UAAU,CACtB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,iBAAiB,EAC9B,OAAO,EAAE,CAAC,EAAE,EAAE,KAAK,GAAG,YAAY,GAAG,UAAU,KAAK,IAAI;WAS5C,aAAa,CACzB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,iBAAiB,EAC9B,OAAO,EAAE,CAAC,EAAE,EAAE,KAAK,GAAG,YAAY,GAAG,UAAU,KAAK,IAAI;CAI3D;AAED,qBAAa,gBAAgB;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,MAAM,CAAK;IAC3B,iBAAiB,EAAE,MAAM,CAAC,OAAO,CAAC;IAClC,OAAO,EAAE,uBAAuB,CAAC;IACxC,SAAgB,QAAQ,EAAE,MAAM,CAC9B,MAAM,EACN;QAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;QAAC,KAAK,EAAE,CAAC,EAAE,EAAE,KAAK,KAAK,IAAI,CAAA;KAAE,CAC9D,CAAM;IACA,MAAM,EAAE,SAAS,CAAC;gBAEb,MAAM,EAAE,uBAAuB;IASpC,UAAU,CACf,KAAK,EAAE,MAAM,iBAAiB,EAC9B,OAAO,EAAE,CAAC,EAAE,EAAE,KAAK,GAAG,YAAY,GAAG,UAAU,KAAK,IAAI;IAWnD,aAAa,CAAC,EAAE,EAAE,MAAM;IAY/B,OAAO,CAAC,YAAY;IAUb,OAAO;IAwDP,IAAI,CAAC,IAAI,EAAE,MAAM;IAIX,iBAAiB;YAKhB,YAAY;IASnB,cAAc,CAAC,SAAS,EAAE,MAAM;IA4BhC,MAAM;IAcN,KAAK;IAIL,iBAAiB;IAMxB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,aAAa;CAMtB"}
@@ -172,19 +172,14 @@ var ReqraftWebSocket = /** @class */ (function () {
172
172
  };
173
173
  ReqraftWebSocket.prototype.checkServerStatus = function () {
174
174
  return __awaiter(this, void 0, void 0, function () {
175
- var check;
176
175
  return __generator(this, function (_a) {
177
176
  switch (_a.label) {
178
- case 0: return [4 /*yield*/, (0, fetch_1.query)({ url: '/system/pid', cache: false })];
177
+ case 0:
178
+ // If this results in a 401, the server will redirect automatically
179
+ return [4 /*yield*/, (0, fetch_1.query)({ url: '/system/pid', cache: false })];
179
180
  case 1:
180
- check = _a.sent();
181
- if (check.code === 401 &&
182
- process.env.NODE_ENV !== 'test' &&
183
- process.env.NODE_ENV !== 'storybook') {
184
- // Qorus is back up again but we need to re-authenticate
185
- // Get the current pathname and redirect to the login page
186
- window.location.href = fetch_1.fetchConfig.unauthorizedRedirect(window.location.pathname);
187
- }
181
+ // If this results in a 401, the server will redirect automatically
182
+ _a.sent();
188
183
  return [2 /*return*/];
189
184
  }
190
185
  });
@@ -1 +1 @@
1
- {"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../src/utils/websocket.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../src/utils/websocket.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qoretechnologies/reqraft",
3
- "version": "0.7.5",
3
+ "version": "0.7.6",
4
4
  "description": "ReQraft is a collection of React components and hooks that are used across Qore Technologies' products made using the ReQore component library from Qore.",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -38,7 +38,7 @@ export const currentUserHasPermissions: Story = {
38
38
 
39
39
  return (
40
40
  <ReqoreP>
41
- {hasAnyPermission(['SERVER-CONTROL', 'RANDOM-PERM'])
41
+ {hasAnyPermission(['USER-CONTROL', 'RANDOM-PERM'])
42
42
  ? 'Yes, user has "SERVER-CONTROL" permission'
43
43
  : 'No'}
44
44
  </ReqoreP>
@@ -44,21 +44,19 @@ async function doFetchData(
44
44
  method = 'GET',
45
45
  body?: { [key: string]: any }
46
46
  ): Promise<Response> {
47
- if (!fetchConfig.instanceToken && !fetchConfig.instanceRbacDisabled) {
48
- return new Response(JSON.stringify({}), {
49
- status: 401,
50
- statusText: 'Unauthorized',
51
- });
47
+ // We do not check for token because Qorus now handles auth automatically via cookies
48
+ // token is only supplied in a dev environment
49
+ const headers = {
50
+ 'Content-Type': 'application/json',
51
+ };
52
+
53
+ if (fetchConfig.instanceToken && !fetchConfig.instanceRbacDisabled) {
54
+ headers['Authorization'] = `Bearer ${fetchConfig.instanceToken}`;
52
55
  }
53
56
 
54
57
  return fetch(`${fetchConfig.instance}api/latest/${url}`, {
55
58
  method,
56
- headers: {
57
- 'Content-Type': 'application/json',
58
- Authorization: fetchConfig.instanceRbacDisabled
59
- ? undefined
60
- : `Bearer ${fetchConfig.instanceToken}`,
61
- },
59
+ headers,
62
60
  body: JSON.stringify(body),
63
61
  }).catch((error) => {
64
62
  return new Response(JSON.stringify({}), {
@@ -91,14 +89,6 @@ export async function query<T>({
91
89
  queryFn: async () => {
92
90
  const response = await doFetchData(url, method, body);
93
91
 
94
- if (
95
- response.status === 401 &&
96
- process.env.NODE_ENV !== 'test' &&
97
- process.env.NODE_ENV !== 'storybook'
98
- ) {
99
- window.location.href = fetchConfig.unauthorizedRedirect(window.location.pathname);
100
- }
101
-
102
92
  const clone = response.clone();
103
93
  let data: any;
104
94
 
@@ -173,17 +173,8 @@ export class ReqraftWebSocket {
173
173
  }
174
174
 
175
175
  public async checkServerStatus() {
176
- const check = await query({ url: '/system/pid', cache: false });
177
-
178
- if (
179
- check.code === 401 &&
180
- process.env.NODE_ENV !== 'test' &&
181
- process.env.NODE_ENV !== 'storybook'
182
- ) {
183
- // Qorus is back up again but we need to re-authenticate
184
- // Get the current pathname and redirect to the login page
185
- window.location.href = fetchConfig.unauthorizedRedirect(window.location.pathname);
186
- }
176
+ // If this results in a 401, the server will redirect automatically
177
+ await query({ url: '/system/pid', cache: false });
187
178
  }
188
179
 
189
180
  private async tryReconnect() {