koa-shopify-auth: Accept mixed-case shop parameters

Shopify · Feb 1, 2019 · c9093b2 · c9093b2
1 parent b64b969
commit c9093b2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/packages/koa-shopify-auth/src/auth/create-oauth-start.ts b/packages/koa-shopify-auth/src/auth/create-oauth-start.ts
@@ -16,6 +16,7 @@ export default function createOAuthStart(
 
     const shopRegex = new RegExp(
       `^[a-z0-9][a-z0-9\\-]*[a-z0-9]\\.${myShopifyDomain}$`,
+      'i',
     );
 
     if (shop == null || !shopRegex.test(shop)) {

diff --git a/packages/koa-shopify-auth/src/auth/test/oauth-start.test.ts b/packages/koa-shopify-auth/src/auth/test/oauth-start.test.ts
@@ -17,6 +17,7 @@ const baseUrl = 'myapp.com/auth';
 const callbackPath = '/callback';
 const shop = 'sho-p1.myshopify.io';
 const badShop = 'shop1myshopify.io';
+const uppercaseShop = 'SHO-P1.myshopify.io';
 const redirectionURL = `/admin/oauth/authorize`;
 
 const baseConfig: OAuthStartOptions = {
@@ -80,4 +81,19 @@ describe('OAuthStart', () => {
       `https://${shop}${redirectionURL}?abc=123`,
     );
   });
+
+  it('accepts mixed-case shop parameters', () => {
+    const oAuthStart = createOAuthStart(baseConfig, callbackPath);
+    const ctx = createMockContext({
+      url: `https://${baseUrl}?${query({shop: uppercaseShop})}`,
+    });
+
+    (oAuthQueryString as any).mockReturnValueOnce('');
+
+    oAuthStart(ctx);
+
+    expect(ctx.redirect).toBeCalledWith(
+      `https://${uppercaseShop}${redirectionURL}?`,
+    );
+  });
 });