π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
chore(photos):update-imports-to-accounts-rs
Aswin Asoka2c7d4dff3d9
diff --git a/web/apps/photos/package.json b/web/apps/photos/package.jsonindex 9031578781..cd14801e4c 100644--- a/web/apps/photos/package.json+++ b/web/apps/photos/package.json@@ -13,7 +13,7 @@"@mui/material": "9.3.1","chrono-node": "2.9.1","debounce": "2.2.0",- "ente-accounts": "*",+ "ente-accounts-rs": "*","ente-base": "*","ente-cast-wasm": "*","ente-contacts-web": "*",diff --git a/web/apps/photos/src/components/AuthenticateUser.tsx b/web/apps/photos/src/components/AuthenticateUser.tsxindex eef702dc11..df8244d74b 100644--- a/web/apps/photos/src/components/AuthenticateUser.tsx+++ b/web/apps/photos/src/components/AuthenticateUser.tsx@@ -1,11 +1,11 @@-import { VerifyMasterPasswordForm } from "ente-accounts/components/VerifyMasterPasswordForm";-import { checkSessionValidity } from "ente-accounts/services/session";+import { VerifyMasterPasswordForm } from "ente-accounts-rs/components/VerifyMasterPasswordForm";+import { checkSessionValidity } from "ente-accounts-rs/services/session";import {ensureLocalUser,ensureSavedKeyAttributes,type KeyAttributes,type LocalUser,-} from "ente-accounts/services/user";+} from "ente-accounts-rs/services/user";import {TitledMiniDialog,type MiniDialogAttributes,diff --git a/web/apps/photos/src/components/Avatar.tsx b/web/apps/photos/src/components/Avatar.tsxindex d77dbfd105..944023f481 100644--- a/web/apps/photos/src/components/Avatar.tsx+++ b/web/apps/photos/src/components/Avatar.tsx@@ -5,7 +5,7 @@ import {avatarTextColor,} from "@/services/avatar";import { styled } from "@mui/material";-import type { LocalUser } from "ente-accounts/services/user";+import type { LocalUser } from "ente-accounts-rs/services/user";import { useResolvedContactAvatar } from "ente-contacts-web";import type { EnteFile } from "ente-media/file";import React, { useMemo } from "react";diff --git a/web/apps/photos/src/components/Collections/AllAlbums.tsx b/web/apps/photos/src/components/Collections/AllAlbums.tsxindex 9e0dd5d9ca..3fc43c8668 100644--- a/web/apps/photos/src/components/Collections/AllAlbums.tsx+++ b/web/apps/photos/src/components/Collections/AllAlbums.tsx@@ -44,7 +44,7 @@ import {type SxProps,type Theme,} from "@mui/material";-import { ensureLocalUser } from "ente-accounts/services/user";+import { ensureLocalUser } from "ente-accounts-rs/services/user";import { FilledIconButton } from "ente-base/components/mui";import { SingleInputDialog } from "ente-base/components/SingleInputDialog";import { useModalVisibility } from "ente-base/components/utils/modal";diff --git a/web/apps/photos/src/components/Collections/CollectionMapDialog.tsx b/web/apps/photos/src/components/Collections/CollectionMapDialog.tsxindex d850523492..393ffacb5e 100644--- a/web/apps/photos/src/components/Collections/CollectionMapDialog.tsx+++ b/web/apps/photos/src/components/Collections/CollectionMapDialog.tsx@@ -16,7 +16,7 @@ import {type IconButtonProps,} from "@mui/material";import { useTheme } from "@mui/material/styles";-import { ensureLocalUser } from "ente-accounts/services/user";+import { ensureLocalUser } from "ente-accounts-rs/services/user";import { ActivityIndicator } from "ente-base/components/mui/ActivityIndicator";import type { ModalVisibilityProps } from "ente-base/components/utils/modal";import { useBaseContext } from "ente-base/context";diff --git a/web/apps/photos/src/components/Collections/CollectionShare.tsx b/web/apps/photos/src/components/Collections/CollectionShare.tsxindex fe9e60f65e..f53b5f82e5 100644--- a/web/apps/photos/src/components/Collections/CollectionShare.tsx+++ b/web/apps/photos/src/components/Collections/CollectionShare.tsx@@ -22,7 +22,7 @@ import WorkspacesIcon from "@mui/icons-material/Workspaces";import { Dialog, Stack, styled, Typography } from "@mui/material";import NumberAvatar from "@mui/material/Avatar";import TextField from "@mui/material/TextField";-import type { LocalUser } from "ente-accounts/services/user";+import type { LocalUser } from "ente-accounts-rs/services/user";import { LoadingButton } from "ente-base/components/mui/LoadingButton";import {SidebarDrawer,diff --git a/web/apps/photos/src/components/Collections/PickCoverPhotoDialog.tsx b/web/apps/photos/src/components/Collections/PickCoverPhotoDialog.tsxindex 266022db02..370326bafc 100644--- a/web/apps/photos/src/components/Collections/PickCoverPhotoDialog.tsx+++ b/web/apps/photos/src/components/Collections/PickCoverPhotoDialog.tsx@@ -9,7 +9,7 @@ import {Stack,Typography,} from "@mui/material";-import type { LocalUser } from "ente-accounts/services/user";+import type { LocalUser } from "ente-accounts-rs/services/user";import { LoadingButton } from "ente-base/components/mui/LoadingButton";import { useIsSmallWidth } from "ente-base/components/utils/hooks";import { ut } from "ente-base/i18n";diff --git a/web/apps/photos/src/components/FileList.tsx b/web/apps/photos/src/components/FileList.tsxindex 6c037de2a3..fdcb9eddf4 100644--- a/web/apps/photos/src/components/FileList.tsx+++ b/web/apps/photos/src/components/FileList.tsx@@ -22,7 +22,7 @@ import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";import PlayArrowRoundedIcon from "@mui/icons-material/PlayArrowRounded";import PlayCircleOutlineOutlinedIcon from "@mui/icons-material/PlayCircleOutlineOutlined";import { Box, Checkbox, Fab, Typography, styled } from "@mui/material";-import type { LocalUser } from "ente-accounts/services/user";+import type { LocalUser } from "ente-accounts-rs/services/user";import { assertionFailed } from "ente-base/assert";import { Overlay } from "ente-base/components/containers";import { formattedDateRelative } from "ente-base/i18n-date";diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsxindex 9987ce3b16..6464bc5276 100644--- a/web/apps/photos/src/components/Sidebar.tsx+++ b/web/apps/photos/src/components/Sidebar.tsx@@ -36,8 +36,8 @@ import {useColorScheme,} from "@mui/material";import Typography from "@mui/material/Typography";-import { RecoveryKey } from "ente-accounts/components/RecoveryKey";-import { openAccountsManagePasskeysPage } from "ente-accounts/services/passkey";+import { RecoveryKey } from "ente-accounts-rs/components/RecoveryKey";+import { openAccountsManagePasskeysPage } from "ente-accounts-rs/services/passkey";import { isDesktop } from "ente-base/app";import { EnteLogo, EnteLogoBox } from "ente-base/components/EnteLogo";import { LinkButton } from "ente-base/components/LinkButton";diff --git a/web/apps/photos/src/components/Upload.tsx b/web/apps/photos/src/components/Upload.tsxindex 3db3aa764b..38e921a85e 100644--- a/web/apps/photos/src/components/Upload.tsx+++ b/web/apps/photos/src/components/Upload.tsx@@ -22,7 +22,7 @@ import {import watcher from "@/services/watch";import DiscFullIcon from "@mui/icons-material/DiscFull";import { Dialog, type DialogProps } from "@mui/material";-import type { LocalUser } from "ente-accounts/services/user";+import type { LocalUser } from "ente-accounts-rs/services/user";import { isDesktop } from "ente-base/app";import { SingleInputDialog } from "ente-base/components/SingleInputDialog";import {diff --git a/web/apps/photos/src/components/gallery/helpers.ts b/web/apps/photos/src/components/gallery/helpers.tsindex dad4b112c6..1880a751ee 100644--- a/web/apps/photos/src/components/gallery/helpers.ts+++ b/web/apps/photos/src/components/gallery/helpers.ts@@ -2,7 +2,7 @@// Kept outside index.tsx so Fast Refresh allows non-component exports.import type { CollectionOp } from "@/components/SelectedFileOptions";-import { getUserRecoveryKey } from "ente-accounts/services/recovery-key";+import { getUserRecoveryKey } from "ente-accounts-rs/services/recovery-key";import log from "ente-base/log";import type { Collection } from "ente-media/collection";import type { EnteFile } from "ente-media/file";diff --git a/web/apps/photos/src/components/gallery/reducer.ts b/web/apps/photos/src/components/gallery/reducer.tsindex dae124c608..bd0627c062 100644--- a/web/apps/photos/src/components/gallery/reducer.ts+++ b/web/apps/photos/src/components/gallery/reducer.ts@@ -1,4 +1,4 @@-import type { LocalUser } from "ente-accounts/services/user";+import type { LocalUser } from "ente-accounts-rs/services/user";import {groupFilesByCollectionID,sortFiles,diff --git a/web/apps/photos/src/components/sidebar/SessionsSettings.tsx b/web/apps/photos/src/components/sidebar/SessionsSettings.tsxindex 77fc667c7d..7b5ada16b4 100644--- a/web/apps/photos/src/components/sidebar/SessionsSettings.tsx+++ b/web/apps/photos/src/components/sidebar/SessionsSettings.tsx@@ -9,12 +9,12 @@ import {Stack,Typography,} from "@mui/material";-import { sessionExpiredDialogAttributes } from "ente-accounts/components/utils/dialog";+import { sessionExpiredDialogAttributes } from "ente-accounts-rs/components/utils/dialog";import {getActiveSessions,terminateSession,type Session,-} from "ente-accounts/services/sessions";+} from "ente-accounts-rs/services/sessions";import { RowButton, RowButtonGroup } from "ente-base/components/RowButton";import {TitledNestedSidebarDrawer,diff --git a/web/apps/photos/src/components/sidebar/TwoFactorSettings.tsx b/web/apps/photos/src/components/sidebar/TwoFactorSettings.tsxindex 6fd6207426..fcf1df90e9 100644--- a/web/apps/photos/src/components/sidebar/TwoFactorSettings.tsx+++ b/web/apps/photos/src/components/sidebar/TwoFactorSettings.tsx@@ -3,7 +3,7 @@ import { Stack, Typography } from "@mui/material";import {savedPartialLocalUser,updateSavedLocalUser,-} from "ente-accounts/services/accounts-db";+} from "ente-accounts-rs/services/accounts-db";import {RowButton,RowButtonGroup,diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsxindex d80a146cb3..0aa701161d 100644--- a/web/apps/photos/src/pages/_app.tsx+++ b/web/apps/photos/src/pages/_app.tsx@@ -20,7 +20,7 @@ import { styled, ThemeProvider } from "@mui/material/styles";import {isLocalStorageAndIndexedDBMismatch,savedLocalUser,-} from "ente-accounts/services/accounts-db";+} from "ente-accounts-rs/services/accounts-db";import { isDesktop, staticAppTitle } from "ente-base/app";import { CenteredRow } from "ente-base/components/containers";import { CustomHeadPhotos } from "ente-base/components/Head";diff --git a/web/apps/photos/src/pages/change-email.tsx b/web/apps/photos/src/pages/change-email.tsxindex bca5c94728..7371c63400 100644--- a/web/apps/photos/src/pages/change-email.tsx+++ b/web/apps/photos/src/pages/change-email.tsx@@ -1 +1 @@-export { default } from "ente-accounts/pages/change-email";+export { default } from "ente-accounts-rs/pages/change-email";diff --git a/web/apps/photos/src/pages/change-password.tsx b/web/apps/photos/src/pages/change-password.tsxindex 0e494377ee..a90174521a 100644--- a/web/apps/photos/src/pages/change-password.tsx+++ b/web/apps/photos/src/pages/change-password.tsx@@ -1 +1 @@-export { default } from "ente-accounts/pages/change-password";+export { default } from "ente-accounts-rs/pages/change-password";diff --git a/web/apps/photos/src/pages/credentials.tsx b/web/apps/photos/src/pages/credentials.tsxindex 9b8df2e13d..54278a0282 100644--- a/web/apps/photos/src/pages/credentials.tsx+++ b/web/apps/photos/src/pages/credentials.tsx@@ -1 +1 @@-export { default } from "ente-accounts/pages/credentials";+export { default } from "ente-accounts-rs/pages/credentials";diff --git a/web/apps/photos/src/pages/duplicates.tsx b/web/apps/photos/src/pages/duplicates.tsxindex f83bbd73d3..39176a9696 100644--- a/web/apps/photos/src/pages/duplicates.tsx+++ b/web/apps/photos/src/pages/duplicates.tsx@@ -18,7 +18,7 @@ import {Tooltip,Typography,} from "@mui/material";-import { useRedirectIfNeedsCredentials } from "ente-accounts/components/utils/use-redirect";+import { useRedirectIfNeedsCredentials } from "ente-accounts-rs/components/utils/use-redirect";import { CenteredFill, SpacedRow } from "ente-base/components/containers";import { ActivityErrorIndicator } from "ente-base/components/ErrorIndicator";import { ActivityIndicator } from "ente-base/components/mui/ActivityIndicator";diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsxindex e909fcf56f..4e9aef1199 100644--- a/web/apps/photos/src/pages/gallery.tsx+++ b/web/apps/photos/src/pages/gallery.tsx@@ -56,14 +56,14 @@ import ArrowBackIcon from "@mui/icons-material/ArrowBack";import CheckCircleIcon from "@mui/icons-material/CheckCircle";import MenuIcon from "@mui/icons-material/Menu";import { IconButton, Link, Stack, Typography } from "@mui/material";-import { sessionExpiredDialogAttributes } from "ente-accounts/components/utils/dialog";+import { sessionExpiredDialogAttributes } from "ente-accounts-rs/components/utils/dialog";import {getAndClearIsFirstLogin,getAndClearJustSignedUp,-} from "ente-accounts/services/accounts-db";-import { stashRedirect } from "ente-accounts/services/redirect";-import { isSessionInvalid } from "ente-accounts/services/session";-import { ensureLocalUser } from "ente-accounts/services/user";+} from "ente-accounts-rs/services/accounts-db";+import { stashRedirect } from "ente-accounts-rs/services/redirect";+import { isSessionInvalid } from "ente-accounts-rs/services/session";+import { ensureLocalUser } from "ente-accounts-rs/services/user";import { isDesktop } from "ente-base/app";import type { MiniDialogAttributes } from "ente-base/components/MiniDialog";import { NavbarBase } from "ente-base/components/Navbar";diff --git a/web/apps/photos/src/pages/generate.tsx b/web/apps/photos/src/pages/generate.tsxindex 670ed3e823..54710e2994 100644--- a/web/apps/photos/src/pages/generate.tsx+++ b/web/apps/photos/src/pages/generate.tsx@@ -1 +1 @@-export { default } from "ente-accounts/pages/generate";+export { default } from "ente-accounts-rs/pages/generate";diff --git a/web/apps/photos/src/pages/index.tsx b/web/apps/photos/src/pages/index.tsxindex e4ab20bb6a..bdba7ebc8f 100644--- a/web/apps/photos/src/pages/index.tsx+++ b/web/apps/photos/src/pages/index.tsx@@ -1,7 +1,7 @@import { Box, Stack, Typography, styled } from "@mui/material";-import { LoginContents } from "ente-accounts/components/LoginContents";-import { SignUpContents } from "ente-accounts/components/SignUpContents";-import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";+import { LoginContents } from "ente-accounts-rs/components/LoginContents";+import { SignUpContents } from "ente-accounts-rs/components/SignUpContents";+import { savedPartialLocalUser } from "ente-accounts-rs/services/accounts-db";import { CenteredFill, CenteredRow } from "ente-base/components/containers";import { EnteLogo } from "ente-base/components/EnteLogo";import { ActivityIndicator } from "ente-base/components/mui/ActivityIndicator";diff --git a/web/apps/photos/src/pages/large-files.tsx b/web/apps/photos/src/pages/large-files.tsxindex 7a363382b9..7f2bc1737f 100644--- a/web/apps/photos/src/pages/large-files.tsx+++ b/web/apps/photos/src/pages/large-files.tsx@@ -18,7 +18,7 @@ import {styled,Typography,} from "@mui/material";-import { useRedirectIfNeedsCredentials } from "ente-accounts/components/utils/use-redirect";+import { useRedirectIfNeedsCredentials } from "ente-accounts-rs/components/utils/use-redirect";import { CenteredFill, Overlay } from "ente-base/components/containers";import { ActivityErrorIndicator } from "ente-base/components/ErrorIndicator";import { ActivityIndicator } from "ente-base/components/mui/ActivityIndicator";diff --git a/web/apps/photos/src/pages/login.tsx b/web/apps/photos/src/pages/login.tsxindex 675471334f..3b969447aa 100644--- a/web/apps/photos/src/pages/login.tsx+++ b/web/apps/photos/src/pages/login.tsx@@ -1 +1 @@-export { default } from "ente-accounts/pages/login";+export { default } from "ente-accounts-rs/pages/login";diff --git a/web/apps/photos/src/pages/passkeys/finish.tsx b/web/apps/photos/src/pages/passkeys/finish.tsxindex 88c2314928..44678c882d 100644--- a/web/apps/photos/src/pages/passkeys/finish.tsx+++ b/web/apps/photos/src/pages/passkeys/finish.tsx@@ -1 +1 @@-export { default } from "ente-accounts/pages/passkeys/finish";+export { default } from "ente-accounts-rs/pages/passkeys/finish";diff --git a/web/apps/photos/src/pages/passkeys/recover.tsx b/web/apps/photos/src/pages/passkeys/recover.tsxindex 972142211c..f4539280c6 100644--- a/web/apps/photos/src/pages/passkeys/recover.tsx+++ b/web/apps/photos/src/pages/passkeys/recover.tsx@@ -1,4 +1,4 @@-import Page_ from "ente-accounts/pages/two-factor/recover";+import Page_ from "ente-accounts-rs/pages/two-factor/recover";const Page = () => <Page_ twoFactorType="passkey" />;diff --git a/web/apps/photos/src/pages/recover.tsx b/web/apps/photos/src/pages/recover.tsxindex eb6a74c593..4793539fa6 100644--- a/web/apps/photos/src/pages/recover.tsx+++ b/web/apps/photos/src/pages/recover.tsx@@ -1 +1 @@-export { default } from "ente-accounts/pages/recover";+export { default } from "ente-accounts-rs/pages/recover";diff --git a/web/apps/photos/src/pages/signup.tsx b/web/apps/photos/src/pages/signup.tsxindex fa3c32852a..ad006c980d 100644--- a/web/apps/photos/src/pages/signup.tsx+++ b/web/apps/photos/src/pages/signup.tsx@@ -1 +1 @@-export { default } from "ente-accounts/pages/signup";+export { default } from "ente-accounts-rs/pages/signup";diff --git a/web/apps/photos/src/pages/two-factor/recover.tsx b/web/apps/photos/src/pages/two-factor/recover.tsxindex 201393276a..9182186db6 100644--- a/web/apps/photos/src/pages/two-factor/recover.tsx+++ b/web/apps/photos/src/pages/two-factor/recover.tsx@@ -1,4 +1,4 @@-import Page_ from "ente-accounts/pages/two-factor/recover";+import Page_ from "ente-accounts-rs/pages/two-factor/recover";const Page = () => <Page_ twoFactorType="totp" />;diff --git a/web/apps/photos/src/pages/two-factor/setup.tsx b/web/apps/photos/src/pages/two-factor/setup.tsxindex 7f9adb38e6..0a1f8d86b9 100644--- a/web/apps/photos/src/pages/two-factor/setup.tsx+++ b/web/apps/photos/src/pages/two-factor/setup.tsx@@ -1 +1 @@-export { default } from "ente-accounts/pages/two-factor/setup";+export { default } from "ente-accounts-rs/pages/two-factor/setup";diff --git a/web/apps/photos/src/pages/two-factor/verify.tsx b/web/apps/photos/src/pages/two-factor/verify.tsxindex f3f3c99656..b5f8497ad3 100644--- a/web/apps/photos/src/pages/two-factor/verify.tsx+++ b/web/apps/photos/src/pages/two-factor/verify.tsx@@ -1 +1 @@-export { default } from "ente-accounts/pages/two-factor/verify";+export { default } from "ente-accounts-rs/pages/two-factor/verify";diff --git a/web/apps/photos/src/pages/verify.tsx b/web/apps/photos/src/pages/verify.tsxindex 7ec623fac9..4c231f052e 100644--- a/web/apps/photos/src/pages/verify.tsx+++ b/web/apps/photos/src/pages/verify.tsx@@ -1 +1 @@-export { default } from "ente-accounts/pages/verify";+export { default } from "ente-accounts-rs/pages/verify";diff --git a/web/apps/photos/src/services/dedup.ts b/web/apps/photos/src/services/dedup.tsindex 8f0a5ffb96..51c0639e62 100644--- a/web/apps/photos/src/services/dedup.ts+++ b/web/apps/photos/src/services/dedup.ts@@ -1,4 +1,4 @@-import { ensureLocalUser } from "ente-accounts/services/user";+import { ensureLocalUser } from "ente-accounts-rs/services/user";import { assertionFailed } from "ente-base/assert";import { newID } from "ente-base/id";import type { EnteFile } from "ente-media/file";diff --git a/web/apps/photos/src/services/join-album.ts b/web/apps/photos/src/services/join-album.tsindex e101edb52b..5fb3dba45a 100644--- a/web/apps/photos/src/services/join-album.ts+++ b/web/apps/photos/src/services/join-album.ts@@ -1,4 +1,4 @@-import { savedKeyAttributes } from "ente-accounts/services/accounts-db";+import { savedKeyAttributes } from "ente-accounts-rs/services/accounts-db";import { boxSeal, fromB64 } from "ente-base/crypto";import { authenticatedRequestHeaders } from "ente-base/http";import {diff --git a/web/apps/photos/src/services/large-files.ts b/web/apps/photos/src/services/large-files.tsindex c84554d9e6..8d798aab6c 100644--- a/web/apps/photos/src/services/large-files.ts+++ b/web/apps/photos/src/services/large-files.ts@@ -1,4 +1,4 @@-import { ensureLocalUser } from "ente-accounts/services/user";+import { ensureLocalUser } from "ente-accounts-rs/services/user";import { newID } from "ente-base/id";import type { EnteFile } from "ente-media/file";import { FileType } from "ente-media/file-type";diff --git a/web/apps/photos/src/services/logout.ts b/web/apps/photos/src/services/logout.tsindex 138f6ccdbd..9902388354 100644--- a/web/apps/photos/src/services/logout.ts+++ b/web/apps/photos/src/services/logout.ts@@ -2,7 +2,7 @@ import exportService from "@/services/export";import {accountLogout,logoutClearStateAgain,-} from "ente-accounts/services/logout";+} from "ente-accounts-rs/services/logout";import log from "ente-base/log";import { resetSaveGroups } from "ente-gallery/components/utils/save-groups";import { logoutFileViewerDataSource } from "ente-gallery/components/viewer/data-source";diff --git a/web/apps/photos/src/services/upload-manager.ts b/web/apps/photos/src/services/upload-manager.tsindex 8830c2f213..5811418266 100644--- a/web/apps/photos/src/services/upload-manager.ts+++ b/web/apps/photos/src/services/upload-manager.ts@@ -1,6 +1,6 @@// TODO: Audit this file// TODO: Too many null assertions in this file. The types need reworking.-import { ensureLocalUser } from "ente-accounts/services/user";+import { ensureLocalUser } from "ente-accounts-rs/services/user";import { isDesktop } from "ente-base/app";import { createComlinkCryptoWorker } from "ente-base/crypto";import type { CryptoWorker } from "ente-base/crypto/worker";diff --git a/web/package-lock.json b/web/package-lock.jsonindex bc8838062a..bc0949c842 100644--- a/web/package-lock.json+++ b/web/package-lock.json@@ -289,7 +289,7 @@"@mui/material": "9.3.1","chrono-node": "2.9.1","debounce": "2.2.0",- "ente-accounts": "*",+ "ente-accounts-rs": "*","ente-base": "*","ente-cast-wasm": "*","ente-contacts-web": "*",@@ -11318,6 +11318,7 @@"@hugeicons/core-free-icons": "1.2.1","@hugeicons/react": "1.1.6","bs58": "6.0.0",+ "ente-accounts-rs": "*","ente-base": "*","ente-contacts-web": "*","ente-utils": "*",@@ -11364,6 +11365,7 @@"@mui/material": "9.3.1","@mui/x-date-pickers": "9.8.0","dayjs": "1.11.21",+ "ente-accounts-rs": "*","ente-base": "*","ente-gallery": "*","ente-utils": "*",diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsxindex 66d38f5c33..f3800bcf7e 100644--- a/web/packages/gallery/components/viewer/FileViewer.tsx+++ b/web/packages/gallery/components/viewer/FileViewer.tsx@@ -20,7 +20,7 @@ import {Typography,type ModalProps,} from "@mui/material";-import type { LocalUser } from "ente-accounts/services/user";+import type { LocalUser } from "ente-accounts-rs/services/user";import { isDesktop } from "ente-base/app";import { SpacedRow } from "ente-base/components/containers";import { InlineErrorIndicator } from "ente-base/components/ErrorIndicator";diff --git a/web/packages/gallery/package.json b/web/packages/gallery/package.jsonindex dd2d852cad..ba1fc8ccf7 100644--- a/web/packages/gallery/package.json+++ b/web/packages/gallery/package.json@@ -7,6 +7,7 @@"@hugeicons/core-free-icons": "1.2.1","@hugeicons/react": "1.1.6","bs58": "6.0.0",+ "ente-accounts-rs": "*","ente-base": "*","ente-contacts-web": "*","ente-utils": "*",diff --git a/web/packages/gallery/services/video.ts b/web/packages/gallery/services/video.tsindex 7c75cc25b2..71f3442c74 100644--- a/web/packages/gallery/services/video.ts+++ b/web/packages/gallery/services/video.ts@@ -1,4 +1,4 @@-import { ensureLocalUser } from "ente-accounts/services/user";+import { ensureLocalUser } from "ente-accounts-rs/services/user";import { isDesktop } from "ente-base/app";import { assertionFailed } from "ente-base/assert";import { decryptBlobBytes, encryptBlob } from "ente-base/crypto";diff --git a/web/packages/new/package.json b/web/packages/new/package.jsonindex e1621736bc..1281ac41d8 100644--- a/web/packages/new/package.json+++ b/web/packages/new/package.json@@ -6,6 +6,7 @@"@mui/material": "9.3.1","@mui/x-date-pickers": "9.8.0","dayjs": "1.11.21",+ "ente-accounts-rs": "*","ente-base": "*","ente-gallery": "*","ente-utils": "*",diff --git a/web/packages/new/photos/services/collection.ts b/web/packages/new/photos/services/collection.tsindex bb5b0adcb7..9cd44a8ac6 100644--- a/web/packages/new/photos/services/collection.ts+++ b/web/packages/new/photos/services/collection.ts@@ -1,4 +1,4 @@-import { ensureLocalUser } from "ente-accounts/services/user";+import { ensureLocalUser } from "ente-accounts-rs/services/user";import { blobCache } from "ente-base/blob-cache";import {boxSeal,diff --git a/web/packages/new/photos/services/ml/index.ts b/web/packages/new/photos/services/ml/index.tsindex 0dd73d5a88..1aed90a9cc 100644--- a/web/packages/new/photos/services/ml/index.ts+++ b/web/packages/new/photos/services/ml/index.ts@@ -1,5 +1,5 @@import { proxy, transfer } from "comlink";-import { ensureLocalUser } from "ente-accounts/services/user";+import { ensureLocalUser } from "ente-accounts-rs/services/user";import { isDesktop } from "ente-base/app";import { blobCache } from "ente-base/blob-cache";import { ensureElectron } from "ente-base/electron";diff --git a/web/packages/new/photos/services/search/index.ts b/web/packages/new/photos/services/search/index.tsindex 49a79c4f3f..ca80bc80fd 100644--- a/web/packages/new/photos/services/search/index.ts+++ b/web/packages/new/photos/services/search/index.ts@@ -1,4 +1,4 @@-import { ensureLocalUser } from "ente-accounts/services/user";+import { ensureLocalUser } from "ente-accounts-rs/services/user";import log from "ente-base/log";import { ensureMasterKeyFromSession } from "ente-base/session";import { ComlinkWorker } from "ente-base/worker/comlink-worker";diff --git a/web/packages/new/photos/services/user-details.ts b/web/packages/new/photos/services/user-details.tsindex 895cf68e4f..96a6effbab 100644--- a/web/packages/new/photos/services/user-details.ts+++ b/web/packages/new/photos/services/user-details.ts@@ -1,5 +1,5 @@-import { updateSavedLocalUser } from "ente-accounts/services/accounts-db";-import { ensureLocalUser } from "ente-accounts/services/user";+import { updateSavedLocalUser } from "ente-accounts-rs/services/accounts-db";+import { ensureLocalUser } from "ente-accounts-rs/services/user";import { isDesktop } from "ente-base/app";import { authenticatedRequestHeaders, ensureOk } from "ente-base/http";import { getKV, setKV } from "ente-base/kv";diff --git a/web/packages/new/photos/services/user.ts b/web/packages/new/photos/services/user.tsindex 4d3fc0c362..7df70c918b 100644--- a/web/packages/new/photos/services/user.ts+++ b/web/packages/new/photos/services/user.ts@@ -1,4 +1,4 @@-import { ensureSavedKeyAttributes } from "ente-accounts/services/user";+import { ensureSavedKeyAttributes } from "ente-accounts-rs/services/user";import { boxSealOpenBytes, decryptBox } from "ente-base/crypto";import type { KeyPair } from "ente-base/crypto/types";import { authenticatedRequestHeaders, ensureOk } from "ente-base/http";