Merge pull request #273 from scratchfoundation/UEPR-289

feat: [UEPR-289] disconnect project from cloud

Author: KManolov3

packages/scratch-gui/src/lib/cloud-manager-hoc.jsx

@@ -101,7 +101,11 @@ const cloudManagerHOC = function (WrappedComponent) {
         handleExtensionAdded (categoryInfo) {
             // Note that props.vm.extensionManager.isExtensionLoaded('videoSensing') is still false
             // at the point of this callback, so it is difficult to reuse the canModifyCloudData logic.
-            if (categoryInfo.id === 'videoSensing' && this.isConnected()) {
+            if (
+                (categoryInfo.id === 'videoSensing' ||
+                    categoryInfo.id === 'faceSensing') &&
+                this.isConnected()
+            ) {
                 this.disconnectFromCloud();
             }
         }
@@ -157,9 +161,18 @@ const cloudManagerHOC = function (WrappedComponent) {
             isShowingWithId: getIsShowingWithId(loadingState),
             projectId: state.scratchGui.projectState.projectId,
             // if you're editing someone else's project, you can't modify cloud data
-            canModifyCloudData: (!state.scratchGui.mode.hasEverEnteredEditor || ownProps.canSave) &&
+            canModifyCloudData:
+                (!state.scratchGui.mode.hasEverEnteredEditor ||
+                    ownProps.canSave) &&
                 // possible security concern if the program attempts to encode webcam data over cloud variables
-                !ownProps.vm.extensionManager.isExtensionLoaded('videoSensing')
+                !(
+                    ownProps.vm.extensionManager.isExtensionLoaded(
+                        'videoSensing'
+                    ) ||
+                    ownProps.vm.extensionManager.isExtensionLoaded(
+                        'faceSensing'
+                    )
+                )
         };
     };
 

packages/scratch-gui/test/unit/util/cloud-manager-hoc.test.jsx

@@ -162,6 +162,25 @@ describe('CloudManagerHOC', () => {
         expect(CloudProvider).not.toHaveBeenCalled();
     });
 
+    test('when faceSensing extension is active, the cloud provider is not set on the vm', () => {
+        const Component = () => <div />;
+        const WrappedComponent = cloudManagerHOC(Component);
+        vm.extensionManager.isExtensionLoaded = jest.fn(extension => extension === 'faceSensing');
+
+        mount(
+            <WrappedComponent
+                hasCloudPermission
+                cloudHost="nonEmpty"
+                store={store}
+                username="user"
+                vm={vm}
+            />
+        );
+
+        expect(vm.setCloudProvider.mock.calls.length).toBe(0);
+        expect(CloudProvider).not.toHaveBeenCalled();
+    });
+
     test('if the isShowingWithId prop becomes true, it sets the cloud provider on the vm', () => {
         const Component = () => <div />;
         const WrappedComponent = cloudManagerHOC(Component);