@instructure/canvas-rce 5.8.0 → 5.9.0

package/CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 5.9.0 - 2023-08-30
+
+### Fixed
+- An issue where LTI postMessages were not working inside active RCE
+
+### Changed
+- Encrypt auto-saved RCE content
+- Remove dependency on `@instructure/filter-console-messages`
+
 ## 5.8.0 - 2023-08-15
 
 ### Fixed

package/es/rce/RCEWrapper.js

@@ -2373,6 +2373,7 @@ import { rceWrapperPropTypes } from './RCEWrapperProps';
 import { insertPlaceholder, placeholderInfoFor, removePlaceholder } from '../util/loadingPlaceholder';
 import { transformRceContentForEditing } from './transformContent';
 import { IconMoreSolid } from '@instructure/ui-icons/es/svg';
+import EncryptedStorage from '../util/encrypted-storage';
 import buildStyle from './style';
 const RestoreAutoSaveModal = /*#__PURE__*/React.lazy(() => import('./RestoreAutoSaveModal'));
 const RceHtmlEditor = /*#__PURE__*/React.lazy(() => import('./RceHtmlEditor'));
@@ -2713,9 +2714,48 @@ class RCEWrapper extends React.Component {
 
       this.checkAccessibility();
       this.fixToolbarKeyboardNavigation();
+      this.forwardPostMessages();
       (_this$props$onInitted = (_this$props = this.props).onInitted) === null || _this$props$onInitted === void 0 ? void 0 : _this$props$onInitted.call(_this$props, editor);
     };
 
+    this.forwardPostMessages = () => {
+      const windowReferences = {};
+      const rceWindow = this.editor.getWin(); // explicitly assign name for reference by parent window
+
+      rceWindow.name = `${RCEWrapper.editorFrameName}_${this.id}`;
+      rceWindow.addEventListener('message', this.forwardPostMessagesHandler(rceWindow, windowReferences));
+    };
+
+    this.forwardPostMessagesHandler = (rceWindow, windowReferences) => e => {
+      let message;
+
+      try {
+        message = typeof e.data === 'string' ? JSON.parse(e.data) : e.data;
+      } catch (err) {
+        // unparseable message may not be meant for our handlers
+        return false;
+      }
+
+      if (e.origin === rceWindow.origin) {
+        // message is from Canvas window, forward to tool
+        const targetOrigin = message.toolOrigin;
+
+        if (!targetOrigin) {
+          return false;
+        }
+
+        const targetWindow = windowReferences[targetOrigin];
+        delete message.toolOrigin;
+        targetWindow === null || targetWindow === void 0 ? void 0 : targetWindow.postMessage(message, targetOrigin);
+      } else {
+        // message is from tool, forward to Canvas window
+        windowReferences[e.origin] = e.source;
+        message.toolOrigin = e.origin;
+        message.frameName = rceWindow.name;
+        rceWindow.parent.postMessage(message, rceWindow.origin);
+      }
+    };
+
     this.fixToolbarKeyboardNavigation = () => {
       var _this$_elementRef$cur2;
 
@@ -2787,7 +2827,9 @@ class RCEWrapper extends React.Component {
     this.announcing = 0;
 
     this.initAutoSave = editor => {
-      this.storage = window.localStorage;
+      var _this$props$userCache;
+
+      this.storage = new EncryptedStorage((_this$props$userCache = this.props.userCacheKey) !== null && _this$props$userCache !== void 0 ? _this$props$userCache : '');
 
       if (this.storage) {
         editor.on('change Undo Redo', this.doAutoSave);
@@ -2875,10 +2917,7 @@ class RCEWrapper extends React.Component {
         });
 
         try {
-          _this.storage.setItem(_this.autoSaveKey, JSON.stringify({
-            autosaveTimestamp: Date.now(),
-            content
-          }));
+          _this.storage.setItem(_this.autoSaveKey, content);
         } catch (ex) {
           if (!retry) {
             // probably failed because there's not enough space
@@ -3733,7 +3772,7 @@ class RCEWrapper extends React.Component {
     let autosaved = null;
 
     try {
-      autosaved = this.storage && JSON.parse(this.storage.getItem(key));
+      autosaved = this.storage && this.storage.getItem(key);
     } catch (_ex) {
       this.storage.removeItem(this.autoSaveKey);
     }
@@ -4199,6 +4238,7 @@ RCEWrapper.defaultProps = {
   canvasOrigin: ''
 };
 RCEWrapper.skinCssInjected = false;
+RCEWrapper.editorFrameName = 'active_rce_frame';
 
 function mergeMenuItems(standard, custom) {
   var _custom$trim;

package/es/rce/RCEWrapperProps.js

@@ -125,5 +125,6 @@ export const rceWrapperPropTypes = {
   features: PropTypes.objectOf(PropTypes.bool),
   flashAlertTimeout: PropTypes.number,
   timezone: PropTypes.string,
+  userCacheKey: PropTypes.string,
   externalToolsConfig: externalToolsConfigPropType
 };

package/es/rce/__mocks__/_mockCryptoEs.js

@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2023 - present Instructure, Inc.
+ *
+ * This file is part of Canvas.
+ *
+ * Canvas is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License as published by the Free
+ * Software Foundation, version 3 of the License.
+ *
+ * Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Affero General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+export default {
+  lib: {
+    Base: {},
+    WordArray: {},
+    BufferedBlockAlgorithm: {},
+    Hasher: {},
+    Cipher: {},
+    StreamCipher: {},
+    BlockCipherMode: {},
+    BlockCipher: {},
+    CipherParams: {},
+    SerializableCipher: {},
+    PasswordBasedCipher: {}
+  },
+  x64: {
+    Word: {},
+    WordArray: {}
+  },
+  enc: {
+    Hex: {},
+    Latin1: {},
+    Utf8: {
+      parse: () => {}
+    },
+    Utf16: {},
+    Utf16BE: {},
+    Utf16LE: {},
+    Base64: {},
+    Base64url: {}
+  },
+  algo: {
+    HMAC: {},
+    MD5: {},
+    SHA1: {},
+    SHA224: {},
+    SHA256: {},
+    SHA384: {},
+    SHA512: {},
+    SHA3: {},
+    RIPEMD160: {},
+    PBKDF2: {},
+    EvpKDF: {},
+    AES: {},
+    DES: {},
+    TripleDES: {},
+    Rabbit: {},
+    RabbitLegacy: {},
+    RC4: {},
+    RC4Drop: {},
+    Blowfish: {}
+  },
+  mode: {
+    CBC: {},
+    CFB: {},
+    CTR: {},
+    CTRGladman: {},
+    ECB: {},
+    OFB: {}
+  },
+  pad: {
+    Pkcs7: {},
+    AnsiX923: {},
+    Iso10126: {},
+    Iso97971: {},
+    NoPadding: {},
+    ZeroPadding: {}
+  },
+  format: {
+    OpenSSL: {},
+    Hex: {}
+  },
+  kdf: {
+    OpenSSL: {}
+  },
+  MD5: {},
+  HmacMD5: {},
+  SHA1: {},
+  HmacSHA1: {},
+  SHA224: {},
+  HmacSHA224: {},
+  SHA256: {},
+  HmacSHA256: {},
+  SHA384: {},
+  HmacSHA384: {},
+  SHA512: {},
+  HmacSHA512: {},
+  SHA3: {},
+  HmacSHA3: {},
+  RIPEMD160: {},
+  HmacRIPEMD160: {},
+  PBKDF2: {},
+  EvpKDF: {},
+  AES: {},
+  DES: {},
+  TripleDES: {},
+  Rabbit: {},
+  RabbitLegacy: {},
+  RC4: {
+    encrypt: () => {},
+    decrypt: () => {}
+  },
+  RC4Drop: {
+    encrypt: () => {},
+    decrypt: () => {}
+  },
+  Blowfish: {}
+};

package/es/translations/locales/da-x-k12.js

@@ -45,6 +45,9 @@ const locale = {
   "add_image_60b2de07": {
     "message": "Tilføj billede"
   },
+  "add_one_9e34a6f8": {
+    "message": "Tilføj en!"
+  },
   "additional_considerations_f3801683": {
     "message": "Yderligere overvejelser"
   },
@@ -1323,9 +1326,27 @@ const locale = {
   "no_accessibility_issues_were_detected_f8d3c875": {
     "message": "Der blev ikke fundet nogen tilgængelighedsproblemer."
   },
+  "no_announcements_created_yet_c44a94f4": {
+    "message": "Der er ikke oprettet beskeder endnu."
+  },
+  "no_announcements_found_20185afc": {
+    "message": "Ingen beskeder fundet."
+  },
+  "no_assignments_created_yet_1b236d87": {
+    "message": "Der er ikke oprettet opgaver endnu."
+  },
+  "no_assignments_found_79e46d7f": {
+    "message": "Ingen opgaver fundet."
+  },
   "no_changes_to_save_d29f6e91": {
     "message": "Ingen ændringer at gemme."
   },
+  "no_discussions_created_yet_ff99abe3": {
+    "message": "Der er ikke oprettet diskussioner endnu."
+  },
+  "no_discussions_found_9284063b": {
+    "message": "Ingen diskussioner fundet."
+  },
   "no_e16d9132": {
     "message": "Nej"
   },
@@ -1335,9 +1356,27 @@ const locale = {
   "no_headers_9bc7dc7f": {
     "message": "Ingen overskrifter"
   },
+  "no_modules_created_yet_c71b6d4d": {
+    "message": "Der er ikke oprettet forløb endnu."
+  },
+  "no_modules_found_2df43a40": {
+    "message": "Ingen forløb fundet."
+  },
+  "no_pages_created_yet_c379fa6e": {
+    "message": "Der er ikke oprettet sider endnu."
+  },
+  "no_pages_found_6799350": {
+    "message": "Ingen sider fundet."
+  },
   "no_preview_is_available_for_this_file_f940114a": {
     "message": "Der findes ikke forhåndsvisning for denne fil."
   },
+  "no_quizzes_created_yet_1a2370b9": {
+    "message": "Der er ikke oprettet nogen quizzer endnu."
+  },
+  "no_quizzes_found_c80c537a": {
+    "message": "Der er ikke fundet nogen quizzer."
+  },
   "no_results_940393cf": {
     "message": "Ingen resultater."
   },

package/es/translations/locales/fi.js

@@ -45,6 +45,9 @@ const locale = {
   "add_image_60b2de07": {
     "message": "Lisää kuva"
   },
+  "add_one_9e34a6f8": {
+    "message": "Lisää yksi!"
+  },
   "additional_considerations_f3801683": {
     "message": "Muuta huomioon otettavaa"
   },
@@ -1323,9 +1326,27 @@ const locale = {
   "no_accessibility_issues_were_detected_f8d3c875": {
     "message": "Ei havaittu käytettävyysongelmia."
   },
+  "no_announcements_created_yet_c44a94f4": {
+    "message": "Ilmoituksia ei ole vielä luotu."
+  },
+  "no_announcements_found_20185afc": {
+    "message": "Ilmoituksia ei löytynyt."
+  },
+  "no_assignments_created_yet_1b236d87": {
+    "message": "Tehtäviä ei ole vielä luotu."
+  },
+  "no_assignments_found_79e46d7f": {
+    "message": "Tehtäviä ei löytynyt."
+  },
   "no_changes_to_save_d29f6e91": {
     "message": "Ei tallennettavia muutoksia."
   },
+  "no_discussions_created_yet_ff99abe3": {
+    "message": "Keskusteluja ei ole vielä luotu."
+  },
+  "no_discussions_found_9284063b": {
+    "message": "Keskusteluja ei löytynyt."
+  },
   "no_e16d9132": {
     "message": "Ei"
   },
@@ -1335,9 +1356,27 @@ const locale = {
   "no_headers_9bc7dc7f": {
     "message": "Ei otsikoita"
   },
+  "no_modules_created_yet_c71b6d4d": {
+    "message": "Moduuleja ei ole vielä luotu."
+  },
+  "no_modules_found_2df43a40": {
+    "message": "Moduuleja ei löytynyt."
+  },
+  "no_pages_created_yet_c379fa6e": {
+    "message": "Sivuja ei ole vielä luotu"
+  },
+  "no_pages_found_6799350": {
+    "message": "Sivuja ei löytynyt."
+  },
   "no_preview_is_available_for_this_file_f940114a": {
     "message": "Tälle tiedostolle ei ole saatavissa esikatselua."
   },
+  "no_quizzes_created_yet_1a2370b9": {
+    "message": "Testejä ei ole vielä luotu."
+  },
+  "no_quizzes_found_c80c537a": {
+    "message": "Testejä ei löytynyt."
+  },
   "no_results_940393cf": {
     "message": "Ei tuloksia."
   },

package/es/translations/locales/nb-x-k12.js

@@ -45,6 +45,9 @@ const locale = {
   "add_image_60b2de07": {
     "message": "Legg til bilde"
   },
+  "add_one_9e34a6f8": {
+    "message": "Legg til en!"
+  },
   "additional_considerations_f3801683": {
     "message": "Ekstra hensyn"
   },
@@ -1323,9 +1326,27 @@ const locale = {
   "no_accessibility_issues_were_detected_f8d3c875": {
     "message": "Ingen tiljengelighetsproblemer ble oppdaget."
   },
+  "no_announcements_created_yet_c44a94f4": {
+    "message": "Ingen beskjeder opprettet ennå."
+  },
+  "no_announcements_found_20185afc": {
+    "message": "Ingen beskjeder funnet."
+  },
+  "no_assignments_created_yet_1b236d87": {
+    "message": "Ingen oppgave opprettet ennå."
+  },
+  "no_assignments_found_79e46d7f": {
+    "message": "Ingen oppgaver funnet."
+  },
   "no_changes_to_save_d29f6e91": {
     "message": "Ingen endringer å lagre."
   },
+  "no_discussions_created_yet_ff99abe3": {
+    "message": "Ingen diskusjoner opprettet ennå."
+  },
+  "no_discussions_found_9284063b": {
+    "message": "Ingen diskusjoner funnet."
+  },
   "no_e16d9132": {
     "message": "Nei"
   },
@@ -1335,9 +1356,27 @@ const locale = {
   "no_headers_9bc7dc7f": {
     "message": "Ingen titler"
   },
+  "no_modules_created_yet_c71b6d4d": {
+    "message": "Ingen moduler opprettet ennå."
+  },
+  "no_modules_found_2df43a40": {
+    "message": "Ingen moduler funnet."
+  },
+  "no_pages_created_yet_c379fa6e": {
+    "message": "Ingen sider opprettet ennå."
+  },
+  "no_pages_found_6799350": {
+    "message": "Ingen sider funnet."
+  },
   "no_preview_is_available_for_this_file_f940114a": {
     "message": "Ingen forhåndsvisning er tilgjengelig for denne filen."
   },
+  "no_quizzes_created_yet_1a2370b9": {
+    "message": "Ingen quizer opprettet ennå."
+  },
+  "no_quizzes_found_c80c537a": {
+    "message": "Ingen quizer funnet."
+  },
   "no_results_940393cf": {
     "message": "Ingen resultater."
   },

package/es/translations/locales/sv-x-k12.js

@@ -45,6 +45,9 @@ const locale = {
   "add_image_60b2de07": {
     "message": "Lägg till bild"
   },
+  "add_one_9e34a6f8": {
+    "message": "Lägg till en!"
+  },
   "additional_considerations_f3801683": {
     "message": "Ytterliggare hänsynstaganden"
   },
@@ -1323,9 +1326,27 @@ const locale = {
   "no_accessibility_issues_were_detected_f8d3c875": {
     "message": "Inga tillgänglighetsproblem upptäcktes."
   },
+  "no_announcements_created_yet_c44a94f4": {
+    "message": "Inga meddelanden har skapats än."
+  },
+  "no_announcements_found_20185afc": {
+    "message": "Inga meddelande hittades."
+  },
+  "no_assignments_created_yet_1b236d87": {
+    "message": "Inga uppgifter har skapats än."
+  },
+  "no_assignments_found_79e46d7f": {
+    "message": "Inga uppgifter hittades."
+  },
   "no_changes_to_save_d29f6e91": {
     "message": "Inga ändringar att spara."
   },
+  "no_discussions_created_yet_ff99abe3": {
+    "message": "Inga diskussioner har skapats än."
+  },
+  "no_discussions_found_9284063b": {
+    "message": "Inga diskussioner hittades."
+  },
   "no_e16d9132": {
     "message": "Nej"
   },
@@ -1335,9 +1356,27 @@ const locale = {
   "no_headers_9bc7dc7f": {
     "message": "Inga rubriker"
   },
+  "no_modules_created_yet_c71b6d4d": {
+    "message": "Inga moduler har skapats än."
+  },
+  "no_modules_found_2df43a40": {
+    "message": "Inga moduler hittades."
+  },
+  "no_pages_created_yet_c379fa6e": {
+    "message": "Inga sidor har skapats än."
+  },
+  "no_pages_found_6799350": {
+    "message": "Inga sidor hittades."
+  },
   "no_preview_is_available_for_this_file_f940114a": {
     "message": "Förhandsvisning är inte tillgänglig för den här filen."
   },
+  "no_quizzes_created_yet_1a2370b9": {
+    "message": "Inga quiz har skapats än."
+  },
+  "no_quizzes_found_c80c537a": {
+    "message": "Inga quiz hittades."
+  },
   "no_results_940393cf": {
     "message": "Inga resultat."
   },

package/es/util/encrypted-storage.js

@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2023 - present Instructure, Inc.
+ *
+ * This file is part of Canvas.
+ *
+ * Canvas is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License as published by the Free
+ * Software Foundation, version 3 of the License.
+ *
+ * Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Affero General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+import CryptoES from 'crypto-es';
+export default class EncryptedStorage {
+  constructor(passphrase) {
+    this.passphrase = void 0;
+
+    this.errorHandlerWrapper = callback => {
+      try {
+        return callback();
+      } catch (error) {
+        console.error('error', error);
+        return null;
+      }
+    };
+
+    this.passphrase = CryptoES.enc.Utf8.parse(passphrase);
+  }
+
+  setItem(key, content) {
+    return this.errorHandlerWrapper(() => {
+      // If passphrase is present, encrypt string and JSON stringify
+      let encrypted;
+
+      if (this.passphrase) {
+        encrypted = CryptoES.RC4.encrypt(content, this.passphrase, {
+          mode: CryptoES.mode.CFB,
+          padding: CryptoES.pad.AnsiX923
+        }).toString();
+      }
+
+      const data = JSON.stringify({
+        autosaveTimestamp: new Date().getTime(),
+        content: encrypted
+      });
+      return window.localStorage.setItem(key, data);
+    });
+  }
+
+  getItem(key) {
+    return this.errorHandlerWrapper(() => {
+      const data = window.localStorage.getItem(key);
+
+      if (!data) {
+        return data;
+      } // If passphrase is present, parse JSON and decrypt string
+
+
+      if (this.passphrase) {
+        const parsedData = JSON.parse(data);
+        parsedData.content = CryptoES.RC4.decrypt(parsedData.content, this.passphrase, {
+          mode: CryptoES.mode.CFB,
+          padding: CryptoES.pad.AnsiX923
+        });
+        parsedData.content = parsedData.content.toString(CryptoES.enc.Utf8);
+        return parsedData;
+      }
+    });
+  }
+
+  key(index) {
+    return this.errorHandlerWrapper(() => window.localStorage.key(index));
+  }
+
+  removeItem(key) {
+    return this.errorHandlerWrapper(() => window.localStorage.removeItem(key));
+  }
+
+}

package/jest/jest-setup.js

@@ -19,7 +19,6 @@
 // Several components use aphrodite, which tries to manipulate the dom
 // on a timer which expires after the test completes and the document no longer exists
 import {StyleSheetTestUtils} from 'aphrodite'
-import {filterUselessConsoleMessages} from '@instructure/js-utils'
 
 /**
  * We want to ensure errors and warnings get appropriate eyes. If
@@ -44,6 +43,8 @@ const ignoredErrors = [
   /Invalid prop `images.searchString` of type `string` supplied to `Images`/,
   /Invalid URL: undefined/,
   /failed updating video captions/,
+  /You seem to have overlapping act\(\) calls/,
+  /A theme registry has already been initialized/,
 ]
 const globalWarn = global.console.warn
 const ignoredWarnings = [
@@ -51,6 +52,9 @@ const ignoredWarnings = [
   /Found bad LTI MRU data/,
   /Cannot save LTI MRU list/,
   /clicked sidebar (link|image) without a focused editor/,
+  /Translation for/,
+  /Exactly one focusable child is required/,
+  /is deprecated and will be removed/,
 ]
 global.console = {
   log: console.log,
@@ -77,7 +81,6 @@ global.console = {
 }
 /* eslint-enable no-console */
 
-filterUselessConsoleMessages(console)
 StyleSheetTestUtils.suppressStyleInjection()
 
 // because InstUI themeable components need an explicit "dir" attribute on the <html> element

package/jest.config.js

@@ -47,6 +47,7 @@ module.exports = {
     '\\.(css|less)$': '<rootDir>/src/rce/__mocks__/styleMock.js',
     // mock the tinymce-react Editor component
     '@tinymce/tinymce-react': '<rootDir>/src/rce/__mocks__/tinymceReact.jsx',
+    'crypto-es': '<rootDir>/src/rce/__mocks__/_mockCryptoEs.ts',
   },
 
   transform: {

package/lib/rce/RCEWrapper.js

@@ -2373,6 +2373,7 @@ import { rceWrapperPropTypes } from './RCEWrapperProps';
 import { insertPlaceholder, placeholderInfoFor, removePlaceholder } from '../util/loadingPlaceholder';
 import { transformRceContentForEditing } from './transformContent';
 import { IconMoreSolid } from '@instructure/ui-icons/es/svg';
+import EncryptedStorage from '../util/encrypted-storage';
 import buildStyle from './style';
 const RestoreAutoSaveModal = /*#__PURE__*/React.lazy(() => import('./RestoreAutoSaveModal'));
 const RceHtmlEditor = /*#__PURE__*/React.lazy(() => import('./RceHtmlEditor'));
@@ -2713,9 +2714,48 @@ class RCEWrapper extends React.Component {
 
       this.checkAccessibility();
       this.fixToolbarKeyboardNavigation();
+      this.forwardPostMessages();
       (_this$props$onInitted = (_this$props = this.props).onInitted) === null || _this$props$onInitted === void 0 ? void 0 : _this$props$onInitted.call(_this$props, editor);
     };
 
+    this.forwardPostMessages = () => {
+      const windowReferences = {};
+      const rceWindow = this.editor.getWin(); // explicitly assign name for reference by parent window
+
+      rceWindow.name = `${RCEWrapper.editorFrameName}_${this.id}`;
+      rceWindow.addEventListener('message', this.forwardPostMessagesHandler(rceWindow, windowReferences));
+    };
+
+    this.forwardPostMessagesHandler = (rceWindow, windowReferences) => e => {
+      let message;
+
+      try {
+        message = typeof e.data === 'string' ? JSON.parse(e.data) : e.data;
+      } catch (err) {
+        // unparseable message may not be meant for our handlers
+        return false;
+      }
+
+      if (e.origin === rceWindow.origin) {
+        // message is from Canvas window, forward to tool
+        const targetOrigin = message.toolOrigin;
+
+        if (!targetOrigin) {
+          return false;
+        }
+
+        const targetWindow = windowReferences[targetOrigin];
+        delete message.toolOrigin;
+        targetWindow === null || targetWindow === void 0 ? void 0 : targetWindow.postMessage(message, targetOrigin);
+      } else {
+        // message is from tool, forward to Canvas window
+        windowReferences[e.origin] = e.source;
+        message.toolOrigin = e.origin;
+        message.frameName = rceWindow.name;
+        rceWindow.parent.postMessage(message, rceWindow.origin);
+      }
+    };
+
     this.fixToolbarKeyboardNavigation = () => {
       var _this$_elementRef$cur2;
 
@@ -2787,7 +2827,9 @@ class RCEWrapper extends React.Component {
     this.announcing = 0;
 
     this.initAutoSave = editor => {
-      this.storage = window.localStorage;
+      var _this$props$userCache;
+
+      this.storage = new EncryptedStorage((_this$props$userCache = this.props.userCacheKey) !== null && _this$props$userCache !== void 0 ? _this$props$userCache : '');
 
       if (this.storage) {
         editor.on('change Undo Redo', this.doAutoSave);
@@ -2875,10 +2917,7 @@ class RCEWrapper extends React.Component {
         });
 
         try {
-          _this.storage.setItem(_this.autoSaveKey, JSON.stringify({
-            autosaveTimestamp: Date.now(),
-            content
-          }));
+          _this.storage.setItem(_this.autoSaveKey, content);
         } catch (ex) {
           if (!retry) {
             // probably failed because there's not enough space
@@ -3733,7 +3772,7 @@ class RCEWrapper extends React.Component {
     let autosaved = null;
 
     try {
-      autosaved = this.storage && JSON.parse(this.storage.getItem(key));
+      autosaved = this.storage && this.storage.getItem(key);
     } catch (_ex) {
       this.storage.removeItem(this.autoSaveKey);
     }
@@ -4199,6 +4238,7 @@ RCEWrapper.defaultProps = {
   canvasOrigin: ''
 };
 RCEWrapper.skinCssInjected = false;
+RCEWrapper.editorFrameName = 'active_rce_frame';
 
 function mergeMenuItems(standard, custom) {
   var _custom$trim;

package/lib/rce/RCEWrapperProps.js

@@ -125,5 +125,6 @@ export const rceWrapperPropTypes = {
   features: PropTypes.objectOf(PropTypes.bool),
   flashAlertTimeout: PropTypes.number,
   timezone: PropTypes.string,
+  userCacheKey: PropTypes.string,
   externalToolsConfig: externalToolsConfigPropType
 };

package/lib/rce/__mocks__/_mockCryptoEs.js

@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2023 - present Instructure, Inc.
+ *
+ * This file is part of Canvas.
+ *
+ * Canvas is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License as published by the Free
+ * Software Foundation, version 3 of the License.
+ *
+ * Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Affero General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+export default {
+  lib: {
+    Base: {},
+    WordArray: {},
+    BufferedBlockAlgorithm: {},
+    Hasher: {},
+    Cipher: {},
+    StreamCipher: {},
+    BlockCipherMode: {},
+    BlockCipher: {},
+    CipherParams: {},
+    SerializableCipher: {},
+    PasswordBasedCipher: {}
+  },
+  x64: {
+    Word: {},
+    WordArray: {}
+  },
+  enc: {
+    Hex: {},
+    Latin1: {},
+    Utf8: {
+      parse: () => {}
+    },
+    Utf16: {},
+    Utf16BE: {},
+    Utf16LE: {},
+    Base64: {},
+    Base64url: {}
+  },
+  algo: {
+    HMAC: {},
+    MD5: {},
+    SHA1: {},
+    SHA224: {},
+    SHA256: {},
+    SHA384: {},
+    SHA512: {},
+    SHA3: {},
+    RIPEMD160: {},
+    PBKDF2: {},
+    EvpKDF: {},
+    AES: {},
+    DES: {},
+    TripleDES: {},
+    Rabbit: {},
+    RabbitLegacy: {},
+    RC4: {},
+    RC4Drop: {},
+    Blowfish: {}
+  },
+  mode: {
+    CBC: {},
+    CFB: {},
+    CTR: {},
+    CTRGladman: {},
+    ECB: {},
+    OFB: {}
+  },
+  pad: {
+    Pkcs7: {},
+    AnsiX923: {},
+    Iso10126: {},
+    Iso97971: {},
+    NoPadding: {},
+    ZeroPadding: {}
+  },
+  format: {
+    OpenSSL: {},
+    Hex: {}
+  },
+  kdf: {
+    OpenSSL: {}
+  },
+  MD5: {},
+  HmacMD5: {},
+  SHA1: {},
+  HmacSHA1: {},
+  SHA224: {},
+  HmacSHA224: {},
+  SHA256: {},
+  HmacSHA256: {},
+  SHA384: {},
+  HmacSHA384: {},
+  SHA512: {},
+  HmacSHA512: {},
+  SHA3: {},
+  HmacSHA3: {},
+  RIPEMD160: {},
+  HmacRIPEMD160: {},
+  PBKDF2: {},
+  EvpKDF: {},
+  AES: {},
+  DES: {},
+  TripleDES: {},
+  Rabbit: {},
+  RabbitLegacy: {},
+  RC4: {
+    encrypt: () => {},
+    decrypt: () => {}
+  },
+  RC4Drop: {
+    encrypt: () => {},
+    decrypt: () => {}
+  },
+  Blowfish: {}
+};

package/lib/translations/locales/da-x-k12.js

@@ -45,6 +45,9 @@ const locale = {
   "add_image_60b2de07": {
     "message": "Tilføj billede"
   },
+  "add_one_9e34a6f8": {
+    "message": "Tilføj en!"
+  },
   "additional_considerations_f3801683": {
     "message": "Yderligere overvejelser"
   },
@@ -1323,9 +1326,27 @@ const locale = {
   "no_accessibility_issues_were_detected_f8d3c875": {
     "message": "Der blev ikke fundet nogen tilgængelighedsproblemer."
   },
+  "no_announcements_created_yet_c44a94f4": {
+    "message": "Der er ikke oprettet beskeder endnu."
+  },
+  "no_announcements_found_20185afc": {
+    "message": "Ingen beskeder fundet."
+  },
+  "no_assignments_created_yet_1b236d87": {
+    "message": "Der er ikke oprettet opgaver endnu."
+  },
+  "no_assignments_found_79e46d7f": {
+    "message": "Ingen opgaver fundet."
+  },
   "no_changes_to_save_d29f6e91": {
     "message": "Ingen ændringer at gemme."
   },
+  "no_discussions_created_yet_ff99abe3": {
+    "message": "Der er ikke oprettet diskussioner endnu."
+  },
+  "no_discussions_found_9284063b": {
+    "message": "Ingen diskussioner fundet."
+  },
   "no_e16d9132": {
     "message": "Nej"
   },
@@ -1335,9 +1356,27 @@ const locale = {
   "no_headers_9bc7dc7f": {
     "message": "Ingen overskrifter"
   },
+  "no_modules_created_yet_c71b6d4d": {
+    "message": "Der er ikke oprettet forløb endnu."
+  },
+  "no_modules_found_2df43a40": {
+    "message": "Ingen forløb fundet."
+  },
+  "no_pages_created_yet_c379fa6e": {
+    "message": "Der er ikke oprettet sider endnu."
+  },
+  "no_pages_found_6799350": {
+    "message": "Ingen sider fundet."
+  },
   "no_preview_is_available_for_this_file_f940114a": {
     "message": "Der findes ikke forhåndsvisning for denne fil."
   },
+  "no_quizzes_created_yet_1a2370b9": {
+    "message": "Der er ikke oprettet nogen quizzer endnu."
+  },
+  "no_quizzes_found_c80c537a": {
+    "message": "Der er ikke fundet nogen quizzer."
+  },
   "no_results_940393cf": {
     "message": "Ingen resultater."
   },

package/lib/translations/locales/fi.js

@@ -45,6 +45,9 @@ const locale = {
   "add_image_60b2de07": {
     "message": "Lisää kuva"
   },
+  "add_one_9e34a6f8": {
+    "message": "Lisää yksi!"
+  },
   "additional_considerations_f3801683": {
     "message": "Muuta huomioon otettavaa"
   },
@@ -1323,9 +1326,27 @@ const locale = {
   "no_accessibility_issues_were_detected_f8d3c875": {
     "message": "Ei havaittu käytettävyysongelmia."
   },
+  "no_announcements_created_yet_c44a94f4": {
+    "message": "Ilmoituksia ei ole vielä luotu."
+  },
+  "no_announcements_found_20185afc": {
+    "message": "Ilmoituksia ei löytynyt."
+  },
+  "no_assignments_created_yet_1b236d87": {
+    "message": "Tehtäviä ei ole vielä luotu."
+  },
+  "no_assignments_found_79e46d7f": {
+    "message": "Tehtäviä ei löytynyt."
+  },
   "no_changes_to_save_d29f6e91": {
     "message": "Ei tallennettavia muutoksia."
   },
+  "no_discussions_created_yet_ff99abe3": {
+    "message": "Keskusteluja ei ole vielä luotu."
+  },
+  "no_discussions_found_9284063b": {
+    "message": "Keskusteluja ei löytynyt."
+  },
   "no_e16d9132": {
     "message": "Ei"
   },
@@ -1335,9 +1356,27 @@ const locale = {
   "no_headers_9bc7dc7f": {
     "message": "Ei otsikoita"
   },
+  "no_modules_created_yet_c71b6d4d": {
+    "message": "Moduuleja ei ole vielä luotu."
+  },
+  "no_modules_found_2df43a40": {
+    "message": "Moduuleja ei löytynyt."
+  },
+  "no_pages_created_yet_c379fa6e": {
+    "message": "Sivuja ei ole vielä luotu"
+  },
+  "no_pages_found_6799350": {
+    "message": "Sivuja ei löytynyt."
+  },
   "no_preview_is_available_for_this_file_f940114a": {
     "message": "Tälle tiedostolle ei ole saatavissa esikatselua."
   },
+  "no_quizzes_created_yet_1a2370b9": {
+    "message": "Testejä ei ole vielä luotu."
+  },
+  "no_quizzes_found_c80c537a": {
+    "message": "Testejä ei löytynyt."
+  },
   "no_results_940393cf": {
     "message": "Ei tuloksia."
   },

package/lib/translations/locales/nb-x-k12.js

@@ -45,6 +45,9 @@ const locale = {
   "add_image_60b2de07": {
     "message": "Legg til bilde"
   },
+  "add_one_9e34a6f8": {
+    "message": "Legg til en!"
+  },
   "additional_considerations_f3801683": {
     "message": "Ekstra hensyn"
   },
@@ -1323,9 +1326,27 @@ const locale = {
   "no_accessibility_issues_were_detected_f8d3c875": {
     "message": "Ingen tiljengelighetsproblemer ble oppdaget."
   },
+  "no_announcements_created_yet_c44a94f4": {
+    "message": "Ingen beskjeder opprettet ennå."
+  },
+  "no_announcements_found_20185afc": {
+    "message": "Ingen beskjeder funnet."
+  },
+  "no_assignments_created_yet_1b236d87": {
+    "message": "Ingen oppgave opprettet ennå."
+  },
+  "no_assignments_found_79e46d7f": {
+    "message": "Ingen oppgaver funnet."
+  },
   "no_changes_to_save_d29f6e91": {
     "message": "Ingen endringer å lagre."
   },
+  "no_discussions_created_yet_ff99abe3": {
+    "message": "Ingen diskusjoner opprettet ennå."
+  },
+  "no_discussions_found_9284063b": {
+    "message": "Ingen diskusjoner funnet."
+  },
   "no_e16d9132": {
     "message": "Nei"
   },
@@ -1335,9 +1356,27 @@ const locale = {
   "no_headers_9bc7dc7f": {
     "message": "Ingen titler"
   },
+  "no_modules_created_yet_c71b6d4d": {
+    "message": "Ingen moduler opprettet ennå."
+  },
+  "no_modules_found_2df43a40": {
+    "message": "Ingen moduler funnet."
+  },
+  "no_pages_created_yet_c379fa6e": {
+    "message": "Ingen sider opprettet ennå."
+  },
+  "no_pages_found_6799350": {
+    "message": "Ingen sider funnet."
+  },
   "no_preview_is_available_for_this_file_f940114a": {
     "message": "Ingen forhåndsvisning er tilgjengelig for denne filen."
   },
+  "no_quizzes_created_yet_1a2370b9": {
+    "message": "Ingen quizer opprettet ennå."
+  },
+  "no_quizzes_found_c80c537a": {
+    "message": "Ingen quizer funnet."
+  },
   "no_results_940393cf": {
     "message": "Ingen resultater."
   },

package/lib/translations/locales/sv-x-k12.js

@@ -45,6 +45,9 @@ const locale = {
   "add_image_60b2de07": {
     "message": "Lägg till bild"
   },
+  "add_one_9e34a6f8": {
+    "message": "Lägg till en!"
+  },
   "additional_considerations_f3801683": {
     "message": "Ytterliggare hänsynstaganden"
   },
@@ -1323,9 +1326,27 @@ const locale = {
   "no_accessibility_issues_were_detected_f8d3c875": {
     "message": "Inga tillgänglighetsproblem upptäcktes."
   },
+  "no_announcements_created_yet_c44a94f4": {
+    "message": "Inga meddelanden har skapats än."
+  },
+  "no_announcements_found_20185afc": {
+    "message": "Inga meddelande hittades."
+  },
+  "no_assignments_created_yet_1b236d87": {
+    "message": "Inga uppgifter har skapats än."
+  },
+  "no_assignments_found_79e46d7f": {
+    "message": "Inga uppgifter hittades."
+  },
   "no_changes_to_save_d29f6e91": {
     "message": "Inga ändringar att spara."
   },
+  "no_discussions_created_yet_ff99abe3": {
+    "message": "Inga diskussioner har skapats än."
+  },
+  "no_discussions_found_9284063b": {
+    "message": "Inga diskussioner hittades."
+  },
   "no_e16d9132": {
     "message": "Nej"
   },
@@ -1335,9 +1356,27 @@ const locale = {
   "no_headers_9bc7dc7f": {
     "message": "Inga rubriker"
   },
+  "no_modules_created_yet_c71b6d4d": {
+    "message": "Inga moduler har skapats än."
+  },
+  "no_modules_found_2df43a40": {
+    "message": "Inga moduler hittades."
+  },
+  "no_pages_created_yet_c379fa6e": {
+    "message": "Inga sidor har skapats än."
+  },
+  "no_pages_found_6799350": {
+    "message": "Inga sidor hittades."
+  },
   "no_preview_is_available_for_this_file_f940114a": {
     "message": "Förhandsvisning är inte tillgänglig för den här filen."
   },
+  "no_quizzes_created_yet_1a2370b9": {
+    "message": "Inga quiz har skapats än."
+  },
+  "no_quizzes_found_c80c537a": {
+    "message": "Inga quiz hittades."
+  },
   "no_results_940393cf": {
     "message": "Inga resultat."
   },

package/lib/util/encrypted-storage.js

@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2023 - present Instructure, Inc.
+ *
+ * This file is part of Canvas.
+ *
+ * Canvas is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License as published by the Free
+ * Software Foundation, version 3 of the License.
+ *
+ * Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Affero General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+import CryptoES from 'crypto-es';
+export default class EncryptedStorage {
+  constructor(passphrase) {
+    this.passphrase = void 0;
+
+    this.errorHandlerWrapper = callback => {
+      try {
+        return callback();
+      } catch (error) {
+        console.error('error', error);
+        return null;
+      }
+    };
+
+    this.passphrase = CryptoES.enc.Utf8.parse(passphrase);
+  }
+
+  setItem(key, content) {
+    return this.errorHandlerWrapper(() => {
+      // If passphrase is present, encrypt string and JSON stringify
+      let encrypted;
+
+      if (this.passphrase) {
+        encrypted = CryptoES.RC4.encrypt(content, this.passphrase, {
+          mode: CryptoES.mode.CFB,
+          padding: CryptoES.pad.AnsiX923
+        }).toString();
+      }
+
+      const data = JSON.stringify({
+        autosaveTimestamp: new Date().getTime(),
+        content: encrypted
+      });
+      return window.localStorage.setItem(key, data);
+    });
+  }
+
+  getItem(key) {
+    return this.errorHandlerWrapper(() => {
+      const data = window.localStorage.getItem(key);
+
+      if (!data) {
+        return data;
+      } // If passphrase is present, parse JSON and decrypt string
+
+
+      if (this.passphrase) {
+        const parsedData = JSON.parse(data);
+        parsedData.content = CryptoES.RC4.decrypt(parsedData.content, this.passphrase, {
+          mode: CryptoES.mode.CFB,
+          padding: CryptoES.pad.AnsiX923
+        });
+        parsedData.content = parsedData.content.toString(CryptoES.enc.Utf8);
+        return parsedData;
+      }
+    });
+  }
+
+  key(index) {
+    return this.errorHandlerWrapper(() => window.localStorage.key(index));
+  }
+
+  removeItem(key) {
+    return this.errorHandlerWrapper(() => window.localStorage.removeItem(key));
+  }
+
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/canvas-rce",
-  "version": "5.8.0",
+  "version": "5.9.0",
   "description": "A component wrapping Canvas's usage of Tinymce",
   "main": "es/index.js",
   "scripts": {
@@ -77,7 +77,6 @@
     "@instructure/canvas-theme": "7",
     "@instructure/debounce": "^7",
     "@instructure/emotion": "^8.38.1",
-    "@instructure/js-utils": "*",
     "@instructure/k5uploader": "*",
     "@instructure/media-capture": "~8.4.1-rc.16",
     "@instructure/ui-a11y-content": "^7",
@@ -133,6 +132,7 @@
     "aphrodite": "^2",
     "axios": "^0.21.1",
     "bloody-offset": "0.0.0",
+    "crypto-es": "^2.0.4",
     "classnames": "^2.2.5",
     "concurrently": "^4",
     "format-message": "^6",