djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Construct full API URL in case not full provided (#2738)

Browse source 
* Construct full API URL in case not full provided

* Resolve URL from base path

* Fix types
This commit is contained in:
Lukasz Ostrowski 2022-11-29 11:45:51 +01:00 committed by GitHub
parent 3c260557a7
commit 46b0adec0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/apps/urls.test.ts
View file

@ -1,31 +1,47 @@
import { resolveAppIframeUrl } from "@saleor/apps/urls"; import { resolveAppIframeUrl } from "@saleor/apps/urls";
import * as config from "@saleor/config";
jest.mock("@saleor/config", () => ({
...jest.requireActual("@saleor/config"),
getApiUrl: () => "https://shop.saleor.cloud/graphql/",
}));
describe("resolveAppIframeUrl", () => { describe("resolveAppIframeUrl", () => {
afterAll(() => { afterAll(() => {
jest.clearAllMocks(); jest.clearAllMocks();
}); });
it.each<[string, string, Record<string, unknown>, string]>([ describe("For full URL provided in env", () => {
[ beforeEach(() => {
"XyZ123", jest
"https://my-app.vercel.app", .spyOn(config, "getApiUrl")
{ param1: "param1" }, .mockImplementation(() => "https://shop.saleor.cloud/graphql/");
"https://my-app.vercel.app?domain=shop.saleor.cloud&saleorApiUrl=https%3A%2F%2Fshop.saleor.cloud%2Fgraphql%2F&id=XyZ123&param1=param1", });
],
[
"AbC987",
"https://my-app.vercel.app/configuration",
{ param1: "param1", param2: "param2" },
"https://my-app.vercel.app/configuration?domain=shop.saleor.cloud&saleorApiUrl=https%3A%2F%2Fshop.saleor.cloud%2Fgraphql%2F&id=AbC987&param1=param1&param2=param2",
],
])("Generates valid URL from segments", (id, appUrl, params, expectedUrl) => {
const result = resolveAppIframeUrl(id, appUrl, params);
expect(result).toEqual(expectedUrl); it.each<[string, string, Record<string, string>, string]>([
[
"XyZ123",
"https://my-app.vercel.app",
{ param1: "param1" },
"https://my-app.vercel.app?domain=shop.saleor.cloud&saleorApiUrl=https%3A%2F%2Fshop.saleor.cloud%2Fgraphql%2F&id=XyZ123&param1=param1",
],
[
"AbC987",
"https://my-app.vercel.app/configuration",
{ param1: "param1", param2: "param2" },
"https://my-app.vercel.app/configuration?domain=shop.saleor.cloud&saleorApiUrl=https%3A%2F%2Fshop.saleor.cloud%2Fgraphql%2F&id=AbC987&param1=param1&param2=param2",
],
])(
"Generates valid URL from segments",
(id, appUrl, params, expectedUrl) => {
const result = resolveAppIframeUrl(id, appUrl, params);
expect(result).toEqual(expectedUrl);
},
);
}); });
/**
* Test this scenario for cloud deployments where origin is computed.
*
* Current jest is not set up for testing location/URL
*/
test.todo(
"Test if URL is valid when API_URL in env is absolute path like /graphql/",
);
}); });

7
src/apps/urls.ts
View file

@ -123,8 +123,11 @@ export const resolveAppIframeUrl = (
appUrl: string, appUrl: string,
params: AppDetailsUrlQueryParams, params: AppDetailsUrlQueryParams,
) => { ) => {
const apiUrl = getApiUrl(); const apiUrl = new URL(getApiUrl(), window.location.origin).href;
const apiUrlHost = new URL(getApiUrl()).hostname; /**
* Use host to preserve port, in case of multiple Saleors running on localhost
*/
const apiUrlHost = new URL(apiUrl).host;
const iframeContextQueryString = `?${stringifyQs( const iframeContextQueryString = `?${stringifyQs(
{ {