Merge branch 'main' into liz/external-redirect-on-action

Shopify · Jan 18, 2024 · 4bbbd50 · 4bbbd50
2 parents 0b433a1 + 3fdb8d3
commit 4bbbd50
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.changeset/dirty-starfishes-accept.md b/.changeset/dirty-starfishes-accept.md
@@ -0,0 +1,5 @@
+---
+'@shopify/shopify-app-remix': patch
+---
+
+Minor refactor in login.ts to use new URL util method from shopify-api-js
diff --git a/packages/shopify-app-remix/src/server/authenticate/login/login.ts b/packages/shopify-app-remix/src/server/authenticate/login/login.ts
@@ -37,8 +37,8 @@ export function loginFactory(params: BasicParams) {
 
     const authPath = `${config.appUrl}${config.auth.path}?shop=${sanitizedShop}`;
 
-    const storeName = sanitizedShop.split('.')[0];
-    const installPath = `https://admin.shopify.com/store/${storeName}/oauth/install?client_id=${config.apiKey}`;
+    const adminPath = api.utils.legacyUrlToShopAdminUrl(sanitizedShop);
+    const installPath = `https://${adminPath}/oauth/install?client_id=${config.apiKey}`;
 
     const shouldInstall =
       config.isEmbeddedApp && config.future.unstable_newEmbeddedAuthStrategy;