zapier convert: Generate different auth code based on scripting

scaffold/convert/index.template.js

@@ -7,9 +7,11 @@
 const App = {
   version: require('./package.json').version,
   platformVersion: require('zapier-platform-core').version,
-
+<% if (hasAuth) { %>
   authentication,
-
+<% } else { %>
+  authentication: {},
+<% } %>
   beforeRequest: [
     <%= BEFORE_REQUESTS %>
   ],

scaffold/convert/oauth2.template.js

@@ -1,7 +1,7 @@
 const testTrigger = require('<%= TEST_TRIGGER_MODULE %>');
 <% if (hasPreOAuthTokenScripting && hasPostOAuthTokenScripting) { %>
 const getAccessToken = (z, bundle) => {
-  const scripting = require('../scripting');
+  const scripting = require('./scripting');
   const legacyScriptingRunner = require('zapier-platform-legacy-scripting-runner')(scripting);
 
   bundle._legacyUrl = '<%= ACCESS_TOKEN_URL %>';
@@ -47,7 +47,7 @@ const getAccessToken = (z, bundle) => {
 };
 <% } else if (!hasPreOAuthTokenScripting && hasPostOAuthTokenScripting) { %>
 const getAccessToken = (z, bundle) => {
-  const scripting = require('../scripting');
+  const scripting = require('./scripting');
   const legacyScriptingRunner = require('zapier-platform-legacy-scripting-runner')(scripting);
 
   bundle._legacyUrl = '<%= ACCESS_TOKEN_URL %>';
@@ -78,7 +78,7 @@ const getAccessToken = (z, bundle) => {
 
    if (withRefresh && hasPreOAuthRefreshScripting) { %>
 const refreshAccessToken = (z, bundle) => {
-  const scripting = require('../scripting');
+  const scripting = require('./scripting');
   const legacyScriptingRunner = require('zapier-platform-legacy-scripting-runner')(scripting);
 
   bundle._legacyUrl = '<%= REFRESH_TOKEN_URL %>';
@@ -101,7 +101,7 @@ const refreshAccessToken = (z, bundle) => {
 
    if (hasGetConnectionLabelScripting) { %>
 const getConnectionLabel = (z, bundle) => {
-  const scripting = require('../scripting');
+  const scripting = require('./scripting');
   const legacyScriptingRunner = require('zapier-platform-legacy-scripting-runner')(scripting);
 
   // Do a get_connection_label() from scripting.
@@ -168,7 +168,7 @@ const authentication = {
 <% } %>
   },
 <% if (hasGetConnectionLabelScripting) { %>
-  connectionLabel: getConnectionLabel,
+  connectionLabel: getConnectionLabel
 <% } else { %>
   connectionLabel: '<%= CONNECTION_LABEL %>'
 <% } %>

scaffold/convert/session.template.js

@@ -1,7 +1,7 @@
 const testTrigger = require('<%= TEST_TRIGGER_MODULE %>');
 
 const getSessionKey = (z, bundle) => {
-  const scripting = require('../scripting');
+  const scripting = require('./scripting');
   const legacyScriptingRunner = require('zapier-platform-legacy-scripting-runner')(scripting);
 
   // Do a get_session_info() from scripting.
@@ -27,7 +27,7 @@ const getSessionKey = (z, bundle) => {
 };
 <% if (hasGetConnectionLabelScripting) { %>
 const getConnectionLabel = (z, bundle) => {
-  const scripting = require('../scripting');
+  const scripting = require('./scripting');
   const legacyScriptingRunner = require('zapier-platform-legacy-scripting-runner')(scripting);
 
   // Do a get_connection_label() from scripting.
@@ -48,7 +48,7 @@ const authentication = {
     perform: getSessionKey
   },
 <% if (hasGetConnectionLabelScripting) { %>
-  connectionLabel: getConnectionLabel,
+  connectionLabel: getConnectionLabel
 <% } else { %>
   connectionLabel: '<%= CONNECTION_LABEL %>'
 <% } %>

scaffold/convert/basic-auth.template.js → scaffold/convert/simple-auth.template.js

@@ -1,7 +1,7 @@
 const testTrigger = require('<%= TEST_TRIGGER_MODULE %>');
 <% if (hasGetConnectionLabelScripting) { %>
 const getConnectionLabel = (z, bundle) => {
-  const scripting = require('../scripting');
+  const scripting = require('./scripting');
   const legacyScriptingRunner = require('zapier-platform-legacy-scripting-runner')(scripting);
 
   // Do a get_connection_label() from scripting.
@@ -19,7 +19,7 @@ const authentication = {
 <%= FIELDS %>
   ],
 <% if (hasGetConnectionLabelScripting) { %>
-  connectionLabel: getConnectionLabel,
+  connectionLabel: getConnectionLabel
 <% } else { %>
   connectionLabel: '<%= CONNECTION_LABEL %>'
 <% } %>

src/tests/utils/convert.js

@@ -2,6 +2,7 @@ require('should');
 const requireFromString = require('require-from-string');
 const convert = require('../../utils/convert');
 const definitions = {
+  noAuth: require('./definitions/no-auth.json'),
   basic: require('./definitions/basic.json'),
   basicScripting: require('./definitions/basic-scripting.json'),
   apiHeader: require('./definitions/api-header.json'),
@@ -105,6 +106,15 @@ describe('convert render functions', () => {
   });
 
   describe('authentication', () => {
+    it('should not render no auth', () => {
+      const wbDef = definitions.noAuth;
+      return convert.renderIndex(wbDef)
+        .then(string => {
+          string.should.containEql('authentication: {}');
+          convert.hasAuth(wbDef).should.be.false();
+        });
+    });
+
     it('should render basic auth', () => {
       const wbDef = definitions.basic;
 

src/tests/utils/definitions/no-auth.json

@@ -0,0 +1,85 @@
+{
+  "actions": {
+    "create_recipe": {
+      "_dump_version": 1,
+      "custom_fields_result_url": "https://wt-c396b46e7e285c63f4bd6d4f8d32dc2e-0.run.webtask.io/fields-output",
+      "custom_fields_url": "https://wt-c396b46e7e285c63f4bd6d4f8d32dc2e-0.run.webtask.io/fields-input",
+      "fields": {
+        "name": {
+          "choices": null,
+          "default": null,
+          "help_text": null,
+          "label": "Name",
+          "list": false,
+          "parent_key": null,
+          "placeholder": null,
+          "prefill": null,
+          "required": true,
+          "searchfill": null,
+          "send_in_json": true,
+          "sort": null,
+          "type_of": "Unicode"
+        }
+      },
+      "help_text": "Creates a new Recipe.",
+      "hide": false,
+      "important": true,
+      "label": "Create Recipe",
+      "noun": "Recipe",
+      "sample_result_fields": [
+        {
+          "key": "authorId",
+          "type": "int"
+        },
+        {
+          "key": "id",
+          "type": "int"
+        },
+        {
+          "important": true,
+          "key": "name",
+          "type": "unicode"
+        }
+      ],
+      "url": "https://wt-c396b46e7e285c63f4bd6d4f8d32dc2e-0.run.webtask.io/recipe-create"
+    }
+  },
+  "auth_fields": {},
+  "general": {
+    "auth_data": {},
+    "auth_label": "",
+    "auth_mapping": {},
+    "auth_type": "Unknown Auth",
+    "auth_urls": {},
+    "cloned_from_app_id": 731,
+    "description": "Test WB app for `zapier convert`.",
+    "homepage_url": null,
+    "image_url": null,
+    "platform_version": "2015-07-31T00:00:00",
+    "subscribe_url": null,
+    "test_trigger_key": "test_auth",
+    "their_user_count": null,
+    "title": "Test API Header Cloned 2017-10-26",
+    "unsubscribe_url": null
+  },
+  "js": null,
+  "searches": {},
+  "triggers": {
+    "test_auth": {
+      "_dump_version": 1,
+      "custom_fields_url": null,
+      "data_source": "Polling",
+      "fields": {},
+      "help_text": "Test auth trigger.",
+      "hide": true,
+      "hook_event": null,
+      "hook_static_directions": "Log into your service and paste the below URL into the webhook setup field.",
+      "important": false,
+      "label": "Test Auth",
+      "noun": "",
+      "paging": false,
+      "sample_result_fields": [],
+      "url": "http://httpbin.org/basic-auth/user/passwd"
+    }
+  }
+}

src/utils/convert.js

@@ -87,6 +87,10 @@ const getAuthType = (definition) => {
   return authTypeMap[definition.general.auth_type];
 };
 
+const hasAuth = (definition) => {
+  return getAuthType(definition) !== 'custom' || !_.isEmpty(definition.auth_fields);
+};
+
 const renderField = (definition, key, indent = 0) => {
   const type = definition.type && typesMap[definition.type.toLowerCase()] || 'string';
 
@@ -125,11 +129,11 @@ ${padding}}`;
 };
 
 const renderFields = (fields, indent = 0) => {
-  const result = [];
+  const results = [];
   _.each(fields, (field, key) => {
-    result.push(renderField(field, key, indent));
+    results.push(renderField(field, key, indent));
   });
-  return result.join(',\n');
+  return results.join(',\n');
 };
 
 const renderSampleField = (def) => {
@@ -195,7 +199,7 @@ const renderAuthTemplate = (authType, definition) => {
     hasGetConnectionLabelScripting,
   };
 
-  const templateFile = path.join(TEMPLATE_DIR, '/basic-auth.template.js');
+  const templateFile = path.join(TEMPLATE_DIR, '/simple-auth.template.js');
   return renderTemplate(templateFile, templateContext);
 };
 
@@ -280,7 +284,7 @@ const renderAuth = (definition) => {
   }
 };
 
-// write authentiction.js
+// write authentication.js
 const writeAuth = (definition, newAppDir) => {
   const fileName = 'authentication.js';
   return renderAuth(definition)
@@ -549,23 +553,26 @@ const writeStepTest = (type, definition, key, legacyApp, newAppDir) => {
 };
 
 const renderIndex = (legacyApp) => {
+  const _hasAuth = hasAuth(legacyApp);
   const templateContext = {
-    AUTHENTICATION: '',
     HEADER: '',
     TRIGGERS: '',
     SEARCHES: '',
     CREATES: '',
     BEFORE_REQUESTS: getBeforeRequests(legacyApp),
     AFTER_RESPONSES: getAfterResponses(legacyApp),
+    hasAuth: _hasAuth
   };
 
   return getHeader(legacyApp)
     .then((header) => {
       templateContext.HEADER = header;
 
-      const importLines = [
-        "const authentication = require('./authentication');"
-      ];
+      const importLines = [];
+
+      if (_hasAuth) {
+        importLines.push("const authentication = require('./authentication');");
+      }
 
       const dirMap = {
         trigger: 'triggers',
@@ -673,7 +680,10 @@ const convertApp = (legacyApp, newAppDir) => {
   promises.push(writeIndex(legacyApp, newAppDir));
   promises.push(writePackageJson(legacyApp, newAppDir));
   promises.push(writeScripting(legacyApp, newAppDir));
-  promises.push(writeAuth(legacyApp, newAppDir));
+
+  if (hasAuth(legacyApp)) {
+    promises.push(writeAuth(legacyApp, newAppDir));
+  }
 
   return Promise.all(promises);
 };
@@ -682,6 +692,7 @@ module.exports = {
   convertApp,
   renderAuth,
   renderField,
+  renderIndex,
   renderSample,
   renderStep,
   renderTemplate,
@@ -690,4 +701,5 @@ module.exports = {
   getHeader,
   getBeforeRequests,
   getAfterResponses,
+  hasAuth,
 };