Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: base url for auth page issue #2234

Merged
merged 1 commit into from
Nov 11, 2024
Merged

fix: base url for auth page issue #2234

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 3 additions & 19 deletions src/pages/auth.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ const handleTokenRedirection = async (
destination: string,
): Promise<GetServerSidePropsResult<any>> => {
try {
const baseUrl = getBaseUrl(context);
const response = await fetchToken(baseUrl, token, context);
const response = await fetchToken(token, context);

if (!response.ok) {
throw new Error('Network response was not ok');
Expand All @@ -76,30 +75,15 @@ const handleTokenRedirection = async (
}
};

/**
* Constructs the base URL from the request headers in the given context.
*
* @param {GetServerSidePropsContext} context - The context object containing request and response information.
* @returns {string} - The constructed base URL using the protocol and host from the request headers.
*/
const getBaseUrl = (context: GetServerSidePropsContext): string => {
return `${context.req.headers['x-forwarded-proto'] || 'https'}://${context.req.headers.host}`;
};

/**
* Fetches a token from the server using the provided base URL and token.
*
* @param {string} baseUrl - The base URL to use for the request.
* @param {string} token - The token to be included in the request URL.
* @param {GetServerSidePropsContext} context - The context object containing request and response information.
* @returns {Promise<Response>} - A promise that resolves to the response from the fetch request.
*/
const fetchToken = async (
baseUrl: string,
token: string,
context: GetServerSidePropsContext,
): Promise<Response> => {
return fetch(`${baseUrl}${makeRedirectTokenUrl(token)}`, {
const fetchToken = async (token: string, context: GetServerSidePropsContext): Promise<Response> => {
return fetch(makeRedirectTokenUrl(token), {
method: 'GET',
headers: {
cookie: context.req.headers.cookie || '',
Expand Down