Setting serveSecure flag on project redirects after saving project

Author: andrewn

client/modules/IDE/actions/project.js

@@ -9,6 +9,7 @@ import { setUnsavedChanges,
   resetJustOpenedProject,
   showErrorModal } from './ide';
 import { clearState, saveState } from '../../../persistState';
+import { redirectToProtocol, protocols } from '../../../components/forceProtocol';
 
 const ROOT_URL = process.env.API_URL;
 
@@ -28,13 +29,6 @@ export function setProjectName(name) {
   };
 }
 
-export function setServeSecure(serveSecure) {
-  return {
-    type: ActionTypes.SET_SERVE_SECURE,
-    serveSecure
-  };
-}
-
 export function getProject(id) {
   return (dispatch, getState) => {
     dispatch(justOpenedProject());
@@ -110,39 +104,38 @@ export function saveProject(autosave = false) {
             });
           }
         });
-          browserHistory.push(`/${response.data.user.username}/sketches/${response.data.id}`);
-          dispatch({
-            type: ActionTypes.NEW_PROJECT,
-            project: response.data,
-            owner: response.data.user,
-            files: response.data.files
-          });
-          if (!autosave) {
-            if (state.preferences.autosave) {
-              dispatch(showToast(5500));
-              dispatch(setToastText('Project saved.'));
-              setTimeout(() => dispatch(setToastText('Autosave enabled.')), 1500);
-              dispatch(resetJustOpenedProject());
-            } else {
-              dispatch(showToast(1500));
-              dispatch(setToastText('Project saved.'));
-            }
-          }
-        })
-        .catch((response) => {
-          if (response.status === 403) {
-            dispatch(showErrorModal('staleSession'));
     }
 
     return axios.post(`${ROOT_URL}/projects`, formParams, { withCredentials: true })
       .then((response) => {
         dispatch(setUnsavedChanges(false));
         dispatch(setProject(response.data));
+        browserHistory.push(`/${response.data.user.username}/sketches/${response.data.id}`);
+        dispatch({
+          type: ActionTypes.NEW_PROJECT,
+          project: response.data,
+          owner: response.data.user,
+          files: response.data.files
+        });
+        if (!autosave) {
+          if (state.preferences.autosave) {
+            dispatch(showToast(5500));
+            dispatch(setToastText('Project saved.'));
+            setTimeout(() => dispatch(setToastText('Autosave enabled.')), 1500);
+            dispatch(resetJustOpenedProject());
           } else {
-            dispatch({
-              type: ActionTypes.PROJECT_SAVE_FAIL,
-              error: response.data
+            dispatch(showToast(1500));
+            dispatch(setToastText('Project saved.'));
           }
+        }
+      })
+      .catch((response) => {
+        if (response.status === 403) {
+          dispatch(showErrorModal('staleSession'));
+        } else {
+          dispatch({
+            type: ActionTypes.PROJECT_SAVE_FAIL,
+            error: response.data
           });
         }
       });
@@ -257,6 +250,24 @@ export function cloneProject() {
   };
 }
 
+export function setServeSecure(serveSecure, { redirect = true } = {}) {
+  return (dispatch, getState) => {
+    dispatch({
+      type: ActionTypes.SET_SERVE_SECURE,
+      serveSecure
+    });
+
+    if (redirect === true) {
+      dispatch(saveProject(false /* autosave */))
+        .then(
+          () => redirectToProtocol(serveSecure === true ? protocols.https : protocols.http)
+        );
+    }
+
+    return null;
+  };
+}
+
 export function showEditProjectName() {
   return {
     type: ActionTypes.SHOW_EDIT_PROJECT_NAME

client/modules/IDE/components/Toolbar.jsx

@@ -110,7 +110,7 @@ class Toolbar extends React.Component {
               <input
                 id="serve-secure"
                 type="checkbox"
-                value={this.props.project.serveSecure}
+                checked={this.props.project.serveSecure || false}
                 onChange={(event) => {
                   this.props.setServeSecure(event.target.checked);
                 }}