Fix issue where middleware was not uploaded when an app-directory was not provided

Also, changed logic in getAppInfo so web app URL is only display when web assets exist

Author: Tim Mendoza

src/helpers.js

@@ -46,7 +46,6 @@ async function getAssets(folder) {
   });
 
   const indexHTML = assets.find(asset => asset.name.includes('index.html'));
-  const authHandlerFn = fs.readFileSync(path.join(__dirname, './serverless/middleware/auth.js'));
 
   const allAssets = assets.concat([
     {
@@ -59,15 +58,22 @@ async function getAssets(folder) {
       path: '/login',
       name: '/login',
     },
+  ]);
+
+  return allAssets;
+}
+
+function getMiddleware() {
+  const authHandlerFn = fs.readFileSync(path.join(__dirname, './serverless/middleware/auth.js'));
+
+  return [
     {
       name: 'auth-handler',
       path: '/auth-handler.js',
       content: authHandlerFn,
       access: 'private',
     },
-  ]);
-
-  return allAssets;
+  ];
 }
 
 async function findApp() {
@@ -106,7 +112,7 @@ async function getAppInfo() {
     expiry: moment(Number(expiry)).toString(),
     sid: app.sid,
     passcode: fullPasscode,
-    hasAssets: Boolean(assets.length),
+    hasWebAssets: Boolean(assets.find(asset => asset.friendlyName.includes('index.html'))),
     roomType,
     environmentSid: environment.sid,
     functionSid: tokenServerFunction.sid,
@@ -121,7 +127,7 @@ async function displayAppInfo() {
     return;
   }
 
-  if (appInfo.hasAssets) {
+  if (appInfo.hasWebAssets) {
     console.log(`Web App URL: ${appInfo.url}`);
   }
 
@@ -144,6 +150,8 @@ async function deploy() {
     assetsFolderNames: [],
   });
 
+  assets.push(...getMiddleware());
+
   if (this.twilioClient.username === this.twilioClient.accountSid) {
     // When twilioClient.username equals twilioClient.accountSid, it means that the user
     // authenticated with the Twilio CLI by providing their Account SID and Auth Token
@@ -213,6 +221,7 @@ module.exports = {
   displayAppInfo,
   findApp,
   getAssets,
+  getMiddleware,
   getAppInfo,
   getPasscode,
   getRandomInt,

test/helpers/helpers.test.js

@@ -8,6 +8,7 @@ const {
   getPasscode,
   getRandomInt,
   verifyAppDirectory,
+  getMiddleware,
 } = require('../../src/helpers');
 const { getListOfFunctionsAndAssets } = require('@twilio-labs/serverless-api/dist/utils/fs');
 const path = require('path');
@@ -43,7 +44,7 @@ function getMockTwilioInstance(options) {
   };
 
   const mockAppInstance = {
-    assets: { list: () => Promise.resolve(options.hasAssets ? [{}] : []) },
+    assets: { list: () => Promise.resolve(options.hasWebAssets ? [{ friendlyName: 'index.html' }] : []) },
     functions: {},
     update: jest.fn(() => Promise.resolve()),
   };
@@ -134,9 +135,11 @@ describe('the getAssets function', () => {
       ])
     );
   });
+});
 
+describe('the getMiddleware function', () => {
   it('should add the auth-handler.js as a private asset', async () => {
-    expect(await getAssets('mockFolder')).toEqual(
+    expect(await getMiddleware('mockFolder')).toEqual(
       expect.arrayContaining([
         {
           name: 'auth-handler',
@@ -200,23 +203,23 @@ describe('the getAppInfo function', () => {
       expiry: 'Wed May 20 2020 18:40:00 GMT+0000',
       environmentSid: 'environmentSid',
       functionSid: 'tokenFunctionSid',
-      hasAssets: false,
+      hasWebAssets: false,
       passcode: '12345612345678',
       sid: 'appSid',
       url: `https://${APP_NAME}-1234-5678-dev.twil.io?passcode=12345612345678`,
       roomType: 'group',
     });
   });
 
-  it('should return the correct information when there are assets', async () => {
+  it('should return the correct information when there are web assets', async () => {
     const result = await getAppInfo.call({
-      twilioClient: getMockTwilioInstance({ exists: true, hasAssets: true }),
+      twilioClient: getMockTwilioInstance({ exists: true, hasWebAssets: true }),
     });
     expect(result).toEqual({
       expiry: 'Wed May 20 2020 18:40:00 GMT+0000',
       environmentSid: 'environmentSid',
       functionSid: 'tokenFunctionSid',
-      hasAssets: true,
+      hasWebAssets: true,
       passcode: '12345612345678',
       sid: 'appSid',
       url: `https://${APP_NAME}-1234-5678-dev.twil.io?passcode=12345612345678`,
@@ -251,7 +254,7 @@ describe('the displayAppInfo function', () => {
 
   it('should display the correct information when there are assets', async () => {
     await displayAppInfo.call({
-      twilioClient: getMockTwilioInstance({ exists: true, hasAssets: true }),
+      twilioClient: getMockTwilioInstance({ exists: true, hasWebAssets: true }),
     });
     expect(stdout.output).toMatchInlineSnapshot(`
       "Web App URL: https://${APP_NAME}-1234-5678-dev.twil.io?passcode=12345612345678