UI passes down username now...

Author: Titanium2099

src/lib/storage.js

@@ -66,7 +66,7 @@ class Storage extends ScratchStorage {
 
         window.parent.postMessage({type: 'block-compiler-action', action: 'JWT_AUTH_REQUEST'}, trustedOrigin);
 
-        const jwt = await new Promise(resolve => {
+        const creds = await new Promise(resolve => {
             // eslint-disable-next-line require-jsdoc, func-style
             function handleMessage (event) {
                 if (event.origin !== trustedOrigin) {
@@ -76,16 +76,19 @@ class Storage extends ScratchStorage {
 
                 if (event.data?.type === 'JWT_AUTH CREDS' && event.data?.token) {
                     window.removeEventListener('message', handleMessage);
-                    resolve(event.data.token);
+                    resolve({
+                        token: event.data.token,
+                        username: event.data.username || ''
+                    });
                 }
             }
 
             window.addEventListener('message', handleMessage);
         });
 
-        console.log('Received JWT:', jwt);
-        this.projectToken = jwt;
-        return jwt;
+        this.projectToken = creds.token;
+        this.username = creds.username;
+        return creds;
     }
     async getProjectToken () {
         if (!this.projectToken) {

src/lib/tw-project-meta-fetcher-hoc.jsx

@@ -8,7 +8,7 @@ import log from './log';
 const {API_HOST} = require('./brand');
 
 import {setProjectTitle} from '../reducers/project-title';
-import {setAuthor, setDescription, setUsername} from '../reducers/tw';
+import {setAuthor, setDescription} from '../reducers/tw';
 
 import storage from './storage';
 
@@ -88,11 +88,7 @@ const TWProjectMetaFetcherHOC = function (WrappedComponent) {
                         if (title) {
                             this.props.onSetProjectTitle(title);
                         }
-                        const username = data.username;
-                        if (username) {
-                            this.props.onSetUsername(username);
-                            this.setState({canUseCloud: true});
-                        }
+
                         const authorName = data.author.username;
                         const authorThumbnail = data.author.PFP;
                         this.props.onSetAuthor(authorName, authorThumbnail);
@@ -103,7 +99,8 @@ const TWProjectMetaFetcherHOC = function (WrappedComponent) {
                         }
 
                         this.setState({canSave: data.canSave === 'true'});
-                        // this.setState({canEditTitle: true}); // if you can save, you can edit title (it doesn't work the prop isn't passed down)
+                        // if you can save, you can edit title (it doesn't work the prop isn't passed down)
+                        // this.setState({canEditTitle: true});
                         this.setState({canRemix: data.canRemix === 'true'});
                         storage.setCloudOTT(data?.cloudDataOTT);
                         storage.setCustomAchievements(data?.customAchievements);
@@ -129,7 +126,6 @@ const TWProjectMetaFetcherHOC = function (WrappedComponent) {
                 onSetAuthor,
                 onSetDescription,
                 onSetProjectTitle,
-                onSetUsername,
                 /* eslint-enable no-unused-vars */
                 ...props
             } = this.props;
@@ -147,8 +143,7 @@ const TWProjectMetaFetcherHOC = function (WrappedComponent) {
         reduxProjectId: PropTypes.string,
         onSetAuthor: PropTypes.func,
         onSetDescription: PropTypes.func,
-        onSetProjectTitle: PropTypes.func,
-        onSetUsername: PropTypes.func
+        onSetProjectTitle: PropTypes.func
     };
     const mapStateToProps = state => ({
         reduxProjectId: state.scratchGui.projectState.projectId
@@ -162,8 +157,7 @@ const TWProjectMetaFetcherHOC = function (WrappedComponent) {
             instructions,
             credits
         })),
-        onSetProjectTitle: title => dispatch(setProjectTitle(title)),
-        onSetUsername: username => dispatch(setUsername(username))
+        onSetProjectTitle: title => dispatch(setProjectTitle(title))
     });
     return connect(
         mapStateToProps,

src/lib/vm-manager-hoc.jsx

@@ -7,6 +7,7 @@ import VM from 'scratch-vm';
 import AudioEngine from 'scratch-audio';
 
 import {setProjectUnchanged} from '../reducers/project-changed';
+import {setUsername} from '../reducers/tw';
 import {
     LoadingStates,
     getIsLoadingWithId,
@@ -88,6 +89,9 @@ const vmManagerHOC = function (WrappedComponent) {
                         canRecieveAchievement: !this.props.hasEverEnteredEditor,
                         canSave: this.props.canSave
                     };
+                    const username = storage.username || '';
+                    this.props.onSetUsername(username);
+
                     this.props.vm.loadProject(this.props.projectData, additionalData)
                         .then(() => {
                             this.props.onLoadedProject(this.props.loadingState, this.props.canSave);
@@ -158,7 +162,8 @@ const vmManagerHOC = function (WrappedComponent) {
         projectId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
         username: PropTypes.string,
         vm: PropTypes.instanceOf(VM).isRequired,
-        hasEverEnteredEditor: PropTypes.bool
+        hasEverEnteredEditor: PropTypes.bool,
+        onSetUsername: PropTypes.func
     };
 
     const mapStateToProps = state => {
@@ -181,7 +186,8 @@ const vmManagerHOC = function (WrappedComponent) {
         onError: error => dispatch(projectError(error)),
         onLoadedProject: (loadingState, canSave) =>
             dispatch(onLoadedProject(loadingState, canSave, true)),
-        onSetProjectUnchanged: () => dispatch(setProjectUnchanged())
+        onSetProjectUnchanged: () => dispatch(setProjectUnchanged()),
+        onSetUsername: username => dispatch(setUsername(username))
     });
 
     // Allow incoming props to override redux-provided props. Used to mock in tests.