Merge pull request #821 from maximevaillancourt/master

Prevent trailing slashes at the end of store URLs
Shopify · Oct 25, 2018 · 9051994 · 9051994
2 parents a695b6a + 64dc140
commit 9051994
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/packages/slate-env/__tests__/index.test.js b/packages/slate-env/__tests__/index.test.js
@@ -328,6 +328,20 @@ describe('Slate Env', () => {
         );
       });
 
+      test('the store URL environment variable does not end with a trailing slash', () => {
+        ['shop1.myshopify.com', 'shop1.myshopify.com/'].forEach((value) => {
+          setVars(
+            Object.assign({}, TEST_ENV, {
+              [config.get('env.keys.store')]: value,
+            }),
+          );
+          const result = slateEnv.validate();
+          expect(result.errors).toHaveLength(
+            value === 'shop1.myshopify.com/' ? 1 : 0,
+          );
+        });
+      });
+
       test('the store API password environment variable is empty', () => {
         setVars(
           Object.assign({}, TEST_ENV, {

diff --git a/packages/slate-env/index.js b/packages/slate-env/index.js
@@ -116,6 +116,12 @@ function _validateStore() {
         `${config.get('env.keys.store')} must be a valid .myshopify.com URL`,
       ),
     );
+  } else if (store.slice(-1) === '/') {
+    errors.push(
+      new Error(
+        `${config.get('env.keys.store')} must not end with a trailing slash`,
+      ),
+    );
   }
 
   return errors;