@instructure/quiz-core 18.5.1-rc.3 → 18.5.1-rc.5

package/es/common/util/Fetcher.js

@@ -1,5 +1,6 @@
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import { decamelizeKeys } from 'humps';
@@ -7,7 +8,7 @@ import queryString from 'query-string';
 import fetch from 'isomorphic-fetch';
 import t from '@instructure/quiz-i18n/es/format-message';
 import jsonify from "./jsonify.js";
-import { httpHeaders } from "./httpHeaders.js";
+import { httpHeaders, jwtHeader } from "./httpHeaders.js";
 import store from "../../reduxStore.js";
 import { callbacksCompleteForCall, errorCallFor, startCallFor, successCallFor } from "./callHelpers.js";
 import { addError, addSuccess } from "../actions/alerts.js";
@@ -33,7 +34,8 @@ export var Fetcher = /*#__PURE__*/function () {
         successMessage = _ref.successMessage,
         onError = _ref.onError,
         cloneResponseForError = _ref.cloneResponseForError,
-        asyncResponseHandler = _ref.asyncResponseHandler;
+        asyncResponseHandler = _ref.asyncResponseHandler,
+        injectMissingUserToken = _ref.injectMissingUserToken;
 
     _classCallCheck(this, Fetcher);
 
@@ -43,6 +45,7 @@ export var Fetcher = /*#__PURE__*/function () {
     this.cloneResponseForError = cloneResponseForError || false;
     this.callType = callType;
     this.headers = headers;
+    this.injectMissingUserToken = injectMissingUserToken || false;
     this.successMessage = successMessage;
     this.onError = onError;
     this.asyncResponseHandler = asyncResponseHandler || jsonify;
@@ -91,7 +94,16 @@ export var Fetcher = /*#__PURE__*/function () {
   }, {
     key: "callHeaders",
     value: function callHeaders() {
-      return this.headers || httpHeaders(this.getState().getIn(['config', 'userToken']));
+      if (!this.headers) {
+        return httpHeaders(this.getState().getIn(['config', 'userToken']));
+      }
+
+      if (!this.injectMissingUserToken) {
+        return this.headers;
+      }
+
+      var userToken = this.getState().getIn(['config', 'userToken']);
+      return _objectSpread(_objectSpread({}, jwtHeader(userToken)), this.headers);
     }
   }, {
     key: "handleSuccess",

package/es/reporting/api/getAnalysesExport.js

@@ -13,6 +13,7 @@ var getFetcher = function getFetcher(format) {
     headers: {
       'Accept': mimeType
     },
+    injectUserToken: true,
     asyncResponseHandler: function asyncResponseHandler(response) {
       return response;
     }

package/lib/common/util/Fetcher.js

@@ -11,6 +11,8 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -56,7 +58,8 @@ var Fetcher = /*#__PURE__*/function () {
         successMessage = _ref.successMessage,
         onError = _ref.onError,
         cloneResponseForError = _ref.cloneResponseForError,
-        asyncResponseHandler = _ref.asyncResponseHandler;
+        asyncResponseHandler = _ref.asyncResponseHandler,
+        injectMissingUserToken = _ref.injectMissingUserToken;
 
     (0, _classCallCheck2.default)(this, Fetcher);
     // A Response body can only be read once, and is read in the onError handler
@@ -65,6 +68,7 @@ var Fetcher = /*#__PURE__*/function () {
     this.cloneResponseForError = cloneResponseForError || false;
     this.callType = callType;
     this.headers = headers;
+    this.injectMissingUserToken = injectMissingUserToken || false;
     this.successMessage = successMessage;
     this.onError = onError;
     this.asyncResponseHandler = asyncResponseHandler || _jsonify.default;
@@ -113,7 +117,16 @@ var Fetcher = /*#__PURE__*/function () {
   }, {
     key: "callHeaders",
     value: function callHeaders() {
-      return this.headers || (0, _httpHeaders.httpHeaders)(this.getState().getIn(['config', 'userToken']));
+      if (!this.headers) {
+        return (0, _httpHeaders.httpHeaders)(this.getState().getIn(['config', 'userToken']));
+      }
+
+      if (!this.injectMissingUserToken) {
+        return this.headers;
+      }
+
+      var userToken = this.getState().getIn(['config', 'userToken']);
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _httpHeaders.jwtHeader)(userToken)), this.headers);
     }
   }, {
     key: "handleSuccess",

package/lib/reporting/api/getAnalysesExport.js

@@ -24,6 +24,7 @@ var getFetcher = function getFetcher(format) {
     headers: {
       'Accept': mimeType
     },
+    injectUserToken: true,
     asyncResponseHandler: function asyncResponseHandler(response) {
       return response;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "18.5.1-rc.3+b23d37cd6",
+  "version": "18.5.1-rc.5+1553b56ba",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -43,11 +43,11 @@
   "dependencies": {
     "@instructure/grading-utils": "^1.0.0",
     "@instructure/outcomes-ui": "^2.1.9",
-    "@instructure/quiz-common": "18.5.1-rc.3+b23d37cd6",
-    "@instructure/quiz-i18n": "18.5.1-rc.3+b23d37cd6",
-    "@instructure/quiz-interactions": "18.5.1-rc.3+b23d37cd6",
-    "@instructure/quiz-number-input": "18.5.1-rc.3+b23d37cd6",
-    "@instructure/quiz-rce": "18.5.1-rc.3+b23d37cd6",
+    "@instructure/quiz-common": "18.5.1-rc.5+1553b56ba",
+    "@instructure/quiz-i18n": "18.5.1-rc.5+1553b56ba",
+    "@instructure/quiz-interactions": "18.5.1-rc.5+1553b56ba",
+    "@instructure/quiz-number-input": "18.5.1-rc.5+1553b56ba",
+    "@instructure/quiz-rce": "18.5.1-rc.5+1553b56ba",
     "@instructure/ui-a11y-content": "^7.22.1",
     "@instructure/ui-alerts": "^7.22.1",
     "@instructure/ui-avatar": "^7.22.1",
@@ -108,7 +108,7 @@
     "eventemitter3": "^3.1.0",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "18.5.1-rc.3+b23d37cd6",
+    "instructure-validations": "18.5.1-rc.5+1553b56ba",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -159,7 +159,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "18.5.1-rc.3+b23d37cd6",
+    "quiz-presets": "18.5.1-rc.5+1553b56ba",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -175,5 +175,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b23d37cd626992f7db90c3453d1556df7b2b4cfb"
+  "gitHead": "1553b56ba37bfd69bb798c66ec34b3cd601ad8a3"
 }