Skip to content

fix: iframe auth api request loop #37295

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

Merged
kodiakhq merged 3 commits into from
Oct 24, 2025
Merged

fix: iframe auth api request loop #37295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae4b258
fix conflicts and fix
yash-rajpal Sep 23, 2025
0e6a81d
fix conflicts
yash-rajpal Oct 24, 2025
45a3309
Merge branch 'release-7.10.3' into backport-7.10.3-37021
yash-rajpal Oct 24, 2025
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
79 changes: 37 additions & 42 deletions apps/meteor/client/hooks/iframe/useIframe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
import { useLoginWithIframe, useLoginWithToken, useSetting } from '@rocket.chat/ui-contexts';
import { useCallback, useEffect, useState } from 'react';
import { useCallback, useState } from 'react';

export const useIframe = () => {
const [iframeLoginUrl, setIframeLoginUrl] = useState<string | undefined>(undefined);
Expand Down Expand Up @@ -31,54 +32,48 @@ export const useIframe = () => {
[iframeLogin, tokenLogin],
);

const tryLogin = useCallback(
async (callback?: (error: Error | null | undefined, result: unknown) => void) => {
if (!enabled) {
return;
}

let url = accountIframeUrl;
let separator = '?';
if (url.indexOf('?') > -1) {
separator = '&';
}
const tryLogin = useEffectEvent(async (callback?: (error: Error | null | undefined, result: unknown) => void) => {
if (!enabled) {
return;
}

if (navigator.userAgent.indexOf('Electron') > -1) {
url += `${separator}client=electron`;
}
let url = accountIframeUrl;
let separator = '?';
if (url.indexOf('?') > -1) {
separator = '&';
}

try {
const result = await fetch(apiUrl, {
method: apiMethod,
headers: undefined,
credentials: 'include',
});
if (navigator.userAgent.indexOf('Electron') > -1) {
url += `${separator}client=electron`;
}

if (!result.ok || result.status !== 200) {
setIframeLoginUrl(url);
callback?.(new Error(), null);
return;
}
try {
const result = await fetch(apiUrl, {
method: apiMethod,
headers: undefined,
credentials: 'include',
});

loginWithToken(await result.json(), async (error: Meteor.Error | Meteor.TypedError | Error | null | undefined) => {
if (error) {
setIframeLoginUrl(url);
} else {
setIframeLoginUrl(undefined);
}
callback?.(error, await result.json());
});
} catch (error) {
if (!result.ok || result.status !== 200) {
setIframeLoginUrl(url);
callback?.(error instanceof Error ? error : undefined, null);
callback?.(new Error(), null);
return;
}
},
[apiMethod, apiUrl, accountIframeUrl, loginWithToken, enabled],
);

useEffect(() => {
tryLogin();
}, [tryLogin]);
const body = await result.json();
loginWithToken(body, async (error: Meteor.Error | Meteor.TypedError | Error | null | undefined) => {
if (error) {
setIframeLoginUrl(url);
} else {
setIframeLoginUrl(undefined);
}
callback?.(error, body);
});
} catch (error) {
setIframeLoginUrl(url);
callback?.(error instanceof Error ? error : undefined, null);
}
});

return {
enabled,
Expand Down
11 changes: 10 additions & 1 deletion apps/meteor/client/views/root/MainLayout/LoginPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useSession } from '@rocket.chat/ui-contexts';
import type { LoginRoutes } from '@rocket.chat/web-ui-registration';
import RegistrationRoute from '@rocket.chat/web-ui-registration';
import type { ReactElement, ReactNode } from 'react';
import { useEffect } from 'react';
import { useTranslation } from 'react-i18next';

import LoggedOutBanner from '../../../components/deviceManagement/LoggedOutBanner';
Expand All @@ -10,7 +11,15 @@ import { useIframe } from '../../../hooks/iframe/useIframe';
const LoginPage = ({ defaultRoute, children }: { defaultRoute?: LoginRoutes; children?: ReactNode }): ReactElement => {
const { t } = useTranslation();
const showForcedLogoutBanner = useSession('forceLogout') as boolean | undefined;
const { iframeLoginUrl } = useIframe();
const { iframeLoginUrl, tryLogin, enabled: iframeEnabled } = useIframe();

useEffect(() => {
if (!iframeEnabled) {
return;
}

tryLogin();
}, [tryLogin, iframeEnabled]);

if (iframeLoginUrl) {
return <iframe title={t('Login')} src={iframeLoginUrl} style={{ height: '100%', width: '100%' }} />;
Expand Down
Loading