From a87ccd9c545e2fa6b8ab4af8191552876f6b0b76 Mon Sep 17 00:00:00 2001 From: Katalina Okano Date: Sat, 13 Mar 2021 04:55:20 -0500 Subject: [PATCH] fix(web): getDefaultApiUrl should handle stage.roleypoly.com as stage --- packages/web/src/api-context/getDefaultApiUrl.spec.ts | 1 + packages/web/src/api-context/getDefaultApiUrl.ts | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/web/src/api-context/getDefaultApiUrl.spec.ts b/packages/web/src/api-context/getDefaultApiUrl.spec.ts index bdde8d3..7489d0f 100644 --- a/packages/web/src/api-context/getDefaultApiUrl.spec.ts +++ b/packages/web/src/api-context/getDefaultApiUrl.spec.ts @@ -2,6 +2,7 @@ import { getDefaultApiUrl } from './getDefaultApiUrl'; it.each([ ['https://next.roleypoly.com/servers', 'https://api-prod.roleypoly.com'], + ['https://stage.roleypoly.com/servers', 'https://api-stage.roleypoly.com'], ['https://roleypoly.com/servers', 'https://api-prod.roleypoly.com'], ['https://notroleypolybutclose.com/servers', 'https://api-prod.roleypoly.com'], ['https://myhash.roleypoly.pages.dev/servers', 'https://api-stage.roleypoly.com'], diff --git a/packages/web/src/api-context/getDefaultApiUrl.ts b/packages/web/src/api-context/getDefaultApiUrl.ts index 18eba53..6e588ee 100644 --- a/packages/web/src/api-context/getDefaultApiUrl.ts +++ b/packages/web/src/api-context/getDefaultApiUrl.ts @@ -1,7 +1,10 @@ export const getDefaultApiUrl = (host: string = window.location.hostname) => { - if (/roleypoly.com$/.test(host)) { + if (/^roleypoly.com$/.test(host)) { return 'https://api-prod.roleypoly.com'; - } else if (/roleypoly\.pages\.dev$/.test(host)) { + } else if ( + /roleypoly\.pages\.dev$/.test(host) || + /^stage.roleypoly.com$/.test(host) + ) { return 'https://api-stage.roleypoly.com'; } else if (/\blocalhost|127\.0\.0\.1\b/.test(host)) { return 'http://localhost:6609';