Firebase sync

components/collections/importExportCollections.vue

@@ -121,12 +121,19 @@ export default {
         let content = event.target.result;
         let collections = JSON.parse(content);
         if (collections[0]) {
-          let [ name, folders, requests ] = Object.keys(collections[0])
+          let [name, folders, requests] = Object.keys(collections[0]);
-          if (name === 'name' && folders === 'folders' && requests === 'requests') {
+          if (
+            name === "name" &&
+            folders === "folders" &&
+            requests === "requests"
+          ) {
             // Do nothing
           }
-        } else if (collections.info && collections.info.schema.includes('v2.1.0')) {
+        } else if (
-          collections = this.parsePostmanCollection(collections)
+          collections.info &&
+          collections.info.schema.includes("v2.1.0")
+        ) {
+          collections = this.parsePostmanCollection(collections);
         } else {
           return this.failedImport();
         }
@@ -141,11 +148,18 @@ export default {
         let content = event.target.result;
         let collections = JSON.parse(content);
         if (collections[0]) {
-          let [ name, folders, requests ] = Object.keys(collections[0])
+          let [name, folders, requests] = Object.keys(collections[0]);
-          if (name === 'name' && folders === 'folders' && requests === 'requests') {
+          if (
+            name === "name" &&
+            folders === "folders" &&
+            requests === "requests"
+          ) {
             // Do nothing
           }
-        } else if (collections.info && collections.info.schema.includes('v2.1.0')) {
+        } else if (
+          collections.info &&
+          collections.info.schema.includes("v2.1.0")
+        ) {
           collections = this.parsePostmanCollection(collections);
         } else {
           return this.failedImport();
@@ -188,28 +202,38 @@ export default {
       });
     },
     parsePostmanCollection(collection, folders = true) {
-      let postwomanCollection = folders ?  [{
+      let postwomanCollection = folders
-        "name": "",
+        ? [
-        "folders": [],
+            {
-        "requests": []
+              name: "",
-      }]
+              folders: [],
+              requests: []
+            }
+          ]
         : {
-        "name": "",
+            name: "",
-        "requests": []
+            requests: []
-      };
+          };
-      for(let collectionItem of collection.item) {
+      for (let collectionItem of collection.item) {
         if (collectionItem.request) {
           if (postwomanCollection[0]) {
-            postwomanCollection[0].name = collection.info ? collection.info.name : "";
+            postwomanCollection[0].name = collection.info
-            postwomanCollection[0].requests.push(this.parsePostmanRequest(collectionItem));
+              ? collection.info.name
+              : "";
+            postwomanCollection[0].requests.push(
+              this.parsePostmanRequest(collectionItem)
+            );
           } else {
-            postwomanCollection.name = collection.name ? collection.name
+            postwomanCollection.name = collection.name ? collection.name : "";
-        : "";
+            postwomanCollection.requests.push(
-            postwomanCollection.requests.push(this.parsePostmanRequest(collectionItem));
+              this.parsePostmanRequest(collectionItem)
+            );
           }
         } else if (collectionItem.item) {
           if (collectionItem.item[0]) {
-            postwomanCollection[0].folders.push(this.parsePostmanCollection(collectionItem, false));
+            postwomanCollection[0].folders.push(
+              this.parsePostmanCollection(collectionItem, false)
+            );
           }
         }
       }
@@ -217,46 +241,51 @@ export default {
     },
     parsePostmanRequest(requestObject) {
       let pwRequest = {
-        "url": "",
+        url: "",
-        "path": "",
+        path: "",
-        "method": "",
+        method: "",
-        "auth": "",
+        auth: "",
-        "httpUser": "",
+        httpUser: "",
-        "httpPassword": "",
+        httpPassword: "",
-        "passwordFieldType": "password",
+        passwordFieldType: "password",
-        "bearerToken": "",
+        bearerToken: "",
-        "headers": [],
+        headers: [],
-        "params": [],
+        params: [],
-        "bodyParams": [],
+        bodyParams: [],
-        "rawParams": "",
+        rawParams: "",
-        "rawInput": false,
+        rawInput: false,
-        "contentType": "",
+        contentType: "",
-        "requestType": "",
+        requestType: "",
-        "name": "",
+        name: ""
       };
 
       pwRequest.name = requestObject.name;
-      let requestObjectUrl = requestObject.request.url.raw.match(/^(.+:\/\/[^\/]+|{[^\/]+})(\/[^\?]+|).*$/);
+      let requestObjectUrl = requestObject.request.url.raw.match(
+        /^(.+:\/\/[^\/]+|{[^\/]+})(\/[^\?]+|).*$/
+      );
       pwRequest.url = requestObjectUrl[1];
       pwRequest.path = requestObjectUrl[2] ? requestObjectUrl[2] : "";
       pwRequest.method = requestObject.request.method;
-      let itemAuth = requestObject.request.auth ? requestObject.request.auth
+      let itemAuth = requestObject.request.auth
-        : "";
+        ? requestObject.request.auth
-      let authType = itemAuth ? itemAuth.type
         : "";
+      let authType = itemAuth ? itemAuth.type : "";
       if (authType === "basic") {
         pwRequest.auth = "Basic Auth";
-        pwRequest.httpUser = itemAuth.basic[0].key === "username"
+        pwRequest.httpUser =
-          ? itemAuth.basic[0].value
+          itemAuth.basic[0].key === "username"
-          : itemAuth.basic[1].value;
+            ? itemAuth.basic[0].value
-        pwRequest.httpPassword = itemAuth.basic[0].key === "password"
+            : itemAuth.basic[1].value;
-          ? itemAuth.basic[0].value
+        pwRequest.httpPassword =
-          : itemAuth.basic[1].value;
+          itemAuth.basic[0].key === "password"
+            ? itemAuth.basic[0].value
+            : itemAuth.basic[1].value;
       } else if (authType === "oauth2") {
         pwRequest.auth = "OAuth 2.0";
-        pwRequest.bearerToken = itemAuth.oauth2[0].key === "accessToken"
+        pwRequest.bearerToken =
-          ? itemAuth.oauth2[0].value
+          itemAuth.oauth2[0].key === "accessToken"
-          : itemAuth.oauth2[1].value;
+            ? itemAuth.oauth2[0].value
+            : itemAuth.oauth2[1].value;
       } else if (authType === "bearer") {
         pwRequest.auth = "Bearer Token";
         pwRequest.bearerToken = itemAuth.bearer[0].value;
@@ -280,7 +309,7 @@ export default {
         if (requestObject.request.body.mode === "urlencoded") {
           let params = requestObject.request.body.urlencoded;
           pwRequest.bodyParams = params ? params : [];
-          for(let param of pwRequest.bodyParams) {
+          for (let param of pwRequest.bodyParams) {
             delete param.type;
           }
         } else if (requestObject.request.body.mode === "raw") {

components/environments/addEnvironment.vue

@@ -43,6 +43,8 @@
 </template>
 
 <script>
+import { fb } from "../../functions/fb";
+
 export default {
   props: {
     show: Boolean
@@ -56,6 +58,15 @@ export default {
     };
   },
   methods: {
+    syncEnvironments() {
+      if (fb.currentUser !== null) {
+        if (fb.currentSettings[1].value) {
+          fb.writeEnvironments(
+            JSON.parse(JSON.stringify(this.$store.state.postwoman.environments))
+          );
+        }
+      }
+    },
     addNewEnvironment() {
       if (!this.$data.name) {
         this.$toast.info($t("invalid_environment_name"));
@@ -69,6 +80,7 @@ export default {
       ];
       this.$store.commit("postwoman/importAddEnvironments", newEnvironment);
       this.$emit("hide-modal");
+      this.syncEnvironments();
     },
     hideModal() {
       this.$emit("hide-modal");

components/environments/importExportEnvironment.vue

@@ -12,10 +12,6 @@
             </div>
           </div>
           <div class="flex-wrap">
-            <!-- TODO db syncing
-              button needs to be switchded to
-              :disabled=="!fb.currentUser"
-            -->
             <span
               v-tooltip="{
                 content: !fb.currentUser
@@ -23,7 +19,11 @@
                   : $t('replace_current')
               }"
             >
-              <button :disabled="true" class="icon" @click="syncEnvironments">
+              <button
+                :disabled="!fb.currentUser"
+                class="icon"
+                @click="syncEnvironments"
+              >
                 <i class="material-icons">folder_shared</i>
                 <span>{{ $t("import_from_sync") }}</span>
               </button>
@@ -154,7 +154,11 @@ export default {
       });
     },
     syncEnvironments() {
-      // TODO
+      this.$store.commit(
+        "postwoman/replaceEnvironments",
+        fb.currentEnvironments
+      );
+      this.fileImported();
     },
     fileImported() {
       this.$toast.info(this.$t("file_imported"), {

components/environments/index.vue

@@ -71,7 +71,7 @@ ul {
 
 <script>
 import environment from "./environment";
-// import { fb } from "../functions/fb";
+import { fb } from "../../functions/fb";
 
 const updateOnLocalStorage = (propertyName, property) =>
   window.localStorage.setItem(propertyName, JSON.stringify(property));
@@ -124,17 +124,24 @@ export default {
       this.$data.editingEnvironment = environment;
       this.$data.editingEnvironmentIndex = environmentIndex;
       this.displayModalEdit(true);
+      this.syncEnvironments;
     },
     resetSelectedData() {
       this.$data.editingEnvironment = undefined;
       this.$data.editingEnvironmentIndex = undefined;
     },
     syncEnvironments() {
-      // TODO
+      if (fb.currentUser !== null) {
-    },
+        if (fb.currentSettings[1].value) {
-    beforeDestroy() {
+          fb.writeEnvironments(
-      document.removeEventListener("keydown", this._keyListener);
+            JSON.parse(JSON.stringify(this.$store.state.postwoman.environments))
+          );
+        }
+      }
     }
+  },
+  beforeDestroy() {
+    document.removeEventListener("keydown", this._keyListener);
   }
 };
 </script>

functions/fb.js

@@ -26,6 +26,7 @@ export const fb = {
   currentSettings: [],
   currentHistory: [],
   currentCollections: [],
+  currentEnvironments: [],
   writeFeeds: async (message, label) => {
     const dt = {
       createdOn: new Date(),
@@ -112,6 +113,21 @@ export const fb = {
       .doc("sync")
       .set(cl)
       .catch(e => console.error("error updating", cl, e));
+  },
+  writeEnvironments: async environment => {
+    const ev = {
+      updatedOn: new Date(),
+      author: fb.currentUser.uid,
+      author_name: fb.currentUser.displayName,
+      author_image: fb.currentUser.photoURL,
+      environment: environment
+    };
+    usersCollection
+      .doc(fb.currentUser.uid)
+      .collection("environments")
+      .doc("sync")
+      .set(ev)
+      .catch(e => console.error("error updating", ev, e));
   }
 };
 
@@ -186,6 +202,19 @@ firebase.auth().onAuthStateChanged(user => {
         });
         fb.currentCollections = collections[0].collection;
       });
+
+    usersCollection
+      .doc(fb.currentUser.uid)
+      .collection("environments")
+      .onSnapshot(environmentsRef => {
+        const environments = [];
+        environmentsRef.forEach(doc => {
+          const environment = doc.data();
+          environment.id = doc.id;
+          environments.push(environment);
+        });
+        fb.currentEnvironments = environments[0].environment;
+      });
   } else {
     fb.currentUser = null;
   }

lang/en-US.js

@@ -256,7 +256,8 @@ export default {
   enter_curl: "Enter cURL",
   empty: "Empty",
   extensions: "Extensions",
-  extensions_use_toggle: "Use the browser extension to send requests (if present)",
+  extensions_use_toggle:
+    "Use the browser extension to send requests (if present)",
   extensions_info1: "Browser extension that simplifies access to Postwoman",
   extensions_info2: "Get Postwoman browser extension!",
   installed: "Installed",
@@ -267,6 +268,7 @@ export default {
   sync: "Sync",
   syncHistory: "History",
   syncCollections: "Collections",
+  syncEnvironments: "Environments",
   turn_on: "Turn on",
   login_first: "Login first",
   paste_a_note: "Paste a note",

pages/index.vue

@@ -1086,7 +1086,7 @@
             <pw-section class="pink" :label="$t('notes')" ref="sync">
               <div v-if="fb.currentUser">
                 <inputform />
-                <ballsfeed />
+                <notes />
               </div>
               <div v-else>
                 <ul>
@@ -1456,7 +1456,7 @@ export default {
     saveRequestAs: () => import("../components/collections/saveRequestAs"),
     Editor: AceEditor,
     inputform: () => import("../components/firebase/inputform"),
-    ballsfeed: () => import("../components/firebase/feeds"),
+    notes: () => import("../components/firebase/feeds"),
     environments: () => import("../components/environments")
   },
   data() {
@@ -2047,12 +2047,14 @@ export default {
   },
   methods: {
     useSelectedEnvironment(environment) {
-      let preRequestScriptString = ''
+      let preRequestScriptString = "";
       for (let variable of environment.variables) {
-        preRequestScriptString = preRequestScriptString + `pw.env.set('${variable.key}', '${variable.value}');\n`
+        preRequestScriptString =
+          preRequestScriptString +
+          `pw.env.set('${variable.key}', '${variable.value}');\n`;
       }
-      this.preRequestScript = preRequestScriptString
+      this.preRequestScript = preRequestScriptString;
-      this.showPreRequestScript = true
+      this.showPreRequestScript = true;
     },
     checkCollections() {
       const checkCollectionAvailability =
@@ -2247,7 +2249,7 @@ export default {
           };
           this.$refs.historyComponent.addEntry(entry);
           if (fb.currentUser !== null) {
-            if (fb.currentSettings[1].value) {
+            if (fb.currentSettings[2].value) {
               fb.writeHistory(entry);
             }
           }
@@ -2284,7 +2286,7 @@ export default {
           };
           this.$refs.historyComponent.addEntry(entry);
           if (fb.currentUser !== null) {
-            if (fb.currentSettings[1].value) {
+            if (fb.currentSettings[2].value) {
               fb.writeHistory(entry);
             }
           }

pages/settings.vue

@@ -38,7 +38,7 @@
                 {{ setting.value ? $t("enabled") : $t("disabled") }}
               </pw-toggle>
             </p>
-            <p v-if="fb.currentSettings.length == 0">
+            <p v-if="fb.currentSettings.length !== 3">
               <button class="" @click="initSettings">
                 <i class="material-icons">sync</i>
                 <span>{{ $t("turn_on") + " " + $t("sync") }}</span>
@@ -433,7 +433,8 @@ export default {
                 text: this.$t("yes"),
                 onClick: (e, toastObject) => {
                   fb.writeSettings("syncHistory", true);
-                  fb.writeSettings("syncCollections", false);
+                  fb.writeSettings("syncCollections", true);
+                  fb.writeSettings("syncEnvironments", true);
                   this.$router.push({ path: "/settings" });
                   toastObject.remove();
                 }
@@ -462,7 +463,8 @@ export default {
                 text: this.$t("yes"),
                 onClick: (e, toastObject) => {
                   fb.writeSettings("syncHistory", true);
-                  fb.writeSettings("syncCollections", false);
+                  fb.writeSettings("syncCollections", true);
+                  fb.writeSettings("syncEnvironments", true);
                   this.$router.push({ path: "/settings" });
                   toastObject.remove();
                 }
@@ -481,7 +483,8 @@ export default {
     },
     initSettings() {
       fb.writeSettings("syncHistory", true);
-      fb.writeSettings("syncCollections", false);
+      fb.writeSettings("syncCollections", true);
+      fb.writeSettings("syncEnvironments", true);
     },
     resetProxy({ target }) {
       this.settings.PROXY_URL = `https://postwoman.apollotv.xyz/`;