Merge branch 'master' into feature/env-manager

2020-02-23 11:39:44 -05:00
parent 15dc0ad9ac f690ea01c4
commit 59ca8cb2c6
18 changed files with 465 additions and 126 deletions
--- a/components/collections/importExportCollections.vue
+++ b/components/collections/importExportCollections.vue
@@ -120,20 +120,40 @@ export default {
      reader.onload = event => {
        let content = event.target.result;
        let collections = JSON.parse(content);
-        this.$store.commit("postwoman/replaceCollections", collections);
+        if (collections[0]) {
+          let [ name, folders, requests ] = Object.keys(collections[0])
+          if (name === 'name' && folders === 'folders' && requests === 'requests') {
+            // Do nothing
+          }
+        } else if (collections.info && collections.info.schema.includes('v2.1.0')) {
+          collections = this.parsePostmanCollection(collections)
+        } else {
+          return this.failedImport();
+        }
+        this.$store.commit("postwoman/importCollections", collections);
+        this.fileImported();
      };
      reader.readAsText(this.$refs.inputChooseFileToReplaceWith.files[0]);
-      this.fileImported();
    },
    importFromJSON() {
      let reader = new FileReader();
      reader.onload = event => {
        let content = event.target.result;
        let collections = JSON.parse(content);
+        if (collections[0]) {
+          let [ name, folders, requests ] = Object.keys(collections[0])
+          if (name === 'name' && folders === 'folders' && requests === 'requests') {
+            // Do nothing
+          }
+        } else if (collections.info && collections.info.schema.includes('v2.1.0')) {
+          collections = this.parsePostmanCollection(collections);
+        } else {
+          return this.failedImport();
+        }
        this.$store.commit("postwoman/importCollections", collections);
+        this.fileImported();
      };
      reader.readAsText(this.$refs.inputChooseFileToImportFrom.files[0]);
-      this.fileImported();
    },
    exportJSON() {
      let text = this.collectionJson;
@@ -161,6 +181,114 @@ export default {
      this.$toast.info(this.$t("file_imported"), {
        icon: "folder_shared"
      });
+    },
+    failedImport() {
+      this.$toast.error(this.$t("import_failed"), {
+        icon: "error"
+      });
+    },
+    parsePostmanCollection(collection, folders = true) {
+      let postwomanCollection = folders ?  [{
+        "name": "",
+        "folders": [],
+        "requests": []
+      }]
+        : {
+        "name": "",
+        "requests": []
+      };
+      for(let collectionItem of collection.item) {
+        if (collectionItem.request) {
+          if (postwomanCollection[0]) {
+            postwomanCollection[0].name = collection.info ? collection.info.name : "";
+            postwomanCollection[0].requests.push(this.parsePostmanRequest(collectionItem));
+          } else {
+            postwomanCollection.name = collection.name ? collection.name
+        : "";
+            postwomanCollection.requests.push(this.parsePostmanRequest(collectionItem));
+          }
+        } else if (collectionItem.item) {
+          if (collectionItem.item[0]) {
+            postwomanCollection[0].folders.push(this.parsePostmanCollection(collectionItem, false));
+          }
+        }
+      }
+      return postwomanCollection;
+    },
+    parsePostmanRequest(requestObject) {
+      let pwRequest = {
+        "url": "",
+        "path": "",
+        "method": "",
+        "auth": "",
+        "httpUser": "",
+        "httpPassword": "",
+        "passwordFieldType": "password",
+        "bearerToken": "",
+        "headers": [],
+        "params": [],
+        "bodyParams": [],
+        "rawParams": "",
+        "rawInput": false,
+        "contentType": "",
+        "requestType": "",
+        "name": "",
+      };
+
+      pwRequest.name = requestObject.name;
+      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 authType = itemAuth ? itemAuth.type
+        : "";
+      if (authType === "basic") {
+        pwRequest.auth = "Basic Auth";
+        pwRequest.httpUser = itemAuth.basic[0].key === "username"
+          ? itemAuth.basic[0].value
+          : itemAuth.basic[1].value;
+        pwRequest.httpPassword = 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"
+          ? itemAuth.oauth2[0].value
+          : itemAuth.oauth2[1].value;
+      } else if (authType === "bearer") {
+        pwRequest.auth = "Bearer Token";
+        pwRequest.bearerToken = itemAuth.bearer[0].value;
+      }
+      let requestObjectHeaders = requestObject.request.header;
+      if (requestObjectHeaders) {
+        pwRequest.headers = requestObjectHeaders;
+        for (let header of pwRequest.headers) {
+          delete header.name;
+          delete header.type;
+        }
+      }
+      let requestObjectParams = requestObject.request.url.query;
+      if (requestObjectParams) {
+        pwRequest.params = requestObjectParams;
+        for (let param of pwRequest.params) {
+          delete param.disabled;
+        }
+      }
+      if (requestObject.request.body) {
+        if (requestObject.request.body.mode === "urlencoded") {
+          let params = requestObject.request.body.urlencoded;
+          pwRequest.bodyParams = params ? params : [];
+          for(let param of pwRequest.bodyParams) {
+            delete param.type;
+          }
+        } else if (requestObject.request.body.mode === "raw") {
+          pwRequest.rawInput = true;
+          pwRequest.rawParams = requestObject.request.body.raw;
+        }
+      }
+      return pwRequest;
    }
  }
 };
--- a/components/firebase/login.vue
+++ b/components/firebase/login.vue
@@ -57,9 +57,9 @@ export default {
      firebase
        .auth()
        .signInWithPopup(provider)
-        .then(res => {
-          if (res.additionalUserInfo.isNewUser) {
-            this.$toast.info(this.$t("turn_on") + " " + this.$t("sync"), {
+        .then(({ additionalUserInfo }) => {
+          if (additionalUserInfo.isNewUser) {
+            this.$toast.info(`${this.$t("turn_on")} ${this.$t("sync")}`, {
              icon: "sync",
              duration: null,
              closeOnSwipe: false,
@@ -86,9 +86,9 @@ export default {
      firebase
        .auth()
        .signInWithPopup(provider)
-        .then(res => {
-          if (res.additionalUserInfo.isNewUser) {
-            this.$toast.info(this.$t("turn_on") + " " + this.$t("sync"), {
+        .then(({ additionalUserInfo }) => {
+          if (additionalUserInfo.isNewUser) {
+            this.$toast.info(`${this.$t("turn_on")} ${this.$t("sync")}`, {
              icon: "sync",
              duration: null,
              closeOnSwipe: false,
--- a/components/graphql/queryeditor.vue
+++ b/components/graphql/queryeditor.vue
@@ -7,7 +7,9 @@ const DEFAULT_THEME = "twilight";

 import ace from "ace-builds";
 import * as gql from "graphql";
+import { getAutocompleteSuggestions } from "graphql-language-service-interface";
 import "ace-builds/webpack-resolver";
+import "ace-builds/src-noconflict/ext-language_tools";
 import debounce from "../../functions/utils/debounce";

 export default {
@@ -46,10 +48,10 @@ export default {
      }
    },
    theme() {
-      this.editor.setTheme("ace/theme/" + this.defineTheme());
+      this.editor.setTheme(`ace/theme/${this.defineTheme()}`);
    },
    lang(value) {
-      this.editor.getSession().setMode("ace/mode/" + value);
+      this.editor.getSession().setMode(`ace/mode/${value}`);
    },
    options(value) {
      this.editor.setOptions(value);
@@ -57,12 +59,48 @@ export default {
  },

  mounted() {
+    let langTools = ace.require("ace/ext/language_tools");
+
    const editor = ace.edit(this.$refs.editor, {
-      theme: "ace/theme/" + this.defineTheme(),
-      mode: "ace/mode/" + this.lang,
+      theme: `ace/theme/${this.defineTheme()}`,
+      mode: `ace/mode/${this.lang}`,
+      enableBasicAutocompletion: true,
+      enableLiveAutocompletion: true,
      ...this.options
    });

+    const completer = {
+      getCompletions: (
+        editor,
+        _session,
+        { row, column },
+        _prefix,
+        callback
+      ) => {
+        if (this.validationSchema) {
+          const completions = getAutocompleteSuggestions(
+            this.validationSchema,
+            editor.getValue(),
+            { line: row, character: column }
+          );
+
+          callback(
+            null,
+            completions.map(({ label, detail }) => ({
+              name: label,
+              value: label,
+              score: 1.0,
+              meta: detail
+            }))
+          );
+        } else {
+          callback(null, []);
+        }
+      }
+    };
+
+    langTools.setCompleters([completer]);
+
    if (this.value) editor.setValue(this.value, 1);

    this.editor = editor;
@@ -101,14 +139,14 @@ export default {

          if (this.validationSchema) {
            this.editor.session.setAnnotations(
-              gql.validate(this.validationSchema, doc).map(err => {
-                return {
-                  row: err.locations[0].line - 1,
-                  column: err.locations[0].column - 1,
-                  text: err.message,
+              gql
+                .validate(this.validationSchema, doc)
+                .map(({ locations, message }) => ({
+                  row: locations[0].line - 1,
+                  column: locations[0].column - 1,
+                  text: message,
                  type: "error"
-                };
-              })
+                }))
            );
          }
        } catch (e) {
--- a/components/modal.vue
+++ b/components/modal.vue
@@ -25,7 +25,7 @@
  left: 0;
  width: 100%;
  height: 100%;
-  background-color: rgba(0, 0, 0, 0.87);
+  background-color: rgba(0, 0, 0, 0.32);
  display: flex;
  align-items: center;
  justify-content: center;
--- a/components/settings/swatch.vue
+++ b/components/settings/swatch.vue
@@ -20,6 +20,7 @@
  border-radius: 100%;
  border: 3px solid var(--bg-dark-color);
  cursor: pointer;
+  transition: all 0.2s ease-in-out;

  &.fg {
    color: var(--act-color);