Refactor project token handling in save-project-to-server and clean up URL parameters after project creation

Author: Titanium2099

src/lib/save-project-to-server.js

@@ -29,18 +29,27 @@ export default function (projectId, vmState, params) {
     if (Object.prototype.hasOwnProperty.call(params, 'isCopy')) queryParams.is_copy = params.isCopy;
     if (Object.prototype.hasOwnProperty.call(params, 'isRemix')) queryParams.is_remix = params.isRemix;
     if (Object.prototype.hasOwnProperty.call(params, 'title')) queryParams.title = params.title;
+
+    if (vm.runtime.storage.projectToken) {
+        queryParams.token = vm.runtime.storage.projectToken;
+    }else if (creatingProject) {//vm.runtime.storage.projectToken is not set when creating a new project
+        const searchParams = new URLSearchParams(location.search);
+        if (searchParams.has('token')) queryParams.token = searchParams.get('token');
+        if(searchParams.has('username')) queryParams.username = searchParams.get('username');
+    }
+    
+
     let qs = queryString.stringify(queryParams);
     if (qs) qs = `?${qs}`;
-    const projectToken = vm.runtime.storage.projectToken ? "?token=" + vm.runtime.storage.projectToken : "";
     if (creatingProject) { //POST request to create new project
         Object.assign(opts, {
             method: 'post',
-            url: `${storage.projectHost}/${qs}${projectToken}`
+            url: `${storage.projectHost}/${qs}`
         });
     } else { //PUT request to update existing project
         Object.assign(opts, {
             method: 'put',
-            url: `${storage.projectHost}/${projectId}${qs}${projectToken}`
+            url: `${storage.projectHost}/${projectId}${qs}`
         });
     }
     return new Promise((resolve, reject) => {

src/reducers/project-state.js

@@ -374,6 +374,13 @@ const createProject = () => ({
 });
 
 const doneCreatingProject = (id, loadingState) => {
+    const searchParams = new URLSearchParams(location.search);
+    if (searchParams.has('new_project')) searchParams.delete('new_project');
+    if(searchParams.has('username')) searchParams.delete('username');
+    if(searchParams.has('token')) searchParams.delete('token');
+    const newUrl = `${location.pathname}${searchParams.toString() ? '?' + searchParams.toString() : ''}${location.hash}`;
+    window.history.replaceState({}, document.title, newUrl);
+    
     switch (loadingState) {
     case LoadingState.CREATING_NEW:
         return {