commonscomputer/cal.diy
4
0
Fork 0
Code Issues Pull Requests Actions 1.9k Packages Projects Releases Wiki Activity

chore: Introduce a new class WebAppURL that extends URL (#14982)

Browse Source 
* chore: Introduce a new class WebAppURL that extends URL

* update

---------

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
This commit is contained in:
Anik Dhabal Babu
2024-07-18 07:27:34 +00:00
committed by GitHub
co-authored by Peer Richelsen
parent 22fc47f69f
commit 2ad3592eb3
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/web/app/WithEmbedSSR.tsx
+2 -2
View File
@@ -3,7 +3,7 @@ import { isNotFoundError } from "next/dist/client/components/not-found";
import { getURLFromRedirectError, isRedirectError } from "next/dist/client/components/redirect";
import { notFound, redirect } from "next/navigation";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { WebAppURL } from "@calcom/lib/WebAppURL";
export type EmbedProps = {
isEmbed?: boolean;
@@ -28,7 +28,7 @@ export default function withEmbedSsrAppDir<T extends Record<string, any>>(
let urlPrefix = "";
// Get the URL parsed from URL so that we can reliably read pathname and searchParams from it.
const destinationUrlObj = new URL(destinationUrl, WEBAPP_URL);
const destinationUrlObj = new WebAppURL(destinationUrl);
// If it's a complete URL, use the origin as the prefix to ensure we redirect to the same domain.
if (destinationUrl.search(/^(http:|https:).*/) !== -1) {
apps/web/lib/withEmbedSsr.tsx
+2 -2
View File
@@ -1,6 +1,6 @@
import type { GetServerSideProps, GetServerSidePropsContext, GetServerSidePropsResult } from "next";
import { WEBAPP_URL } from "@calcom/lib/constants";
import { WebAppURL } from "@calcom/lib/WebAppURL";
export type EmbedProps = {
isEmbed?: boolean;
@@ -17,7 +17,7 @@ export default function withEmbedSsr(getServerSideProps: GetServerSideProps) {
let urlPrefix = "";
// Get the URL parsed from URL so that we can reliably read pathname and searchParams from it.
const destinationUrlObj = new URL(ssrResponse.redirect.destination, WEBAPP_URL);
const destinationUrlObj = new WebAppURL(ssrResponse.redirect.destination);
// If it's a complete URL, use the origin as the prefix to ensure we redirect to the same domain.
if (destinationUrl.search(/^(http:|https:).*/) !== -1) {
packages/lib/WebAppURL.ts
+8
View File
@@ -0,0 +1,8 @@
import { WEBAPP_URL } from "@calcom/lib/constants";
/** This class extends the native URL and uses WEBAPP_URL as the base URL for creating object URLs */
export class WebAppURL extends URL {
constructor(path: string | URL) {
super(path, WEBAPP_URL);
}
}