0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: pass client package name

Browse source
This commit is contained in:
httpjamesm 2024-01-13 01:07:30 -05:00
parent acb2b1b7ea
commit 5b1cf9f823
No known key found for this signature in database
2 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/accounts/src/pages/account-handoff.tsx
View file

@ -1,10 +1,11 @@
import EnteSpinner from '@ente/shared/components/EnteSpinner';
import { VerticallyCentered } from '@ente/shared/components/Container';
import { setData, LS_KEYS } from '@ente/shared/storage/localStorage';
import { useRouter } from 'next/router';
import EnteSpinner from '@ente/shared/components/EnteSpinner';
import { ACCOUNTS_PAGES } from '@ente/shared/constants/pages';
import { useEffect } from 'react';
import HTTPService from '@ente/shared/network/HTTPService';
import { logError } from '@ente/shared/sentry';
import { LS_KEYS, setData } from '@ente/shared/storage/localStorage';
import { useRouter } from 'next/router';
import { useEffect } from 'react';
const AccountHandoff = () => {
const router = useRouter();
@ -27,7 +28,17 @@ const AccountHandoff = () => {
}
};
const getClientPackageName = () => {
const urlParams = new URLSearchParams(window.location.search);
const pkg = urlParams.get('package');
if (!pkg) return;
HTTPService.setHeaders({
'X-Client-Package': pkg,
});
};
useEffect(() => {
getClientPackageName();
retrieveAccountData();
}, []);

22
apps/photos/src/components/Sidebar/UtilitySection.tsx
View file

@ -1,25 +1,26 @@
import { useContext, useState } from 'react';
import { t } from 'i18next';
import { useContext, useState } from 'react';
// import FixLargeThumbnails from 'components/FixLargeThumbnail';
import RecoveryKey from '@ente/shared/components/RecoveryKey';
import TwoFactorModal from 'components/TwoFactor/Modal';
import {
PHOTOS_PAGES as PAGES,
ACCOUNTS_PAGES,
PHOTOS_PAGES as PAGES,
} from '@ente/shared/constants/pages';
import TwoFactorModal from 'components/TwoFactor/Modal';
import { useRouter } from 'next/router';
import { AppContext } from 'pages/_app';
// import mlIDbStorage from 'utils/storage/mlIDbStorage';
import isElectron from 'is-electron';
import WatchFolder from 'components/WatchFolder';
import { getDownloadAppMessage } from 'utils/ui';
import { APPS, CLIENT_PACKAGE_NAMES } from '@ente/shared/apps/constants';
import ThemeSwitcher from '@ente/shared/components/ThemeSwitcher';
import { getData, LS_KEYS } from '@ente/shared/storage/localStorage';
import { THEME_COLOR } from '@ente/shared/themes/constants';
import { EnteMenuItem } from 'components/Menu/EnteMenuItem';
import WatchFolder from 'components/WatchFolder';
import isElectron from 'is-electron';
import { getDownloadAppMessage } from 'utils/ui';
import { isInternalUser } from 'utils/user';
import Preferences from './Preferences';
import { EnteMenuItem } from 'components/Menu/EnteMenuItem';
import ThemeSwitcher from '@ente/shared/components/ThemeSwitcher';
import { THEME_COLOR } from '@ente/shared/themes/constants';
export default function UtilitySection({ closeSidebar }) {
const router = useRouter();
@ -73,7 +74,8 @@ export default function UtilitySection({ closeSidebar }) {
const serialized = JSON.stringify(userData);
const serializeB64 = window.btoa(serialized);
window.location.href = `${process.env.NEXT_PUBLIC_ACCOUNTS_ENDPOINT}${ACCOUNTS_PAGES.ACCOUNT_HANDOFF}#${serializeB64}`;
window.location.href = `${process.env.NEXT_PUBLIC_ACCOUNTS_ENDPOINT}${ACCOUNTS_PAGES.ACCOUNT_HANDOFF
}?package=${CLIENT_PACKAGE_NAMES.get(APPS.PHOTOS)}#${serializeB64}`;
};
const redirectToDeduplicatePage = () => router.push(PAGES.DEDUPLICATE);