@instructure/quiz-core 17.39.1-rc.3 → 17.39.1-rc.4

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,62 +1,154 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
2
+ import _regeneratorRuntime from "@babel/runtime/regenerator";
3
+ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
2
4
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
3
- import React, { useState } from 'react';
5
+ import React, { useEffect, useState } from 'react';
4
6
  import PropTypes from 'prop-types';
5
7
  import { connect } from "../../common/react-redux.js";
6
8
  import store from "../../reduxStore.js";
7
9
  import isNewRCEEnabled from "./rceChecker.js";
10
+ import { QuizzesSpinner as Spinner } from "../components/shared/spinner/Spinner.js";
8
11
  import { RceConfigContext, RceConfigKeys } from '@instructure/quiz-common';
9
12
  import { addError } from "../actions/alerts.js";
10
13
 
14
+ var _ref4 = /*#__PURE__*/React.createElement(Spinner, null);
15
+
11
16
  var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
12
17
  var _useState = useState(props.rcsJwt),
13
18
  _useState2 = _slicedToArray(_useState, 2),
14
19
  jwt = _useState2[0],
15
20
  setJwt = _useState2[1];
16
21
 
17
- var isNewRceEnabled = function isNewRceEnabled() {
18
- return props.useNewRce;
19
- };
22
+ var _useState3 = useState(null),
23
+ _useState4 = _slicedToArray(_useState3, 2),
24
+ canvasConfig = _useState4[0],
25
+ setCanvasConfig = _useState4[1];
26
+
27
+ var _useState5 = useState(true),
28
+ _useState6 = _slicedToArray(_useState5, 2),
29
+ canvasConfigLoading = _useState6[0],
30
+ setCanvasConfigLoading = _useState6[1];
20
31
 
21
32
  var hasAllPropsForRcs = function hasAllPropsForRcs() {
22
33
  return !!(props.contextId && props.contextType && props.canvasUserId && props.rcsHost && props.rcsJwtRefreshFn && props.rcsJwt);
23
34
  };
24
35
 
25
- var getToken = function getToken() {
26
- if (!hasAllPropsForRcs()) return;
27
- return new Promise(function (resolve, reject) {
28
- props.rcsJwtRefreshFn().then(function (response) {
29
- var token = response.token;
30
- setJwt(token);
31
- resolve(response);
32
- }, function () {
33
- reject();
34
- });
35
- });
36
- };
36
+ var refreshToken = /*#__PURE__*/function () {
37
+ var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(setTokenFn) {
38
+ var response;
39
+ return _regeneratorRuntime.wrap(function _callee$(_context) {
40
+ while (1) {
41
+ switch (_context.prev = _context.next) {
42
+ case 0:
43
+ if (hasAllPropsForRcs()) {
44
+ _context.next = 3;
45
+ break;
46
+ }
37
47
 
38
- var refreshToken = function refreshToken(setTokenFn) {
39
- return getToken().then(function (response) {
40
- var token = response.token;
41
- setTokenFn(token);
42
- });
43
- };
48
+ handleErrorFunc('Invalid RCS configuration');
49
+ return _context.abrupt("return");
50
+
51
+ case 3:
52
+ _context.next = 5;
53
+ return props.rcsJwtRefreshFn();
54
+
55
+ case 5:
56
+ response = _context.sent;
57
+
58
+ if (!(!response || !response.token)) {
59
+ _context.next = 9;
60
+ break;
61
+ }
62
+
63
+ handleErrorFunc('Unable to refresh RCS token');
64
+ return _context.abrupt("return");
65
+
66
+ case 9:
67
+ setJwt(response.token);
68
+ setTokenFn(response.token);
69
+
70
+ case 11:
71
+ case "end":
72
+ return _context.stop();
73
+ }
74
+ }
75
+ }, _callee);
76
+ }));
77
+
78
+ return function refreshToken(_x) {
79
+ return _ref.apply(this, arguments);
80
+ };
81
+ }();
44
82
 
45
83
  var handleErrorFunc = function handleErrorFunc(errorMessage) {
46
84
  store.dispatch(addError(errorMessage));
47
85
  };
48
86
 
49
87
  var getConfig = function getConfig() {
50
- var _ref, _rendererEnhancement;
88
+ var _ref2, _rendererEnhancement;
51
89
 
52
90
  return {
53
- rcs: hasAllPropsForRcs() ? (_ref = {}, _defineProperty(_ref, RceConfigKeys.useNewRce, props.useNewRce), _defineProperty(_ref, RceConfigKeys.canvasUserId, props.canvasUserId), _defineProperty(_ref, RceConfigKeys.contextId, props.contextId), _defineProperty(_ref, RceConfigKeys.contextType, props.contextType), _defineProperty(_ref, RceConfigKeys.rcsHost, props.rcsHost), _defineProperty(_ref, RceConfigKeys.rcsJwt, jwt), _defineProperty(_ref, RceConfigKeys.rcsJwtRefreshFn, refreshToken), _ref) : null,
91
+ rcs: hasAllPropsForRcs() && canvasConfig ? (_ref2 = {}, _defineProperty(_ref2, RceConfigKeys.useNewRce, props.useNewRce), _defineProperty(_ref2, RceConfigKeys.canvasUserId, props.canvasUserId), _defineProperty(_ref2, RceConfigKeys.contextId, props.contextId), _defineProperty(_ref2, RceConfigKeys.contextType, props.contextType), _defineProperty(_ref2, RceConfigKeys.rcsHost, props.rcsHost), _defineProperty(_ref2, RceConfigKeys.rcsJwt, jwt), _defineProperty(_ref2, RceConfigKeys.rcsJwtRefreshFn, refreshToken), _defineProperty(_ref2, RceConfigKeys.canvasConfig, canvasConfig), _ref2) : null,
54
92
  rendererEnhancement: (_rendererEnhancement = {}, _defineProperty(_rendererEnhancement, RceConfigKeys.handleError, handleErrorFunc), _defineProperty(_rendererEnhancement, RceConfigKeys.documentServiceHost, props.documentServiceHost), _rendererEnhancement)
55
93
  };
56
94
  };
57
95
 
58
- if (!isNewRceEnabled()) return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
59
- return /*#__PURE__*/React.createElement(RceConfigContext.Provider, {
96
+ useEffect(function () {
97
+ _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
98
+ var endpoint, response, json;
99
+ return _regeneratorRuntime.wrap(function _callee2$(_context2) {
100
+ while (1) {
101
+ switch (_context2.prev = _context2.next) {
102
+ case 0:
103
+ _context2.prev = 0;
104
+
105
+ if (!(!props.useNewRce || !hasAllPropsForRcs())) {
106
+ _context2.next = 3;
107
+ break;
108
+ }
109
+
110
+ return _context2.abrupt("return");
111
+
112
+ case 3:
113
+ endpoint = "".concat(props.rcsHost, "/api/rceConfig?contextType=").concat(props.contextType, "&contextId=").concat(props.contextId);
114
+ _context2.next = 6;
115
+ return fetch(endpoint, {
116
+ headers: {
117
+ 'Authorization': "Bearer ".concat(props.rcsJwt)
118
+ }
119
+ });
120
+
121
+ case 6:
122
+ response = _context2.sent;
123
+ _context2.next = 9;
124
+ return response.json();
125
+
126
+ case 9:
127
+ json = _context2.sent;
128
+ setCanvasConfig(json);
129
+ _context2.next = 16;
130
+ break;
131
+
132
+ case 13:
133
+ _context2.prev = 13;
134
+ _context2.t0 = _context2["catch"](0);
135
+ setCanvasConfig(null);
136
+
137
+ case 16:
138
+ _context2.prev = 16;
139
+ setCanvasConfigLoading(false);
140
+ return _context2.finish(16);
141
+
142
+ case 19:
143
+ case "end":
144
+ return _context2.stop();
145
+ }
146
+ }
147
+ }, _callee2, null, [[0, 13, 16, 19]]);
148
+ }))();
149
+ }, [props.useNewRce]);
150
+ if (!props.useNewRce) return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
151
+ return canvasConfigLoading ? _ref4 : /*#__PURE__*/React.createElement(RceConfigContext.Provider, {
60
152
  value: getConfig()
61
153
  }, props.children);
62
154
  };
@@ -11,6 +11,10 @@ exports.RceConfigProvider = void 0;
11
11
 
12
12
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
13
13
 
14
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
15
+
16
+ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
17
+
14
18
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
15
19
 
16
20
  var _react = _interopRequireWildcard(require("react"));
@@ -23,59 +27,150 @@ var _reduxStore = _interopRequireDefault(require("../../reduxStore.js"));
23
27
 
24
28
  var _rceChecker = _interopRequireDefault(require("./rceChecker.js"));
25
29
 
30
+ var _Spinner = require("../components/shared/spinner/Spinner.js");
31
+
26
32
  var _quizCommon = require("@instructure/quiz-common");
27
33
 
28
34
  var _alerts = require("../actions/alerts.js");
29
35
 
36
+ var _ref4 = /*#__PURE__*/_react.default.createElement(_Spinner.QuizzesSpinner, null);
37
+
30
38
  var RceConfigProviderComponent = function RceConfigProviderComponent(props) {
31
39
  var _useState = (0, _react.useState)(props.rcsJwt),
32
40
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
33
41
  jwt = _useState2[0],
34
42
  setJwt = _useState2[1];
35
43
 
36
- var isNewRceEnabled = function isNewRceEnabled() {
37
- return props.useNewRce;
38
- };
44
+ var _useState3 = (0, _react.useState)(null),
45
+ _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
46
+ canvasConfig = _useState4[0],
47
+ setCanvasConfig = _useState4[1];
48
+
49
+ var _useState5 = (0, _react.useState)(true),
50
+ _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
51
+ canvasConfigLoading = _useState6[0],
52
+ setCanvasConfigLoading = _useState6[1];
39
53
 
40
54
  var hasAllPropsForRcs = function hasAllPropsForRcs() {
41
55
  return !!(props.contextId && props.contextType && props.canvasUserId && props.rcsHost && props.rcsJwtRefreshFn && props.rcsJwt);
42
56
  };
43
57
 
44
- var getToken = function getToken() {
45
- if (!hasAllPropsForRcs()) return;
46
- return new Promise(function (resolve, reject) {
47
- props.rcsJwtRefreshFn().then(function (response) {
48
- var token = response.token;
49
- setJwt(token);
50
- resolve(response);
51
- }, function () {
52
- reject();
53
- });
54
- });
55
- };
56
-
57
- var refreshToken = function refreshToken(setTokenFn) {
58
- return getToken().then(function (response) {
59
- var token = response.token;
60
- setTokenFn(token);
61
- });
62
- };
58
+ var refreshToken = /*#__PURE__*/function () {
59
+ var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(setTokenFn) {
60
+ var response;
61
+ return _regenerator.default.wrap(function _callee$(_context) {
62
+ while (1) {
63
+ switch (_context.prev = _context.next) {
64
+ case 0:
65
+ if (hasAllPropsForRcs()) {
66
+ _context.next = 3;
67
+ break;
68
+ }
69
+
70
+ handleErrorFunc('Invalid RCS configuration');
71
+ return _context.abrupt("return");
72
+
73
+ case 3:
74
+ _context.next = 5;
75
+ return props.rcsJwtRefreshFn();
76
+
77
+ case 5:
78
+ response = _context.sent;
79
+
80
+ if (!(!response || !response.token)) {
81
+ _context.next = 9;
82
+ break;
83
+ }
84
+
85
+ handleErrorFunc('Unable to refresh RCS token');
86
+ return _context.abrupt("return");
87
+
88
+ case 9:
89
+ setJwt(response.token);
90
+ setTokenFn(response.token);
91
+
92
+ case 11:
93
+ case "end":
94
+ return _context.stop();
95
+ }
96
+ }
97
+ }, _callee);
98
+ }));
99
+
100
+ return function refreshToken(_x) {
101
+ return _ref.apply(this, arguments);
102
+ };
103
+ }();
63
104
 
64
105
  var handleErrorFunc = function handleErrorFunc(errorMessage) {
65
106
  _reduxStore.default.dispatch((0, _alerts.addError)(errorMessage));
66
107
  };
67
108
 
68
109
  var getConfig = function getConfig() {
69
- var _ref, _rendererEnhancement;
110
+ var _ref2, _rendererEnhancement;
70
111
 
71
112
  return {
72
- rcs: hasAllPropsForRcs() ? (_ref = {}, (0, _defineProperty2.default)(_ref, _quizCommon.RceConfigKeys.useNewRce, props.useNewRce), (0, _defineProperty2.default)(_ref, _quizCommon.RceConfigKeys.canvasUserId, props.canvasUserId), (0, _defineProperty2.default)(_ref, _quizCommon.RceConfigKeys.contextId, props.contextId), (0, _defineProperty2.default)(_ref, _quizCommon.RceConfigKeys.contextType, props.contextType), (0, _defineProperty2.default)(_ref, _quizCommon.RceConfigKeys.rcsHost, props.rcsHost), (0, _defineProperty2.default)(_ref, _quizCommon.RceConfigKeys.rcsJwt, jwt), (0, _defineProperty2.default)(_ref, _quizCommon.RceConfigKeys.rcsJwtRefreshFn, refreshToken), _ref) : null,
113
+ rcs: hasAllPropsForRcs() && canvasConfig ? (_ref2 = {}, (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.useNewRce, props.useNewRce), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.canvasUserId, props.canvasUserId), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.contextId, props.contextId), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.contextType, props.contextType), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsHost, props.rcsHost), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsJwt, jwt), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.rcsJwtRefreshFn, refreshToken), (0, _defineProperty2.default)(_ref2, _quizCommon.RceConfigKeys.canvasConfig, canvasConfig), _ref2) : null,
73
114
  rendererEnhancement: (_rendererEnhancement = {}, (0, _defineProperty2.default)(_rendererEnhancement, _quizCommon.RceConfigKeys.handleError, handleErrorFunc), (0, _defineProperty2.default)(_rendererEnhancement, _quizCommon.RceConfigKeys.documentServiceHost, props.documentServiceHost), _rendererEnhancement)
74
115
  };
75
116
  };
76
117
 
77
- if (!isNewRceEnabled()) return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.children);
78
- return /*#__PURE__*/_react.default.createElement(_quizCommon.RceConfigContext.Provider, {
118
+ (0, _react.useEffect)(function () {
119
+ (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
120
+ var endpoint, response, json;
121
+ return _regenerator.default.wrap(function _callee2$(_context2) {
122
+ while (1) {
123
+ switch (_context2.prev = _context2.next) {
124
+ case 0:
125
+ _context2.prev = 0;
126
+
127
+ if (!(!props.useNewRce || !hasAllPropsForRcs())) {
128
+ _context2.next = 3;
129
+ break;
130
+ }
131
+
132
+ return _context2.abrupt("return");
133
+
134
+ case 3:
135
+ endpoint = "".concat(props.rcsHost, "/api/rceConfig?contextType=").concat(props.contextType, "&contextId=").concat(props.contextId);
136
+ _context2.next = 6;
137
+ return fetch(endpoint, {
138
+ headers: {
139
+ 'Authorization': "Bearer ".concat(props.rcsJwt)
140
+ }
141
+ });
142
+
143
+ case 6:
144
+ response = _context2.sent;
145
+ _context2.next = 9;
146
+ return response.json();
147
+
148
+ case 9:
149
+ json = _context2.sent;
150
+ setCanvasConfig(json);
151
+ _context2.next = 16;
152
+ break;
153
+
154
+ case 13:
155
+ _context2.prev = 13;
156
+ _context2.t0 = _context2["catch"](0);
157
+ setCanvasConfig(null);
158
+
159
+ case 16:
160
+ _context2.prev = 16;
161
+ setCanvasConfigLoading(false);
162
+ return _context2.finish(16);
163
+
164
+ case 19:
165
+ case "end":
166
+ return _context2.stop();
167
+ }
168
+ }
169
+ }, _callee2, null, [[0, 13, 16, 19]]);
170
+ }))();
171
+ }, [props.useNewRce]);
172
+ if (!props.useNewRce) return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.children);
173
+ return canvasConfigLoading ? _ref4 : /*#__PURE__*/_react.default.createElement(_quizCommon.RceConfigContext.Provider, {
79
174
  value: getConfig()
80
175
  }, props.children);
81
176
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@instructure/quiz-core",
3
- "version": "17.39.1-rc.3+35d2b917b",
3
+ "version": "17.39.1-rc.4+0fcf6d785",
4
4
  "license": "MIT",
5
5
  "description": "The Quiz React SDK by Instructure Inc.",
6
6
  "author": "Instructure, Inc. Engineering and Product Design",
@@ -41,11 +41,11 @@
41
41
  ],
42
42
  "dependencies": {
43
43
  "@instructure/outcomes-ui": "^2.1.2",
44
- "@instructure/quiz-common": "17.39.1-rc.3+35d2b917b",
45
- "@instructure/quiz-i18n": "17.39.1-rc.3+35d2b917b",
46
- "@instructure/quiz-interactions": "17.39.1-rc.3+35d2b917b",
47
- "@instructure/quiz-number-input": "17.39.1-rc.3+35d2b917b",
48
- "@instructure/quiz-rce": "17.39.1-rc.3+35d2b917b",
44
+ "@instructure/quiz-common": "17.39.1-rc.4+0fcf6d785",
45
+ "@instructure/quiz-i18n": "17.39.1-rc.4+0fcf6d785",
46
+ "@instructure/quiz-interactions": "17.39.1-rc.4+0fcf6d785",
47
+ "@instructure/quiz-number-input": "17.39.1-rc.4+0fcf6d785",
48
+ "@instructure/quiz-rce": "17.39.1-rc.4+0fcf6d785",
49
49
  "@instructure/ui-a11y-content": "^7.20.0",
50
50
  "@instructure/ui-alerts": "^7.20.0",
51
51
  "@instructure/ui-avatar": "^7.20.0",
@@ -106,7 +106,7 @@
106
106
  "eventemitter3": "^3.1.0",
107
107
  "humps": "^2.0.0",
108
108
  "immutable": "^3.8.1",
109
- "instructure-validations": "17.39.1-rc.3+35d2b917b",
109
+ "instructure-validations": "17.39.1-rc.4+0fcf6d785",
110
110
  "ipaddr.js": "^1.5.4",
111
111
  "isomorphic-fetch": "^2.2.0",
112
112
  "isuuid": "^0.1.0",
@@ -137,7 +137,7 @@
137
137
  "uuid": "^3.2.1"
138
138
  },
139
139
  "devDependencies": {
140
- "@instructure/quiz-scripts": "17.39.1-rc.3+35d2b917b",
140
+ "@instructure/quiz-scripts": "17.39.1-rc.4+0fcf6d785",
141
141
  "@instructure/ui-axe-check": "^7.20.0",
142
142
  "@instructure/ui-babel-preset": "^7.20.0",
143
143
  "@instructure/ui-karma-config": "^7.20.0",
@@ -156,7 +156,7 @@
156
156
  "intl": "^1.2.4",
157
157
  "jquery": "^2.2.3",
158
158
  "most-subject": "^5.3.0",
159
- "quiz-presets": "17.39.1-rc.3+35d2b917b",
159
+ "quiz-presets": "17.39.1-rc.4+0fcf6d785",
160
160
  "react": "^16.8.6",
161
161
  "react-addons-test-utils": "^15.6.2",
162
162
  "react-dom": "^16.8.6",
@@ -172,5 +172,5 @@
172
172
  "publishConfig": {
173
173
  "access": "public"
174
174
  },
175
- "gitHead": "35d2b917bfd629857343c9a4e352061ae5e6032f"
175
+ "gitHead": "0fcf6d78526fac440dc41d5dbe7e34588669d91f"
176
176
  }