Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

chore(web):rename-accounts-rs-to-accounts

Aswin Asoka2da9445fb7e
diff --git a/web/apps/accounts/package.json b/web/apps/accounts/package.json
index bc1955dd88..86b20e7a53 100644
--- a/web/apps/accounts/package.json
+++ b/web/apps/accounts/package.json
@@ -3,7 +3,7 @@
"version": "0.0.0",
"private": true,
"dependencies": {
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*"
},
"devDependencies": {
diff --git a/web/apps/accounts/src/pages/family.tsx b/web/apps/accounts/src/pages/family.tsx
index e0bc52cf76..1172f2baee 100644
--- a/web/apps/accounts/src/pages/family.tsx
+++ b/web/apps/accounts/src/pages/family.tsx
@@ -4,7 +4,7 @@ import {
type FamilyInviteInfo,
} from "@/services/family";
import { Box, Stack, Typography } from "@mui/material";
-import { AccountsPageContents } from "ente-accounts-rs/components/layouts/centered-paper";
+import { AccountsPageContents } from "ente-accounts/components/layouts/centered-paper";
import { ActivityIndicator } from "ente-base/components/mui/ActivityIndicator";
import { FocusVisibleButton } from "ente-base/components/mui/FocusVisibleButton";
import { LoadingButton } from "ente-base/components/mui/LoadingButton";
diff --git a/web/apps/accounts/src/pages/passkeys/verify.tsx b/web/apps/accounts/src/pages/passkeys/verify.tsx
index 59480deb46..a857d9a343 100644
--- a/web/apps/accounts/src/pages/passkeys/verify.tsx
+++ b/web/apps/accounts/src/pages/passkeys/verify.tsx
@@ -12,7 +12,7 @@ import {
import InfoIcon from "@mui/icons-material/Info";
import KeyIcon from "@mui/icons-material/Key";
import { Paper, Stack, Typography, styled } from "@mui/material";
-import { TwoFactorAuthorizationResponse } from "ente-accounts-rs/services/user";
+import { TwoFactorAuthorizationResponse } from "ente-accounts/services/user";
import { CenteredFill } 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/accounts/src/pages/recover-account.tsx b/web/apps/accounts/src/pages/recover-account.tsx
index 86299611e9..54503289cd 100644
--- a/web/apps/accounts/src/pages/recover-account.tsx
+++ b/web/apps/accounts/src/pages/recover-account.tsx
@@ -6,7 +6,7 @@ import {
} from "@/services/account-recovery";
import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
import { Box, Stack, Typography } from "@mui/material";
-import { AccountsPageContents } from "ente-accounts-rs/components/layouts/centered-paper";
+import { AccountsPageContents } from "ente-accounts/components/layouts/centered-paper";
import { ActivityIndicator } from "ente-base/components/mui/ActivityIndicator";
import { FocusVisibleButton } from "ente-base/components/mui/FocusVisibleButton";
import { LoadingButton } from "ente-base/components/mui/LoadingButton";
diff --git a/web/apps/accounts/src/services/passkey.ts b/web/apps/accounts/src/services/passkey.ts
index 9359a4afd9..7645717d90 100644
--- a/web/apps/accounts/src/services/passkey.ts
+++ b/web/apps/accounts/src/services/passkey.ts
@@ -1,4 +1,4 @@
-import { TwoFactorAuthorizationResponse } from "ente-accounts-rs/services/user";
+import { TwoFactorAuthorizationResponse } from "ente-accounts/services/user";
import { clientPackageName } from "ente-base/app";
import {
fromB64URLSafeNoPadding,
diff --git a/web/apps/auth/package.json b/web/apps/auth/package.json
index 3a34081371..e561031ccc 100644
--- a/web/apps/auth/package.json
+++ b/web/apps/auth/package.json
@@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"@noble/hashes": "2.2.0",
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*",
"otpauth": "9.5.1"
},
diff --git a/web/apps/auth/src/pages/_app.tsx b/web/apps/auth/src/pages/_app.tsx
index a5ac4ced76..7733f17857 100644
--- a/web/apps/auth/src/pages/_app.tsx
+++ b/web/apps/auth/src/pages/_app.tsx
@@ -1,8 +1,8 @@
import "@fontsource-variable/inter";
import { CssBaseline } from "@mui/material";
import { ThemeProvider } from "@mui/material/styles";
-import { savedLocalUser } from "ente-accounts-rs/services/accounts-db";
-import { accountLogout } from "ente-accounts-rs/services/logout";
+import { savedLocalUser } from "ente-accounts/services/accounts-db";
+import { accountLogout } from "ente-accounts/services/logout";
import { staticAppTitle } from "ente-base/app";
import { CustomHead } from "ente-base/components/Head";
import {
diff --git a/web/apps/auth/src/pages/auth.tsx b/web/apps/auth/src/pages/auth.tsx
index 28ca10cb15..673885c54a 100644
--- a/web/apps/auth/src/pages/auth.tsx
+++ b/web/apps/auth/src/pages/auth.tsx
@@ -14,9 +14,9 @@ import {
useTheme,
} from "@mui/material";
import { useColorScheme } from "@mui/material/styles";
-import { sessionExpiredDialogAttributes } from "ente-accounts-rs/components/utils/dialog";
-import { stashRedirect } from "ente-accounts-rs/services/redirect";
-import { masterKeyFromSession } from "ente-accounts-rs/services/session-storage";
+import { sessionExpiredDialogAttributes } from "ente-accounts/components/utils/dialog";
+import { stashRedirect } from "ente-accounts/services/redirect";
+import { masterKeyFromSession } from "ente-accounts/services/session-storage";
import { EnteLogo } from "ente-base/components/EnteLogo";
import { LoadingIndicator } from "ente-base/components/loaders";
import { FocusVisibleButton } from "ente-base/components/mui/FocusVisibleButton";
diff --git a/web/apps/auth/src/pages/change-password.tsx b/web/apps/auth/src/pages/change-password.tsx
index a90174521a..0e494377ee 100644
--- a/web/apps/auth/src/pages/change-password.tsx
+++ b/web/apps/auth/src/pages/change-password.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/change-password";
+export { default } from "ente-accounts/pages/change-password";
diff --git a/web/apps/auth/src/pages/credentials.tsx b/web/apps/auth/src/pages/credentials.tsx
index 54278a0282..9b8df2e13d 100644
--- a/web/apps/auth/src/pages/credentials.tsx
+++ b/web/apps/auth/src/pages/credentials.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/credentials";
+export { default } from "ente-accounts/pages/credentials";
diff --git a/web/apps/auth/src/pages/generate.tsx b/web/apps/auth/src/pages/generate.tsx
index 54710e2994..670ed3e823 100644
--- a/web/apps/auth/src/pages/generate.tsx
+++ b/web/apps/auth/src/pages/generate.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/generate";
+export { default } from "ente-accounts/pages/generate";
diff --git a/web/apps/auth/src/pages/login.tsx b/web/apps/auth/src/pages/login.tsx
index 012a3dd890..846da93856 100644
--- a/web/apps/auth/src/pages/login.tsx
+++ b/web/apps/auth/src/pages/login.tsx
@@ -1,6 +1,6 @@
import { Paper, Stack, styled } from "@mui/material";
-import { LoginContents } from "ente-accounts-rs/components/LoginContents";
-import { savedPartialLocalUser } from "ente-accounts-rs/services/accounts-db";
+import { LoginContents } from "ente-accounts/components/LoginContents";
+import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";
import { CenteredFill } from "ente-base/components/containers";
import { EnteLogo } from "ente-base/components/EnteLogo";
import { LoadingIndicator } from "ente-base/components/loaders";
diff --git a/web/apps/auth/src/pages/passkeys/finish.tsx b/web/apps/auth/src/pages/passkeys/finish.tsx
index 44678c882d..88c2314928 100644
--- a/web/apps/auth/src/pages/passkeys/finish.tsx
+++ b/web/apps/auth/src/pages/passkeys/finish.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/passkeys/finish";
+export { default } from "ente-accounts/pages/passkeys/finish";
diff --git a/web/apps/auth/src/pages/passkeys/recover.tsx b/web/apps/auth/src/pages/passkeys/recover.tsx
index f4539280c6..972142211c 100644
--- a/web/apps/auth/src/pages/passkeys/recover.tsx
+++ b/web/apps/auth/src/pages/passkeys/recover.tsx
@@ -1,4 +1,4 @@
-import Page_ from "ente-accounts-rs/pages/two-factor/recover";
+import Page_ from "ente-accounts/pages/two-factor/recover";
const Page = () => <Page_ twoFactorType="passkey" />;
diff --git a/web/apps/auth/src/pages/recover.tsx b/web/apps/auth/src/pages/recover.tsx
index 4793539fa6..eb6a74c593 100644
--- a/web/apps/auth/src/pages/recover.tsx
+++ b/web/apps/auth/src/pages/recover.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/recover";
+export { default } from "ente-accounts/pages/recover";
diff --git a/web/apps/auth/src/pages/signup.tsx b/web/apps/auth/src/pages/signup.tsx
index ad006c980d..fa3c32852a 100644
--- a/web/apps/auth/src/pages/signup.tsx
+++ b/web/apps/auth/src/pages/signup.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/signup";
+export { default } from "ente-accounts/pages/signup";
diff --git a/web/apps/auth/src/pages/two-factor/recover.tsx b/web/apps/auth/src/pages/two-factor/recover.tsx
index 9182186db6..201393276a 100644
--- a/web/apps/auth/src/pages/two-factor/recover.tsx
+++ b/web/apps/auth/src/pages/two-factor/recover.tsx
@@ -1,4 +1,4 @@
-import Page_ from "ente-accounts-rs/pages/two-factor/recover";
+import Page_ from "ente-accounts/pages/two-factor/recover";
const Page = () => <Page_ twoFactorType="totp" />;
diff --git a/web/apps/auth/src/pages/two-factor/setup.tsx b/web/apps/auth/src/pages/two-factor/setup.tsx
index 0a1f8d86b9..7f9adb38e6 100644
--- a/web/apps/auth/src/pages/two-factor/setup.tsx
+++ b/web/apps/auth/src/pages/two-factor/setup.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/two-factor/setup";
+export { default } from "ente-accounts/pages/two-factor/setup";
diff --git a/web/apps/auth/src/pages/two-factor/verify.tsx b/web/apps/auth/src/pages/two-factor/verify.tsx
index b5f8497ad3..f3f3c99656 100644
--- a/web/apps/auth/src/pages/two-factor/verify.tsx
+++ b/web/apps/auth/src/pages/two-factor/verify.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/two-factor/verify";
+export { default } from "ente-accounts/pages/two-factor/verify";
diff --git a/web/apps/auth/src/pages/verify.tsx b/web/apps/auth/src/pages/verify.tsx
index 4c231f052e..7ec623fac9 100644
--- a/web/apps/auth/src/pages/verify.tsx
+++ b/web/apps/auth/src/pages/verify.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/verify";
+export { default } from "ente-accounts/pages/verify";
diff --git a/web/apps/embed/package.json b/web/apps/embed/package.json
index bcbefa0336..71c972496d 100644
--- a/web/apps/embed/package.json
+++ b/web/apps/embed/package.json
@@ -3,7 +3,7 @@
"version": "0.0.0",
"private": true,
"dependencies": {
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*",
"ente-gallery": "*",
"ente-media": "*",
diff --git a/web/apps/embed/src/components/EmbedPasswordForm.tsx b/web/apps/embed/src/components/EmbedPasswordForm.tsx
index dd5e10f740..657bd13911 100644
--- a/web/apps/embed/src/components/EmbedPasswordForm.tsx
+++ b/web/apps/embed/src/components/EmbedPasswordForm.tsx
@@ -2,7 +2,7 @@ import { Stack, Typography } from "@mui/material";
import {
AccountsPageContents,
AccountsPageTitle,
-} from "ente-accounts-rs/components/layouts/centered-paper";
+} from "ente-accounts/components/layouts/centered-paper";
import {
SingleInputForm,
type SingleInputFormProps,
diff --git a/web/apps/legacy/package.json b/web/apps/legacy/package.json
index 773aa8a2ca..8974f3b125 100644
--- a/web/apps/legacy/package.json
+++ b/web/apps/legacy/package.json
@@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"@mui/icons-material": "9.3.1",
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*",
"ente-wasm": "*",
"pdfjs-dist": "6.2.108",
diff --git a/web/apps/legacy/src/pages/index.tsx b/web/apps/legacy/src/pages/index.tsx
index 126bf74882..0bd047a29a 100644
--- a/web/apps/legacy/src/pages/index.tsx
+++ b/web/apps/legacy/src/pages/index.tsx
@@ -14,7 +14,7 @@ import {
TextField,
Typography,
} from "@mui/material";
-import { isWeakPassword } from "ente-accounts-rs/utils/password";
+import { isWeakPassword } from "ente-accounts/utils/password";
import { EnteLogo } from "ente-base/components/EnteLogo";
import { LoadingButton } from "ente-base/components/mui/LoadingButton";
import { ShowHidePasswordInputAdornment } from "ente-base/components/mui/PasswordInputAdornment";
diff --git a/web/apps/locker/package.json b/web/apps/locker/package.json
index 30a5181249..de133cf2a1 100644
--- a/web/apps/locker/package.json
+++ b/web/apps/locker/package.json
@@ -5,7 +5,7 @@
"dependencies": {
"@hugeicons/core-free-icons": "1.2.1",
"@hugeicons/react": "1.1.6",
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*",
"ente-contacts-web": "*",
"ente-wasm": "*"
diff --git a/web/apps/locker/src/components/ItemList.tsx b/web/apps/locker/src/components/ItemList.tsx
index 50b28b7da4..4f192751e0 100644
--- a/web/apps/locker/src/components/ItemList.tsx
+++ b/web/apps/locker/src/components/ItemList.tsx
@@ -40,7 +40,7 @@ import {
Tooltip,
Typography,
} from "@mui/material";
-import { savedLocalUser } from "ente-accounts-rs/services/accounts-db";
+import { savedLocalUser } from "ente-accounts/services/accounts-db";
import {
OverflowMenu,
OverflowMenuOption,
diff --git a/web/apps/locker/src/components/LockerAccountDrawer.tsx b/web/apps/locker/src/components/LockerAccountDrawer.tsx
index c83fb418b4..209c3ec695 100644
--- a/web/apps/locker/src/components/LockerAccountDrawer.tsx
+++ b/web/apps/locker/src/components/LockerAccountDrawer.tsx
@@ -9,8 +9,8 @@ import {
import ChevronRightIcon from "@mui/icons-material/ChevronRight";
import NorthEastIcon from "@mui/icons-material/NorthEast";
import { Box, Stack, Typography, useTheme } from "@mui/material";
-import { RecoveryKey } from "ente-accounts-rs/components/RecoveryKey";
-import { openAccountsManagePasskeysPage } from "ente-accounts-rs/services/passkey";
+import { RecoveryKey } from "ente-accounts/components/RecoveryKey";
+import { openAccountsManagePasskeysPage } from "ente-accounts/services/passkey";
import { useBaseContext } from "ente-base/context";
import { t } from "i18next";
import { useRouter } from "next/router";
diff --git a/web/apps/locker/src/components/LockerAuthenticateUser.tsx b/web/apps/locker/src/components/LockerAuthenticateUser.tsx
index 30a4e31377..deac2ee2ab 100644
--- a/web/apps/locker/src/components/LockerAuthenticateUser.tsx
+++ b/web/apps/locker/src/components/LockerAuthenticateUser.tsx
@@ -1,11 +1,11 @@
-import { VerifyMasterPasswordForm } from "ente-accounts-rs/components/VerifyMasterPasswordForm";
-import { checkSessionValidity } from "ente-accounts-rs/services/session";
+import { VerifyMasterPasswordForm } from "ente-accounts/components/VerifyMasterPasswordForm";
+import { checkSessionValidity } from "ente-accounts/services/session";
import {
ensureLocalUser,
ensureSavedKeyAttributes,
type KeyAttributes,
type LocalUser,
-} from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/user";
import {
TitledMiniDialog,
type MiniDialogAttributes,
diff --git a/web/apps/locker/src/components/LockerCollectionShareDrawer.tsx b/web/apps/locker/src/components/LockerCollectionShareDrawer.tsx
index a941a7d962..3b187b765f 100644
--- a/web/apps/locker/src/components/LockerCollectionShareDrawer.tsx
+++ b/web/apps/locker/src/components/LockerCollectionShareDrawer.tsx
@@ -20,8 +20,8 @@ import {
TextField,
Typography,
} from "@mui/material";
-import { savedLocalUser } from "ente-accounts-rs/services/accounts-db";
-import { masterKeyFromSession } from "ente-accounts-rs/services/session-storage";
+import { savedLocalUser } from "ente-accounts/services/accounts-db";
+import { masterKeyFromSession } from "ente-accounts/services/session-storage";
import {
OverflowMenu,
OverflowMenuOption,
diff --git a/web/apps/locker/src/components/LockerSessionsDrawer.tsx b/web/apps/locker/src/components/LockerSessionsDrawer.tsx
index e7d743f628..2234566b9e 100644
--- a/web/apps/locker/src/components/LockerSessionsDrawer.tsx
+++ b/web/apps/locker/src/components/LockerSessionsDrawer.tsx
@@ -9,12 +9,12 @@ import {
Stack,
Typography,
} from "@mui/material";
-import { sessionExpiredDialogAttributes } from "ente-accounts-rs/components/utils/dialog";
+import { sessionExpiredDialogAttributes } from "ente-accounts/components/utils/dialog";
import {
getActiveSessions,
terminateSession,
type Session,
-} from "ente-accounts-rs/services/sessions";
+} from "ente-accounts/services/sessions";
import { RowButton, RowButtonGroup } from "ente-base/components/RowButton";
import { useBaseContext } from "ente-base/context";
import { isHTTP401Error } from "ente-base/http";
diff --git a/web/apps/locker/src/components/LockerTwoFactorDrawer.tsx b/web/apps/locker/src/components/LockerTwoFactorDrawer.tsx
index 9ebab6ca8f..1e5371c6d1 100644
--- a/web/apps/locker/src/components/LockerTwoFactorDrawer.tsx
+++ b/web/apps/locker/src/components/LockerTwoFactorDrawer.tsx
@@ -1,11 +1,11 @@
import LockIcon from "@mui/icons-material/Lock";
import { CircularProgress, Stack, Typography } from "@mui/material";
-import { sessionExpiredDialogAttributes } from "ente-accounts-rs/components/utils/dialog";
-import { updateSavedLocalUser } from "ente-accounts-rs/services/accounts-db";
+import { sessionExpiredDialogAttributes } from "ente-accounts/components/utils/dialog";
+import { updateSavedLocalUser } from "ente-accounts/services/accounts-db";
import {
disableTwoFactor,
getTwoFactorStatus,
-} from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/user";
import {
RowButton,
RowButtonGroup,
diff --git a/web/apps/locker/src/components/createItemDialog/useCreateItemDialogState.ts b/web/apps/locker/src/components/createItemDialog/useCreateItemDialogState.ts
index d6a1fc2769..5d83149c44 100644
--- a/web/apps/locker/src/components/createItemDialog/useCreateItemDialogState.ts
+++ b/web/apps/locker/src/components/createItemDialog/useCreateItemDialogState.ts
@@ -20,7 +20,7 @@ import {
isUncategorizedCollection,
visibleLockerCollections,
} from "@/types";
-import { savedLocalUser } from "ente-accounts-rs/services/accounts-db";
+import { savedLocalUser } from "ente-accounts/services/accounts-db";
import log from "ente-base/log";
import { t } from "i18next";
import type { ChangeEvent } from "react";
diff --git a/web/apps/locker/src/components/lockerPage/useLockerActions.tsx b/web/apps/locker/src/components/lockerPage/useLockerActions.tsx
index 8b3a2a191a..26e7bdf064 100644
--- a/web/apps/locker/src/components/lockerPage/useLockerActions.tsx
+++ b/web/apps/locker/src/components/lockerPage/useLockerActions.tsx
@@ -34,7 +34,7 @@ import type {
} from "@/types";
import { getItemTitle, isCollectionOwner } from "@/types";
import { Box } from "@mui/material";
-import { savedLocalUser } from "ente-accounts-rs/services/accounts-db";
+import { savedLocalUser } from "ente-accounts/services/accounts-db";
import type { MiniDialogAttributes } from "ente-base/components/MiniDialog";
import log from "ente-base/log";
import { t } from "i18next";
diff --git a/web/apps/locker/src/components/lockerPage/useLockerData.ts b/web/apps/locker/src/components/lockerPage/useLockerData.ts
index 14e911c54e..d70d26d127 100644
--- a/web/apps/locker/src/components/lockerPage/useLockerData.ts
+++ b/web/apps/locker/src/components/lockerPage/useLockerData.ts
@@ -5,15 +5,15 @@ import {
} from "@/services/locker-limits";
import { loadPersistedLockerState, syncLockerState } from "@/services/remote";
import type { LockerCollection, LockerItem } from "@/types";
-import { sessionExpiredDialogAttributes } from "ente-accounts-rs/components/utils/dialog";
+import { sessionExpiredDialogAttributes } from "ente-accounts/components/utils/dialog";
import {
isSavedUserTokenMismatch,
savedLocalUser,
savedPartialLocalUser,
-} from "ente-accounts-rs/services/accounts-db";
-import { stashRedirect } from "ente-accounts-rs/services/redirect";
-import { masterKeyFromSession } from "ente-accounts-rs/services/session-storage";
-import { ensureLocalUser } from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/accounts-db";
+import { stashRedirect } from "ente-accounts/services/redirect";
+import { masterKeyFromSession } from "ente-accounts/services/session-storage";
+import { ensureLocalUser } from "ente-accounts/services/user";
import type { MiniDialogAttributes } from "ente-base/components/MiniDialog";
import {
authenticatedRequestHeaders,
diff --git a/web/apps/locker/src/pages/_app.tsx b/web/apps/locker/src/pages/_app.tsx
index 4f546d6273..5795841e93 100644
--- a/web/apps/locker/src/pages/_app.tsx
+++ b/web/apps/locker/src/pages/_app.tsx
@@ -6,7 +6,7 @@ import { ThemeProvider } from "@mui/material/styles";
import {
isSavedUserTokenMismatch,
savedLocalUser,
-} from "ente-accounts-rs/services/accounts-db";
+} from "ente-accounts/services/accounts-db";
import {
LoadingIndicator,
TranslucentLoadingOverlay,
diff --git a/web/apps/locker/src/pages/change-email.tsx b/web/apps/locker/src/pages/change-email.tsx
index 7371c63400..bca5c94728 100644
--- a/web/apps/locker/src/pages/change-email.tsx
+++ b/web/apps/locker/src/pages/change-email.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/change-email";
+export { default } from "ente-accounts/pages/change-email";
diff --git a/web/apps/locker/src/pages/change-password.tsx b/web/apps/locker/src/pages/change-password.tsx
index a90174521a..0e494377ee 100644
--- a/web/apps/locker/src/pages/change-password.tsx
+++ b/web/apps/locker/src/pages/change-password.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/change-password";
+export { default } from "ente-accounts/pages/change-password";
diff --git a/web/apps/locker/src/pages/credentials.tsx b/web/apps/locker/src/pages/credentials.tsx
index 54278a0282..9b8df2e13d 100644
--- a/web/apps/locker/src/pages/credentials.tsx
+++ b/web/apps/locker/src/pages/credentials.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/credentials";
+export { default } from "ente-accounts/pages/credentials";
diff --git a/web/apps/locker/src/pages/generate.tsx b/web/apps/locker/src/pages/generate.tsx
index 54710e2994..670ed3e823 100644
--- a/web/apps/locker/src/pages/generate.tsx
+++ b/web/apps/locker/src/pages/generate.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/generate";
+export { default } from "ente-accounts/pages/generate";
diff --git a/web/apps/locker/src/pages/login.tsx b/web/apps/locker/src/pages/login.tsx
index e017c7e9b3..701522786e 100644
--- a/web/apps/locker/src/pages/login.tsx
+++ b/web/apps/locker/src/pages/login.tsx
@@ -1,6 +1,6 @@
import { Paper, Stack, styled } from "@mui/material";
-import { LoginContents } from "ente-accounts-rs/components/LoginContents";
-import { savedPartialLocalUser } from "ente-accounts-rs/services/accounts-db";
+import { LoginContents } from "ente-accounts/components/LoginContents";
+import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";
import { CenteredFill } from "ente-base/components/containers";
import { EnteLogo } from "ente-base/components/EnteLogo";
import { LoadingIndicator } from "ente-base/components/loaders";
diff --git a/web/apps/locker/src/pages/passkeys/finish.tsx b/web/apps/locker/src/pages/passkeys/finish.tsx
index 44678c882d..88c2314928 100644
--- a/web/apps/locker/src/pages/passkeys/finish.tsx
+++ b/web/apps/locker/src/pages/passkeys/finish.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/passkeys/finish";
+export { default } from "ente-accounts/pages/passkeys/finish";
diff --git a/web/apps/locker/src/pages/passkeys/recover.tsx b/web/apps/locker/src/pages/passkeys/recover.tsx
index f4539280c6..972142211c 100644
--- a/web/apps/locker/src/pages/passkeys/recover.tsx
+++ b/web/apps/locker/src/pages/passkeys/recover.tsx
@@ -1,4 +1,4 @@
-import Page_ from "ente-accounts-rs/pages/two-factor/recover";
+import Page_ from "ente-accounts/pages/two-factor/recover";
const Page = () => <Page_ twoFactorType="passkey" />;
diff --git a/web/apps/locker/src/pages/recover.tsx b/web/apps/locker/src/pages/recover.tsx
index 4793539fa6..eb6a74c593 100644
--- a/web/apps/locker/src/pages/recover.tsx
+++ b/web/apps/locker/src/pages/recover.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/recover";
+export { default } from "ente-accounts/pages/recover";
diff --git a/web/apps/locker/src/pages/signup.tsx b/web/apps/locker/src/pages/signup.tsx
index ad006c980d..fa3c32852a 100644
--- a/web/apps/locker/src/pages/signup.tsx
+++ b/web/apps/locker/src/pages/signup.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/signup";
+export { default } from "ente-accounts/pages/signup";
diff --git a/web/apps/locker/src/pages/two-factor/recover.tsx b/web/apps/locker/src/pages/two-factor/recover.tsx
index 9182186db6..201393276a 100644
--- a/web/apps/locker/src/pages/two-factor/recover.tsx
+++ b/web/apps/locker/src/pages/two-factor/recover.tsx
@@ -1,4 +1,4 @@
-import Page_ from "ente-accounts-rs/pages/two-factor/recover";
+import Page_ from "ente-accounts/pages/two-factor/recover";
const Page = () => <Page_ twoFactorType="totp" />;
diff --git a/web/apps/locker/src/pages/two-factor/setup.tsx b/web/apps/locker/src/pages/two-factor/setup.tsx
index 0a1f8d86b9..7f9adb38e6 100644
--- a/web/apps/locker/src/pages/two-factor/setup.tsx
+++ b/web/apps/locker/src/pages/two-factor/setup.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/two-factor/setup";
+export { default } from "ente-accounts/pages/two-factor/setup";
diff --git a/web/apps/locker/src/pages/two-factor/verify.tsx b/web/apps/locker/src/pages/two-factor/verify.tsx
index b5f8497ad3..f3f3c99656 100644
--- a/web/apps/locker/src/pages/two-factor/verify.tsx
+++ b/web/apps/locker/src/pages/two-factor/verify.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/two-factor/verify";
+export { default } from "ente-accounts/pages/two-factor/verify";
diff --git a/web/apps/locker/src/pages/verify.tsx b/web/apps/locker/src/pages/verify.tsx
index 4c231f052e..7ec623fac9 100644
--- a/web/apps/locker/src/pages/verify.tsx
+++ b/web/apps/locker/src/pages/verify.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/verify";
+export { default } from "ente-accounts/pages/verify";
diff --git a/web/apps/locker/src/services/locker-db.ts b/web/apps/locker/src/services/locker-db.ts
index 1d9b017145..8bab79a923 100644
--- a/web/apps/locker/src/services/locker-db.ts
+++ b/web/apps/locker/src/services/locker-db.ts
@@ -1,4 +1,4 @@
-import { ensureLocalUser } from "ente-accounts-rs/services/user";
+import { ensureLocalUser } from "ente-accounts/services/user";
import log from "ente-base/log";
import { deleteDB, openDB, type DBSchema, type IDBPDatabase } from "idb";
import type {
diff --git a/web/apps/locker/src/services/logout.ts b/web/apps/locker/src/services/logout.ts
index 4ea61bcdc1..2e3495d8c9 100644
--- a/web/apps/locker/src/services/logout.ts
+++ b/web/apps/locker/src/services/logout.ts
@@ -1,5 +1,5 @@
-import { savedLocalUser } from "ente-accounts-rs/services/accounts-db";
-import { accountLogout } from "ente-accounts-rs/services/logout";
+import { savedLocalUser } from "ente-accounts/services/accounts-db";
+import { accountLogout } from "ente-accounts/services/logout";
import log from "ente-base/log";
import { clearLockerDB } from "./locker-db";
import { clearLockerCache } from "./remote-cache";
diff --git a/web/apps/locker/src/services/remote-collection-sharing.ts b/web/apps/locker/src/services/remote-collection-sharing.ts
index 8c00cdccb0..631281b374 100644
--- a/web/apps/locker/src/services/remote-collection-sharing.ts
+++ b/web/apps/locker/src/services/remote-collection-sharing.ts
@@ -1,5 +1,5 @@
import type { LockerCollectionParticipant } from "@/types";
-import { getPublicKey } from "ente-accounts-rs/services/user";
+import { getPublicKey } from "ente-accounts/services/user";
import { authenticatedRequestHeaders, ensureOk } from "ente-base/http";
import { apiURL } from "ente-base/origins";
import { z } from "zod";
diff --git a/web/apps/locker/src/services/remote-read.ts b/web/apps/locker/src/services/remote-read.ts
index b3051f4af5..358335dd50 100644
--- a/web/apps/locker/src/services/remote-read.ts
+++ b/web/apps/locker/src/services/remote-read.ts
@@ -6,7 +6,7 @@ import type {
import {
ensureLocalUser,
ensureUserKeyPair,
-} from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/user";
import { fetchFile } from "ente-base/file-download";
import { authenticatedRequestHeaders, ensureOk } from "ente-base/http";
import log from "ente-base/log";
diff --git a/web/apps/locker/src/services/remote.ts b/web/apps/locker/src/services/remote.ts
index 43e9f074bb..e038daf29a 100644
--- a/web/apps/locker/src/services/remote.ts
+++ b/web/apps/locker/src/services/remote.ts
@@ -4,11 +4,11 @@ import type {
LockerItem,
LockerItemType,
} from "@/types";
-import { deriveInteractiveKey } from "ente-accounts-rs/services/crypto";
+import { deriveInteractiveKey } from "ente-accounts/services/crypto";
import {
ensureLocalUser,
ensureUserKeyPair,
-} from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/user";
import { authenticatedRequestHeaders, ensureOk } from "ente-base/http";
import log from "ente-base/log";
import { apiURL } from "ente-base/origins";
diff --git a/web/apps/photos/package.json b/web/apps/photos/package.json
index cd14801e4c..9031578781 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-rs": "*",
+ "ente-accounts": "*",
"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.tsx
index df8244d74b..eef702dc11 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-rs/components/VerifyMasterPasswordForm";
-import { checkSessionValidity } from "ente-accounts-rs/services/session";
+import { VerifyMasterPasswordForm } from "ente-accounts/components/VerifyMasterPasswordForm";
+import { checkSessionValidity } from "ente-accounts/services/session";
import {
ensureLocalUser,
ensureSavedKeyAttributes,
type KeyAttributes,
type LocalUser,
-} from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/user";
import {
TitledMiniDialog,
type MiniDialogAttributes,
diff --git a/web/apps/photos/src/components/Avatar.tsx b/web/apps/photos/src/components/Avatar.tsx
index 944023f481..d77dbfd105 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-rs/services/user";
+import type { LocalUser } from "ente-accounts/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.tsx
index 3fc43c8668..9e0dd5d9ca 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-rs/services/user";
+import { ensureLocalUser } from "ente-accounts/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.tsx
index 393ffacb5e..d850523492 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-rs/services/user";
+import { ensureLocalUser } from "ente-accounts/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.tsx
index f53b5f82e5..fe9e60f65e 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-rs/services/user";
+import type { LocalUser } from "ente-accounts/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.tsx
index 370326bafc..266022db02 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-rs/services/user";
+import type { LocalUser } from "ente-accounts/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.tsx
index fdcb9eddf4..6c037de2a3 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-rs/services/user";
+import type { LocalUser } from "ente-accounts/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.tsx
index 6464bc5276..9987ce3b16 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-rs/components/RecoveryKey";
-import { openAccountsManagePasskeysPage } from "ente-accounts-rs/services/passkey";
+import { RecoveryKey } from "ente-accounts/components/RecoveryKey";
+import { openAccountsManagePasskeysPage } from "ente-accounts/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.tsx
index 38e921a85e..3db3aa764b 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-rs/services/user";
+import type { LocalUser } from "ente-accounts/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.ts
index 1880a751ee..dad4b112c6 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-rs/services/recovery-key";
+import { getUserRecoveryKey } from "ente-accounts/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.ts
index bd0627c062..dae124c608 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-rs/services/user";
+import type { LocalUser } from "ente-accounts/services/user";
import {
groupFilesByCollectionID,
sortFiles,
diff --git a/web/apps/photos/src/components/sidebar/SessionsSettings.tsx b/web/apps/photos/src/components/sidebar/SessionsSettings.tsx
index 7b5ada16b4..77fc667c7d 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-rs/components/utils/dialog";
+import { sessionExpiredDialogAttributes } from "ente-accounts/components/utils/dialog";
import {
getActiveSessions,
terminateSession,
type Session,
-} from "ente-accounts-rs/services/sessions";
+} from "ente-accounts/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.tsx
index fcf1df90e9..6fd6207426 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-rs/services/accounts-db";
+} from "ente-accounts/services/accounts-db";
import {
RowButton,
RowButtonGroup,
diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index 0aa701161d..d80a146cb3 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-rs/services/accounts-db";
+} from "ente-accounts/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.tsx
index 7371c63400..bca5c94728 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-rs/pages/change-email";
+export { default } from "ente-accounts/pages/change-email";
diff --git a/web/apps/photos/src/pages/change-password.tsx b/web/apps/photos/src/pages/change-password.tsx
index a90174521a..0e494377ee 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-rs/pages/change-password";
+export { default } from "ente-accounts/pages/change-password";
diff --git a/web/apps/photos/src/pages/credentials.tsx b/web/apps/photos/src/pages/credentials.tsx
index 54278a0282..9b8df2e13d 100644
--- a/web/apps/photos/src/pages/credentials.tsx
+++ b/web/apps/photos/src/pages/credentials.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/credentials";
+export { default } from "ente-accounts/pages/credentials";
diff --git a/web/apps/photos/src/pages/duplicates.tsx b/web/apps/photos/src/pages/duplicates.tsx
index 39176a9696..f83bbd73d3 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-rs/components/utils/use-redirect";
+import { useRedirectIfNeedsCredentials } from "ente-accounts/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.tsx
index 4e9aef1199..e909fcf56f 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-rs/components/utils/dialog";
+import { sessionExpiredDialogAttributes } from "ente-accounts/components/utils/dialog";
import {
getAndClearIsFirstLogin,
getAndClearJustSignedUp,
-} 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";
+} 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";
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.tsx
index 54710e2994..670ed3e823 100644
--- a/web/apps/photos/src/pages/generate.tsx
+++ b/web/apps/photos/src/pages/generate.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/generate";
+export { default } from "ente-accounts/pages/generate";
diff --git a/web/apps/photos/src/pages/index.tsx b/web/apps/photos/src/pages/index.tsx
index bdba7ebc8f..e4ab20bb6a 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-rs/components/LoginContents";
-import { SignUpContents } from "ente-accounts-rs/components/SignUpContents";
-import { savedPartialLocalUser } from "ente-accounts-rs/services/accounts-db";
+import { LoginContents } from "ente-accounts/components/LoginContents";
+import { SignUpContents } from "ente-accounts/components/SignUpContents";
+import { savedPartialLocalUser } from "ente-accounts/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.tsx
index 7f2bc1737f..7a363382b9 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-rs/components/utils/use-redirect";
+import { useRedirectIfNeedsCredentials } from "ente-accounts/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.tsx
index 3b969447aa..675471334f 100644
--- a/web/apps/photos/src/pages/login.tsx
+++ b/web/apps/photos/src/pages/login.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/login";
+export { default } from "ente-accounts/pages/login";
diff --git a/web/apps/photos/src/pages/passkeys/finish.tsx b/web/apps/photos/src/pages/passkeys/finish.tsx
index 44678c882d..88c2314928 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-rs/pages/passkeys/finish";
+export { default } from "ente-accounts/pages/passkeys/finish";
diff --git a/web/apps/photos/src/pages/passkeys/recover.tsx b/web/apps/photos/src/pages/passkeys/recover.tsx
index f4539280c6..972142211c 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-rs/pages/two-factor/recover";
+import Page_ from "ente-accounts/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.tsx
index 4793539fa6..eb6a74c593 100644
--- a/web/apps/photos/src/pages/recover.tsx
+++ b/web/apps/photos/src/pages/recover.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/recover";
+export { default } from "ente-accounts/pages/recover";
diff --git a/web/apps/photos/src/pages/signup.tsx b/web/apps/photos/src/pages/signup.tsx
index ad006c980d..fa3c32852a 100644
--- a/web/apps/photos/src/pages/signup.tsx
+++ b/web/apps/photos/src/pages/signup.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/signup";
+export { default } from "ente-accounts/pages/signup";
diff --git a/web/apps/photos/src/pages/two-factor/recover.tsx b/web/apps/photos/src/pages/two-factor/recover.tsx
index 9182186db6..201393276a 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-rs/pages/two-factor/recover";
+import Page_ from "ente-accounts/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.tsx
index 0a1f8d86b9..7f9adb38e6 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-rs/pages/two-factor/setup";
+export { default } from "ente-accounts/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.tsx
index b5f8497ad3..f3f3c99656 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-rs/pages/two-factor/verify";
+export { default } from "ente-accounts/pages/two-factor/verify";
diff --git a/web/apps/photos/src/pages/verify.tsx b/web/apps/photos/src/pages/verify.tsx
index 4c231f052e..7ec623fac9 100644
--- a/web/apps/photos/src/pages/verify.tsx
+++ b/web/apps/photos/src/pages/verify.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts-rs/pages/verify";
+export { default } from "ente-accounts/pages/verify";
diff --git a/web/apps/photos/src/services/dedup.ts b/web/apps/photos/src/services/dedup.ts
index 51c0639e62..8f0a5ffb96 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-rs/services/user";
+import { ensureLocalUser } from "ente-accounts/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.ts
index 5fb3dba45a..e101edb52b 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-rs/services/accounts-db";
+import { savedKeyAttributes } from "ente-accounts/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.ts
index 8d798aab6c..c84554d9e6 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-rs/services/user";
+import { ensureLocalUser } from "ente-accounts/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.ts
index 9902388354..138f6ccdbd 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-rs/services/logout";
+} from "ente-accounts/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.ts
index 5811418266..8830c2f213 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-rs/services/user";
+import { ensureLocalUser } from "ente-accounts/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/apps/space/package.json b/web/apps/space/package.json
index c1b946a964..05ff284984 100644
--- a/web/apps/space/package.json
+++ b/web/apps/space/package.json
@@ -10,7 +10,7 @@
"@fontsource/nunito": "5.2.7",
"@hugeicons/core-free-icons": "1.2.1",
"@hugeicons/react": "1.1.4",
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*",
"ente-media": "*",
"ente-space-wasm": "*",
diff --git a/web/apps/space/src/pages/passkeys/verify.tsx b/web/apps/space/src/pages/passkeys/verify.tsx
index 6509a5deef..4589d45ff5 100644
--- a/web/apps/space/src/pages/passkeys/verify.tsx
+++ b/web/apps/space/src/pages/passkeys/verify.tsx
@@ -1,7 +1,7 @@
import { SpacePageMeta } from "components/SpacePageMeta";
import { SpaceRouteFallback } from "components/SpaceRouteFallback";
-import { savedPartialLocalUser } from "ente-accounts-rs/services/accounts-db";
-import { openPasskeyVerificationURL } from "ente-accounts-rs/services/passkey";
+import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";
+import { openPasskeyVerificationURL } from "ente-accounts/services/passkey";
import log from "ente-base/log";
import React, { useEffect, useState } from "react";
import {
diff --git a/web/apps/space/src/pages/two-factor/verify.tsx b/web/apps/space/src/pages/two-factor/verify.tsx
index d22f159732..9cd4db182e 100644
--- a/web/apps/space/src/pages/two-factor/verify.tsx
+++ b/web/apps/space/src/pages/two-factor/verify.tsx
@@ -1,6 +1,6 @@
import { SpacePageMeta } from "components/SpacePageMeta";
import { SpaceRouteFallback } from "components/SpaceRouteFallback";
-import { savedPartialLocalUser } from "ente-accounts-rs/services/accounts-db";
+import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";
import { isHTTPErrorWithStatus } from "ente-base/http";
import log from "ente-base/log";
import React, { useEffect, useState } from "react";
diff --git a/web/apps/space/src/screens/CreateAccountScreen.tsx b/web/apps/space/src/screens/CreateAccountScreen.tsx
index 2a895eeefb..bb0caf08b7 100644
--- a/web/apps/space/src/screens/CreateAccountScreen.tsx
+++ b/web/apps/space/src/screens/CreateAccountScreen.tsx
@@ -4,7 +4,7 @@ import { SpaceButtonSpinner } from "components/SpaceButtonSpinner";
import {
estimatePasswordStrength,
type PasswordStrength,
-} from "ente-accounts-rs/utils/password";
+} from "ente-accounts/utils/password";
import React, { useId, useMemo, useState } from "react";
import { spaceTouchTargetSize } from "styles/touchTargets";
diff --git a/web/apps/space/src/services/spaceBootstrapAuth.ts b/web/apps/space/src/services/spaceBootstrapAuth.ts
index 856fa80a3e..f41bab8a3e 100644
--- a/web/apps/space/src/services/spaceBootstrapAuth.ts
+++ b/web/apps/space/src/services/spaceBootstrapAuth.ts
@@ -2,9 +2,9 @@ import {
boxSealOpenBytes,
decryptBox,
toB64URLSafe,
-} from "ente-accounts-rs/services/crypto";
-import type { SRPSetupAttributes } from "ente-accounts-rs/services/srp";
-import type { KeyAttributes } from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/crypto";
+import type { SRPSetupAttributes } from "ente-accounts/services/srp";
+import type { KeyAttributes } from "ente-accounts/services/user";
import { ensureOk, publicRequestHeaders } from "ente-base/http";
import { apiURL } from "ente-base/origins";
import { loadEnteWasm } from "ente-wasm/load";
diff --git a/web/apps/space/src/services/spaceFeedCache.ts b/web/apps/space/src/services/spaceFeedCache.ts
index d98cba7d5b..a177d88359 100644
--- a/web/apps/space/src/services/spaceFeedCache.ts
+++ b/web/apps/space/src/services/spaceFeedCache.ts
@@ -1,4 +1,4 @@
-import { savedPartialLocalUser } from "ente-accounts-rs/services/accounts-db";
+import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";
import { getKV, removeKV, setKV } from "ente-base/kv";
import log from "ente-base/log";
import { apiOrigin } from "ente-base/origins";
diff --git a/web/apps/space/src/services/spaceLogin.ts b/web/apps/space/src/services/spaceLogin.ts
index 1180ed0927..67154be16c 100644
--- a/web/apps/space/src/services/spaceLogin.ts
+++ b/web/apps/space/src/services/spaceLogin.ts
@@ -7,26 +7,26 @@ import {
saveOriginalKeyAttributes,
saveSRPAttributes,
updateSavedLocalUser,
-} from "ente-accounts-rs/services/accounts-db";
+} from "ente-accounts/services/accounts-db";
import {
decryptBox,
deriveKey,
fromB64URLSafeNoPadding,
-} from "ente-accounts-rs/services/crypto";
+} from "ente-accounts/services/crypto";
import {
checkPasskeyVerificationStatus,
clearInflightPasskeySessionID,
passkeySessionExpiredErrorMessage,
-} from "ente-accounts-rs/services/passkey";
+} from "ente-accounts/services/passkey";
import {
stashKeyEncryptionKeyInSessionStore,
unstashKeyEncryptionKeyFromSession,
-} from "ente-accounts-rs/services/session-storage";
+} from "ente-accounts/services/session-storage";
import {
getSRPAttributes,
srpVerificationUnauthorizedErrorMessage,
verifySRP,
-} from "ente-accounts-rs/services/srp";
+} from "ente-accounts/services/srp";
import {
type EmailOrSRPVerificationResponse,
generateAndSaveInteractiveKeyAttributes,
@@ -34,7 +34,7 @@ import {
TwoFactorAuthorizationResponse,
verifyEmail,
verifyTwoFactor,
-} from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/user";
import { clientPackageName } from "ente-base/app";
import { HTTPError } from "ente-base/http";
import log from "ente-base/log";
diff --git a/web/apps/space/src/services/spaceLogout.ts b/web/apps/space/src/services/spaceLogout.ts
index 2aa6fa8d9b..d9404b37fb 100644
--- a/web/apps/space/src/services/spaceLogout.ts
+++ b/web/apps/space/src/services/spaceLogout.ts
@@ -1,4 +1,4 @@
-import { accountLogout } from "ente-accounts-rs/services/logout";
+import { accountLogout } from "ente-accounts/services/logout";
import log from "ente-base/log";
import {
clearSpaceBrowserSession,
diff --git a/web/apps/space/src/services/spaceMediaCache.ts b/web/apps/space/src/services/spaceMediaCache.ts
index 9673b8a691..a0ecd82aa0 100644
--- a/web/apps/space/src/services/spaceMediaCache.ts
+++ b/web/apps/space/src/services/spaceMediaCache.ts
@@ -1,4 +1,4 @@
-import { savedPartialLocalUser } from "ente-accounts-rs/services/accounts-db";
+import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";
import { blobCache, clearBlobCache } from "ente-base/blob-cache";
import log from "ente-base/log";
import { apiOrigin } from "ente-base/origins";
diff --git a/web/apps/space/src/services/spacePersistentSession.ts b/web/apps/space/src/services/spacePersistentSession.ts
index 2a1938f739..44ed37045f 100644
--- a/web/apps/space/src/services/spacePersistentSession.ts
+++ b/web/apps/space/src/services/spacePersistentSession.ts
@@ -1,15 +1,15 @@
import {
replaceSavedLocalUser,
savedPartialLocalUser,
-} from "ente-accounts-rs/services/accounts-db";
+} from "ente-accounts/services/accounts-db";
import {
decryptBox,
encryptBox,
fromB64,
generateKey,
toB64,
-} from "ente-accounts-rs/services/crypto";
-import { accountLogout } from "ente-accounts-rs/services/logout";
+} from "ente-accounts/services/crypto";
+import { accountLogout } from "ente-accounts/services/logout";
import { ensureOk, publicRequestHeaders } from "ente-base/http";
import log from "ente-base/log";
import { apiURL } from "ente-base/origins";
diff --git a/web/apps/space/src/services/spaceProfile.ts b/web/apps/space/src/services/spaceProfile.ts
index 28640f1605..ec68697b05 100644
--- a/web/apps/space/src/services/spaceProfile.ts
+++ b/web/apps/space/src/services/spaceProfile.ts
@@ -1,4 +1,4 @@
-import { savedPartialLocalUser } from "ente-accounts-rs/services/accounts-db";
+import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";
import { clientPackageName, desktopAppVersion, isDesktop } from "ente-base/app";
import { apiOrigin, apiURL } from "ente-base/origins";
import type { SpaceAccountCtxHandle } from "ente-space-wasm";
diff --git a/web/apps/space/src/services/spaceSecureSessionStorage.ts b/web/apps/space/src/services/spaceSecureSessionStorage.ts
index 23a75fafb2..dc3c3365c2 100644
--- a/web/apps/space/src/services/spaceSecureSessionStorage.ts
+++ b/web/apps/space/src/services/spaceSecureSessionStorage.ts
@@ -1,4 +1,4 @@
-import { clearStashedKeyEncryptionKeyFromSession } from "ente-accounts-rs/services/session-storage";
+import { clearStashedKeyEncryptionKeyFromSession } from "ente-accounts/services/session-storage";
import { z } from "zod";
const windowNamePrefix = "ente-space-secure-session:";
diff --git a/web/apps/space/src/services/spaceSignup.ts b/web/apps/space/src/services/spaceSignup.ts
index f03b1c4793..6af4cb0353 100644
--- a/web/apps/space/src/services/spaceSignup.ts
+++ b/web/apps/space/src/services/spaceSignup.ts
@@ -9,18 +9,18 @@ import {
stashSRPSetupAttributes,
unstashAfterUseSRPSetupAttributes,
unstashReferralSource,
-} from "ente-accounts-rs/services/accounts-db";
+} from "ente-accounts/services/accounts-db";
import {
generateSRPSetupAttributes,
getAndSaveSRPAttributes,
-} from "ente-accounts-rs/services/srp";
+} from "ente-accounts/services/srp";
import {
generateAndSaveInteractiveKeyAttributes,
generateKeysAndAttributes,
sendOTT,
verifyEmail,
type KeyAttributes,
-} from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/user";
import { isMuseumHTTPError } from "ente-base/http";
import {
decryptSpaceBootstrapAuthToken,
diff --git a/web/package-lock.json b/web/package-lock.json
index c6f14663db..5c14f1f92b 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -23,7 +23,7 @@
"apps/accounts": {
"version": "0.0.0",
"dependencies": {
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*"
},
"devDependencies": {
@@ -111,7 +111,7 @@
"version": "0.0.0",
"dependencies": {
"@noble/hashes": "2.2.0",
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*",
"otpauth": "9.5.1"
},
@@ -146,7 +146,7 @@
"apps/embed": {
"version": "0.0.0",
"dependencies": {
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*",
"ente-gallery": "*",
"ente-media": "*",
@@ -211,7 +211,7 @@
"version": "0.0.0",
"dependencies": {
"@mui/icons-material": "9.3.1",
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*",
"ente-wasm": "*",
"pdfjs-dist": "6.2.108",
@@ -227,7 +227,7 @@
"dependencies": {
"@hugeicons/core-free-icons": "1.2.1",
"@hugeicons/react": "1.1.6",
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*",
"ente-contacts-web": "*",
"ente-wasm": "*"
@@ -289,7 +289,7 @@
"@mui/material": "9.3.1",
"chrono-node": "2.9.1",
"debounce": "2.2.0",
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*",
"ente-cast-wasm": "*",
"ente-contacts-web": "*",
@@ -340,7 +340,7 @@
"@fontsource/nunito": "5.2.7",
"@hugeicons/core-free-icons": "1.2.1",
"@hugeicons/react": "1.1.4",
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*",
"ente-media": "*",
"ente-space-wasm": "*",
@@ -4718,8 +4718,8 @@
"resolved": "apps/ensu",
"link": true
},
- "node_modules/ente-accounts-rs": {
- "resolved": "packages/accounts-rs",
+ "node_modules/ente-accounts": {
+ "resolved": "packages/accounts",
"link": true
},
"node_modules/ente-base": {
@@ -11153,8 +11153,8 @@
"integrity": "sha512-Bq0B+ixT/DMyG8kgX2xWcI5jUvCwqrMxSFam7m0lAf78nf04hv6lNCsyLYdyYTrCVMqNDY/206K7eExYCeSyUQ==",
"license": "MIT"
},
- "packages/accounts-rs": {
- "name": "ente-accounts-rs",
+ "packages/accounts": {
+ "name": "ente-accounts",
"version": "0.0.0",
"dependencies": {
"comlink": "4.4.2",
@@ -11244,7 +11244,7 @@
"dependencies": {
"@mui/icons-material": "9.3.1",
"@mui/material": "9.3.1",
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*",
"ente-wasm": "*",
"react": "19.2.7",
@@ -11264,7 +11264,7 @@
"@hugeicons/core-free-icons": "1.2.1",
"@hugeicons/react": "1.1.6",
"bs58": "6.0.0",
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*",
"ente-contacts-web": "*",
"ente-utils": "*",
@@ -11311,7 +11311,7 @@
"@mui/material": "9.3.1",
"@mui/x-date-pickers": "9.8.0",
"dayjs": "1.11.21",
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*",
"ente-gallery": "*",
"ente-utils": "*",
diff --git a/web/packages/accounts-rs/README.md b/web/packages/accounts/README.md
similarity index 78%
rename from web/packages/accounts-rs/README.md
rename to web/packages/accounts/README.md
index d8c68101e8..76c7951ce0 100644
--- a/web/packages/accounts-rs/README.md
+++ b/web/packages/accounts/README.md
@@ -1,3 +1,3 @@
-## ente-accounts-rs
+## ente-accounts
Shared web account flows backed by Rust cryptography through `ente-wasm`.
diff --git a/web/packages/accounts-rs/components/CodeBlock.tsx b/web/packages/accounts/components/CodeBlock.tsx
similarity index 100%
rename from web/packages/accounts-rs/components/CodeBlock.tsx
rename to web/packages/accounts/components/CodeBlock.tsx
diff --git a/web/packages/accounts-rs/components/LoginComponents.tsx b/web/packages/accounts/components/LoginComponents.tsx
similarity index 97%
rename from web/packages/accounts-rs/components/LoginComponents.tsx
rename to web/packages/accounts/components/LoginComponents.tsx
index d24efbf516..e432ceac63 100644
--- a/web/packages/accounts-rs/components/LoginComponents.tsx
+++ b/web/packages/accounts/components/LoginComponents.tsx
@@ -1,10 +1,10 @@
import { CircularProgress, Stack, Typography, styled } from "@mui/material";
-import { sessionExpiredDialogAttributes } from "ente-accounts-rs/components/utils/dialog";
+import { sessionExpiredDialogAttributes } from "ente-accounts/components/utils/dialog";
import {
checkPasskeyVerificationStatus,
passkeySessionExpiredErrorMessage,
saveCredentialsAndNavigateTo,
-} from "ente-accounts-rs/services/passkey";
+} from "ente-accounts/services/passkey";
import { LinkButton } from "ente-base/components/LinkButton";
import type { MiniDialogAttributes } from "ente-base/components/MiniDialog";
import { FocusVisibleButton } from "ente-base/components/mui/FocusVisibleButton";
diff --git a/web/packages/accounts-rs/components/LoginContents.tsx b/web/packages/accounts/components/LoginContents.tsx
similarity index 95%
rename from web/packages/accounts-rs/components/LoginContents.tsx
rename to web/packages/accounts/components/LoginContents.tsx
index dd4f8be92f..49ae97692e 100644
--- a/web/packages/accounts-rs/components/LoginContents.tsx
+++ b/web/packages/accounts/components/LoginContents.tsx
@@ -1,11 +1,11 @@
import { Input, Stack, TextField, Typography } from "@mui/material";
-import { AccountsPageFooter } from "ente-accounts-rs/components/layouts/centered-paper";
+import { AccountsPageFooter } from "ente-accounts/components/layouts/centered-paper";
import {
replaceSavedLocalUser,
saveSRPAttributes,
-} from "ente-accounts-rs/services/accounts-db";
-import { getSRPAttributes } from "ente-accounts-rs/services/srp";
-import { sendOTT } from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/accounts-db";
+import { getSRPAttributes } from "ente-accounts/services/srp";
+import { sendOTT } from "ente-accounts/services/user";
import { appName } from "ente-base/app";
import { LinkButton } from "ente-base/components/LinkButton";
import { LoadingButton } from "ente-base/components/mui/LoadingButton";
diff --git a/web/packages/accounts-rs/components/NewPasswordForm.tsx b/web/packages/accounts/components/NewPasswordForm.tsx
similarity index 98%
rename from web/packages/accounts-rs/components/NewPasswordForm.tsx
rename to web/packages/accounts/components/NewPasswordForm.tsx
index d6ed3dc3cd..561fbcbb5d 100644
--- a/web/packages/accounts-rs/components/NewPasswordForm.tsx
+++ b/web/packages/accounts/components/NewPasswordForm.tsx
@@ -1,5 +1,5 @@
import { Input, TextField, Typography } from "@mui/material";
-import { isWeakPassword } from "ente-accounts-rs/utils/password";
+import { isWeakPassword } from "ente-accounts/utils/password";
import { LoadingButton } from "ente-base/components/mui/LoadingButton";
import { ShowHidePasswordInputAdornment } from "ente-base/components/mui/PasswordInputAdornment";
import log from "ente-base/log";
diff --git a/web/packages/accounts-rs/components/PasswordStrength.tsx b/web/packages/accounts/components/PasswordStrength.tsx
similarity index 100%
rename from web/packages/accounts-rs/components/PasswordStrength.tsx
rename to web/packages/accounts/components/PasswordStrength.tsx
diff --git a/web/packages/accounts-rs/components/RecoveryKey.tsx b/web/packages/accounts/components/RecoveryKey.tsx
similarity index 100%
rename from web/packages/accounts-rs/components/RecoveryKey.tsx
rename to web/packages/accounts/components/RecoveryKey.tsx
diff --git a/web/packages/accounts-rs/components/SecondFactorChoice.tsx b/web/packages/accounts/components/SecondFactorChoice.tsx
similarity index 100%
rename from web/packages/accounts-rs/components/SecondFactorChoice.tsx
rename to web/packages/accounts/components/SecondFactorChoice.tsx
diff --git a/web/packages/accounts-rs/components/SignUpContents.tsx b/web/packages/accounts/components/SignUpContents.tsx
similarity index 97%
rename from web/packages/accounts-rs/components/SignUpContents.tsx
rename to web/packages/accounts/components/SignUpContents.tsx
index 607c43798c..85f901c0d7 100644
--- a/web/packages/accounts-rs/components/SignUpContents.tsx
+++ b/web/packages/accounts/components/SignUpContents.tsx
@@ -19,17 +19,17 @@ import {
saveOriginalKeyAttributes,
stashReferralSource,
stashSRPSetupAttributes,
-} from "ente-accounts-rs/services/accounts-db";
-import { deriveKeyInsufficientMemoryErrorMessage } from "ente-accounts-rs/services/crypto";
-import { saveMasterKeyInSessionAndSafeStore } from "ente-accounts-rs/services/session-storage";
-import { generateSRPSetupAttributes } from "ente-accounts-rs/services/srp";
+} from "ente-accounts/services/accounts-db";
+import { deriveKeyInsufficientMemoryErrorMessage } from "ente-accounts/services/crypto";
+import { saveMasterKeyInSessionAndSafeStore } from "ente-accounts/services/session-storage";
+import { generateSRPSetupAttributes } from "ente-accounts/services/srp";
import {
generateAndSaveInteractiveKeyAttributes,
generateKeysAndAttributes,
sendOTT,
type GenerateKeysAndAttributesResult,
-} from "ente-accounts-rs/services/user";
-import { isWeakPassword } from "ente-accounts-rs/utils/password";
+} from "ente-accounts/services/user";
+import { isWeakPassword } from "ente-accounts/utils/password";
import { LinkButton } from "ente-base/components/LinkButton";
import { LoadingButton } from "ente-base/components/mui/LoadingButton";
import { ShowHidePasswordInputAdornment } from "ente-base/components/mui/PasswordInputAdornment";
diff --git a/web/packages/accounts-rs/components/Verify2FACodeForm.tsx b/web/packages/accounts/components/Verify2FACodeForm.tsx
similarity index 100%
rename from web/packages/accounts-rs/components/Verify2FACodeForm.tsx
rename to web/packages/accounts/components/Verify2FACodeForm.tsx
diff --git a/web/packages/accounts-rs/components/VerifyMasterPasswordForm.tsx b/web/packages/accounts/components/VerifyMasterPasswordForm.tsx
similarity index 96%
rename from web/packages/accounts-rs/components/VerifyMasterPasswordForm.tsx
rename to web/packages/accounts/components/VerifyMasterPasswordForm.tsx
index 1bdfb6547d..6f5535de84 100644
--- a/web/packages/accounts-rs/components/VerifyMasterPasswordForm.tsx
+++ b/web/packages/accounts/components/VerifyMasterPasswordForm.tsx
@@ -1,10 +1,10 @@
import { Input, TextField } from "@mui/material";
-import { decryptBox, deriveKey } from "ente-accounts-rs/services/crypto";
+import { decryptBox, deriveKey } from "ente-accounts/services/crypto";
import {
srpVerificationUnauthorizedErrorMessage,
type SRPAttributes,
-} from "ente-accounts-rs/services/srp";
-import type { KeyAttributes } from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/srp";
+import type { KeyAttributes } from "ente-accounts/services/user";
import { LoadingButton } from "ente-base/components/mui/LoadingButton";
import { ShowHidePasswordInputAdornment } from "ente-base/components/mui/PasswordInputAdornment";
import log from "ente-base/log";
diff --git a/web/packages/accounts-rs/components/layouts/centered-paper.tsx b/web/packages/accounts/components/layouts/centered-paper.tsx
similarity index 100%
rename from web/packages/accounts-rs/components/layouts/centered-paper.tsx
rename to web/packages/accounts/components/layouts/centered-paper.tsx
diff --git a/web/packages/accounts-rs/components/utils/dialog.ts b/web/packages/accounts/components/utils/dialog.ts
similarity index 100%
rename from web/packages/accounts-rs/components/utils/dialog.ts
rename to web/packages/accounts/components/utils/dialog.ts
diff --git a/web/packages/accounts-rs/components/utils/second-factor-choice.ts b/web/packages/accounts/components/utils/second-factor-choice.ts
similarity index 99%
rename from web/packages/accounts-rs/components/utils/second-factor-choice.ts
rename to web/packages/accounts/components/utils/second-factor-choice.ts
index 5abfb28a30..1930a7156d 100644
--- a/web/packages/accounts-rs/components/utils/second-factor-choice.ts
+++ b/web/packages/accounts/components/utils/second-factor-choice.ts
@@ -1,7 +1,7 @@
// This hook is in a separate file from SecondFactorChoice.tsx so that fast
// refresh keeps working.
-import type { EmailOrSRPVerificationResponse } from "ente-accounts-rs/services/user";
+import type { EmailOrSRPVerificationResponse } from "ente-accounts/services/user";
import { useModalVisibility } from "ente-base/components/utils/modal";
import { useCallback, useMemo, useRef } from "react";
import type { SecondFactorType } from "../SecondFactorChoice";
diff --git a/web/packages/accounts-rs/components/utils/use-redirect.ts b/web/packages/accounts/components/utils/use-redirect.ts
similarity index 83%
rename from web/packages/accounts-rs/components/utils/use-redirect.ts
rename to web/packages/accounts/components/utils/use-redirect.ts
index 6ccccc23a7..4b41dc5336 100644
--- a/web/packages/accounts-rs/components/utils/use-redirect.ts
+++ b/web/packages/accounts/components/utils/use-redirect.ts
@@ -1,4 +1,4 @@
-import { haveMasterKeyInSession } from "ente-accounts-rs/services/session-storage";
+import { haveMasterKeyInSession } from "ente-accounts/services/session-storage";
import { useRouter } from "next/router";
import { useEffect } from "react";
import { stashRedirect } from "../../services/redirect";
diff --git a/web/packages/accounts-rs/eslint.config.mjs b/web/packages/accounts/eslint.config.mjs
similarity index 78%
rename from web/packages/accounts-rs/eslint.config.mjs
rename to web/packages/accounts/eslint.config.mjs
index f732329223..c290d19489 100644
--- a/web/packages/accounts-rs/eslint.config.mjs
+++ b/web/packages/accounts/eslint.config.mjs
@@ -12,27 +12,27 @@ export default [
{
name: "ente-base/crypto",
message:
- "Use ente-accounts-rs/services/crypto instead.",
+ "Use ente-accounts/services/crypto instead.",
},
{
name: "ente-base/crypto/types",
message:
- "Use ente-accounts-rs/services/crypto instead.",
+ "Use ente-accounts/services/crypto instead.",
},
{
name: "ente-base/session",
message:
- "Use ente-accounts-rs/services/session-storage instead.",
+ "Use ente-accounts/services/session-storage instead.",
},
{
name: "fast-srp-hap",
message:
- "Use Rust/WASM SRP helpers from ente-accounts-rs/services/srp.",
+ "Use Rust/WASM SRP helpers from ente-accounts/services/srp.",
},
{
name: "bip39",
message:
- "Use Rust/WASM recovery helpers from ente-accounts-rs/services/crypto.",
+ "Use Rust/WASM recovery helpers from ente-accounts/services/crypto.",
},
],
},
diff --git a/web/packages/accounts-rs/package.json b/web/packages/accounts/package.json
similarity index 93%
rename from web/packages/accounts-rs/package.json
rename to web/packages/accounts/package.json
index 69e4745474..65686dc1bc 100644
--- a/web/packages/accounts-rs/package.json
+++ b/web/packages/accounts/package.json
@@ -1,5 +1,5 @@
{
- "name": "ente-accounts-rs",
+ "name": "ente-accounts",
"version": "0.0.0",
"private": true,
"dependencies": {
diff --git a/web/packages/accounts-rs/pages/change-email.tsx b/web/packages/accounts/pages/change-email.tsx
similarity index 95%
rename from web/packages/accounts-rs/pages/change-email.tsx
rename to web/packages/accounts/pages/change-email.tsx
index 871883a59c..fa6052730c 100644
--- a/web/packages/accounts-rs/pages/change-email.tsx
+++ b/web/packages/accounts/pages/change-email.tsx
@@ -4,10 +4,10 @@ import {
AccountsPageContents,
AccountsPageFooter,
AccountsPageTitle,
-} from "ente-accounts-rs/components/layouts/centered-paper";
-import { useRedirectIfNeedsCredentials } from "ente-accounts-rs/components/utils/use-redirect";
-import { appHomeRoute } from "ente-accounts-rs/services/redirect";
-import { changeEmail, sendOTT } from "ente-accounts-rs/services/user";
+} from "ente-accounts/components/layouts/centered-paper";
+import { useRedirectIfNeedsCredentials } from "ente-accounts/components/utils/use-redirect";
+import { appHomeRoute } from "ente-accounts/services/redirect";
+import { changeEmail, sendOTT } from "ente-accounts/services/user";
import { LinkButton } from "ente-base/components/LinkButton";
import { LoadingButton } from "ente-base/components/mui/LoadingButton";
import { isHTTPErrorWithStatus } from "ente-base/http";
diff --git a/web/packages/accounts-rs/pages/change-password.tsx b/web/packages/accounts/pages/change-password.tsx
similarity index 91%
rename from web/packages/accounts-rs/pages/change-password.tsx
rename to web/packages/accounts/pages/change-password.tsx
index 41762d3458..709442dd0f 100644
--- a/web/packages/accounts-rs/pages/change-password.tsx
+++ b/web/packages/accounts/pages/change-password.tsx
@@ -3,13 +3,10 @@ import {
AccountsPageContents,
AccountsPageFooter,
AccountsPageTitle,
-} from "ente-accounts-rs/components/layouts/centered-paper";
-import { deriveKeyInsufficientMemoryErrorMessage } from "ente-accounts-rs/services/crypto";
-import {
- appHomeRoute,
- stashRedirect,
-} from "ente-accounts-rs/services/redirect";
-import { changePassword, type LocalUser } from "ente-accounts-rs/services/user";
+} from "ente-accounts/components/layouts/centered-paper";
+import { deriveKeyInsufficientMemoryErrorMessage } from "ente-accounts/services/crypto";
+import { appHomeRoute, stashRedirect } from "ente-accounts/services/redirect";
+import { changePassword, type LocalUser } from "ente-accounts/services/user";
import { LinkButton } from "ente-base/components/LinkButton";
import { LoadingIndicator } from "ente-base/components/loaders";
import log from "ente-base/log";
diff --git a/web/packages/accounts-rs/pages/credentials.tsx b/web/packages/accounts/pages/credentials.tsx
similarity index 92%
rename from web/packages/accounts-rs/pages/credentials.tsx
rename to web/packages/accounts/pages/credentials.tsx
index bc84a76532..5f3c692678 100644
--- a/web/packages/accounts-rs/pages/credentials.tsx
+++ b/web/packages/accounts/pages/credentials.tsx
@@ -1,16 +1,16 @@
-import { AccountsPageContents } from "ente-accounts-rs/components/layouts/centered-paper";
+import { AccountsPageContents } from "ente-accounts/components/layouts/centered-paper";
import {
AccountsPageFooterWithHost,
PasswordHeader,
VerifyingPasskey,
-} from "ente-accounts-rs/components/LoginComponents";
-import { SecondFactorChoice } from "ente-accounts-rs/components/SecondFactorChoice";
-import { sessionExpiredDialogAttributes } from "ente-accounts-rs/components/utils/dialog";
-import { useSecondFactorChoiceIfNeeded } from "ente-accounts-rs/components/utils/second-factor-choice";
+} from "ente-accounts/components/LoginComponents";
+import { SecondFactorChoice } from "ente-accounts/components/SecondFactorChoice";
+import { sessionExpiredDialogAttributes } from "ente-accounts/components/utils/dialog";
+import { useSecondFactorChoiceIfNeeded } from "ente-accounts/components/utils/second-factor-choice";
import {
VerifyMasterPasswordForm,
type VerifyMasterPasswordFormProps,
-} from "ente-accounts-rs/components/VerifyMasterPasswordForm";
+} from "ente-accounts/components/VerifyMasterPasswordForm";
import {
savedIsFirstLogin,
savedKeyAttributes,
@@ -20,38 +20,38 @@ import {
saveKeyAttributes,
saveSRPAttributes,
updateSavedLocalUser,
-} from "ente-accounts-rs/services/accounts-db";
-import { decryptBox } from "ente-accounts-rs/services/crypto";
+} from "ente-accounts/services/accounts-db";
+import { decryptBox } from "ente-accounts/services/crypto";
import {
openPasskeyVerificationURL,
passkeyVerificationRedirectURL,
-} from "ente-accounts-rs/services/passkey";
+} from "ente-accounts/services/passkey";
import {
appHomeRoute,
stashRedirect,
unstashRedirect,
-} from "ente-accounts-rs/services/redirect";
-import { checkSessionValidity } from "ente-accounts-rs/services/session";
+} from "ente-accounts/services/redirect";
+import { checkSessionValidity } from "ente-accounts/services/session";
import {
masterKeyFromSession,
saveMasterKeyInSessionAndSafeStore,
stashKeyEncryptionKeyInSessionStore,
unstashKeyEncryptionKeyFromSession,
updateSessionFromElectronSafeStorageIfNeeded,
-} from "ente-accounts-rs/services/session-storage";
-import type { SRPAttributes } from "ente-accounts-rs/services/srp";
+} from "ente-accounts/services/session-storage";
+import type { SRPAttributes } from "ente-accounts/services/srp";
import {
generateSRPSetupAttributes,
getAndSaveSRPAttributes,
getSRPAttributes,
setupSRP,
verifySRP,
-} from "ente-accounts-rs/services/srp";
+} from "ente-accounts/services/srp";
import {
decryptAndStoreTokenIfNeeded,
generateAndSaveInteractiveKeyAttributes,
type KeyAttributes,
-} from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/user";
import { LinkButton } from "ente-base/components/LinkButton";
import { LoadingIndicator } from "ente-base/components/loaders";
import { useBaseContext } from "ente-base/context";
diff --git a/web/packages/accounts-rs/pages/generate.tsx b/web/packages/accounts/pages/generate.tsx
similarity index 90%
rename from web/packages/accounts-rs/pages/generate.tsx
rename to web/packages/accounts/pages/generate.tsx
index 5e64229658..4275ae994a 100644
--- a/web/packages/accounts-rs/pages/generate.tsx
+++ b/web/packages/accounts/pages/generate.tsx
@@ -3,30 +3,30 @@ import {
AccountsPageContents,
AccountsPageFooter,
AccountsPageTitle,
-} from "ente-accounts-rs/components/layouts/centered-paper";
-import { RecoveryKey } from "ente-accounts-rs/components/RecoveryKey";
+} from "ente-accounts/components/layouts/centered-paper";
+import { RecoveryKey } from "ente-accounts/components/RecoveryKey";
import {
savedJustSignedUp,
savedOriginalKeyAttributes,
savedPartialLocalUser,
saveJustSignedUp,
-} from "ente-accounts-rs/services/accounts-db";
-import { deriveKeyInsufficientMemoryErrorMessage } from "ente-accounts-rs/services/crypto";
-import { appHomeRoute } from "ente-accounts-rs/services/redirect";
+} from "ente-accounts/services/accounts-db";
+import { deriveKeyInsufficientMemoryErrorMessage } from "ente-accounts/services/crypto";
+import { appHomeRoute } from "ente-accounts/services/redirect";
import {
haveMasterKeyInSession,
saveMasterKeyInSessionAndSafeStore,
-} from "ente-accounts-rs/services/session-storage";
+} from "ente-accounts/services/session-storage";
import {
generateSRPSetupAttributes,
getAndSaveSRPAttributes,
setupSRP,
-} from "ente-accounts-rs/services/srp";
+} from "ente-accounts/services/srp";
import {
generateAndSaveInteractiveKeyAttributes,
generateKeysAndAttributes,
putUserKeyAttributes,
-} from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/user";
import { LinkButton } from "ente-base/components/LinkButton";
import { LoadingIndicator } from "ente-base/components/loaders";
import { useBaseContext } from "ente-base/context";
diff --git a/web/packages/accounts-rs/pages/login.tsx b/web/packages/accounts/pages/login.tsx
similarity index 78%
rename from web/packages/accounts-rs/pages/login.tsx
rename to web/packages/accounts/pages/login.tsx
index 62f8e13658..5469f3fc3e 100644
--- a/web/packages/accounts-rs/pages/login.tsx
+++ b/web/packages/accounts/pages/login.tsx
@@ -1,6 +1,6 @@
-import { AccountsPageContents } from "ente-accounts-rs/components/layouts/centered-paper";
-import { LoginContents } from "ente-accounts-rs/components/LoginContents";
-import { savedPartialLocalUser } from "ente-accounts-rs/services/accounts-db";
+import { AccountsPageContents } from "ente-accounts/components/layouts/centered-paper";
+import { LoginContents } from "ente-accounts/components/LoginContents";
+import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";
import { LoadingIndicator } from "ente-base/components/loaders";
import { customAPIHost } from "ente-base/origins";
import { useRouter } from "next/router";
diff --git a/web/packages/accounts-rs/pages/passkeys/finish.tsx b/web/packages/accounts/pages/passkeys/finish.tsx
similarity index 87%
rename from web/packages/accounts-rs/pages/passkeys/finish.tsx
rename to web/packages/accounts/pages/passkeys/finish.tsx
index 072cf763c2..79cde5da07 100644
--- a/web/packages/accounts-rs/pages/passkeys/finish.tsx
+++ b/web/packages/accounts/pages/passkeys/finish.tsx
@@ -1,14 +1,14 @@
import {
saveKeyAttributes,
updateSavedLocalUser,
-} from "ente-accounts-rs/services/accounts-db";
-import { fromB64URLSafeNoPadding } from "ente-accounts-rs/services/crypto";
-import { clearInflightPasskeySessionID } from "ente-accounts-rs/services/passkey";
-import { unstashRedirect } from "ente-accounts-rs/services/redirect";
+} from "ente-accounts/services/accounts-db";
+import { fromB64URLSafeNoPadding } from "ente-accounts/services/crypto";
+import { clearInflightPasskeySessionID } from "ente-accounts/services/passkey";
+import { unstashRedirect } from "ente-accounts/services/redirect";
import {
resetSavedLocalUserTokens,
TwoFactorAuthorizationResponse,
-} from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/user";
import { LoadingIndicator } from "ente-base/components/loaders";
import log from "ente-base/log";
import { nullToUndefined } from "ente-utils/transform";
diff --git a/web/packages/accounts-rs/pages/passkeys/recover.tsx b/web/packages/accounts/pages/passkeys/recover.tsx
similarity index 100%
rename from web/packages/accounts-rs/pages/passkeys/recover.tsx
rename to web/packages/accounts/pages/passkeys/recover.tsx
diff --git a/web/packages/accounts-rs/pages/recover.tsx b/web/packages/accounts/pages/recover.tsx
similarity index 87%
rename from web/packages/accounts-rs/pages/recover.tsx
rename to web/packages/accounts/pages/recover.tsx
index ea6eac283d..942c0f0b9e 100644
--- a/web/packages/accounts-rs/pages/recover.tsx
+++ b/web/packages/accounts/pages/recover.tsx
@@ -2,26 +2,23 @@ import {
AccountsPageContents,
AccountsPageFooter,
AccountsPageTitle,
-} from "ente-accounts-rs/components/layouts/centered-paper";
+} from "ente-accounts/components/layouts/centered-paper";
import {
savedKeyAttributes,
savedPartialLocalUser,
-} from "ente-accounts-rs/services/accounts-db";
-import { decryptBox } from "ente-accounts-rs/services/crypto";
-import { recoveryKeyFromMnemonic } from "ente-accounts-rs/services/recovery-key";
-import {
- appHomeRoute,
- stashRedirect,
-} from "ente-accounts-rs/services/redirect";
+} from "ente-accounts/services/accounts-db";
+import { decryptBox } from "ente-accounts/services/crypto";
+import { recoveryKeyFromMnemonic } from "ente-accounts/services/recovery-key";
+import { appHomeRoute, stashRedirect } from "ente-accounts/services/redirect";
import {
haveMasterKeyInSession,
saveMasterKeyInSessionAndSafeStore,
-} from "ente-accounts-rs/services/session-storage";
-import type { KeyAttributes } from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/session-storage";
+import type { KeyAttributes } from "ente-accounts/services/user";
import {
decryptAndStoreTokenIfNeeded,
sendOTT,
-} from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/user";
import { LinkButton } from "ente-base/components/LinkButton";
import {
SingleInputForm,
diff --git a/web/packages/accounts-rs/pages/signup.tsx b/web/packages/accounts/pages/signup.tsx
similarity index 78%
rename from web/packages/accounts-rs/pages/signup.tsx
rename to web/packages/accounts/pages/signup.tsx
index d895fc5774..dfea7a50c7 100644
--- a/web/packages/accounts-rs/pages/signup.tsx
+++ b/web/packages/accounts/pages/signup.tsx
@@ -1,6 +1,6 @@
-import { AccountsPageContents } from "ente-accounts-rs/components/layouts/centered-paper";
-import { SignUpContents } from "ente-accounts-rs/components/SignUpContents";
-import { savedPartialLocalUser } from "ente-accounts-rs/services/accounts-db";
+import { AccountsPageContents } from "ente-accounts/components/layouts/centered-paper";
+import { SignUpContents } from "ente-accounts/components/SignUpContents";
+import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";
import { LoadingIndicator } from "ente-base/components/loaders";
import { customAPIHost } from "ente-base/origins";
import { useRouter } from "next/router";
diff --git a/web/packages/accounts-rs/pages/two-factor/recover.tsx b/web/packages/accounts/pages/two-factor/recover.tsx
similarity index 96%
rename from web/packages/accounts-rs/pages/two-factor/recover.tsx
rename to web/packages/accounts/pages/two-factor/recover.tsx
index 3a84ca403d..e84ef3bec7 100644
--- a/web/packages/accounts-rs/pages/two-factor/recover.tsx
+++ b/web/packages/accounts/pages/two-factor/recover.tsx
@@ -3,14 +3,14 @@ import {
AccountsPageContents,
AccountsPageFooter,
AccountsPageTitle,
-} from "ente-accounts-rs/components/layouts/centered-paper";
-import { savedPartialLocalUser } from "ente-accounts-rs/services/accounts-db";
+} from "ente-accounts/components/layouts/centered-paper";
+import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";
import {
getRecoverTwoFactor,
recoverTwoFactorFinish,
type TwoFactorRecoveryResponse,
type TwoFactorType,
-} from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/user";
import { LinkButton } from "ente-base/components/LinkButton";
import { LoadingIndicator } from "ente-base/components/loaders";
import type { MiniDialogAttributes } from "ente-base/components/MiniDialog";
diff --git a/web/packages/accounts-rs/pages/two-factor/setup.tsx b/web/packages/accounts/pages/two-factor/setup.tsx
similarity index 94%
rename from web/packages/accounts-rs/pages/two-factor/setup.tsx
rename to web/packages/accounts/pages/two-factor/setup.tsx
index db32a79268..59fc64305f 100644
--- a/web/packages/accounts-rs/pages/two-factor/setup.tsx
+++ b/web/packages/accounts/pages/two-factor/setup.tsx
@@ -1,12 +1,12 @@
import { Paper, Stack, styled, Typography } from "@mui/material";
-import { CodeBlock } from "ente-accounts-rs/components/CodeBlock";
-import { Verify2FACodeForm } from "ente-accounts-rs/components/Verify2FACodeForm";
-import { appHomeRoute } from "ente-accounts-rs/services/redirect";
-import type { TwoFactorSecret } from "ente-accounts-rs/services/user";
+import { CodeBlock } from "ente-accounts/components/CodeBlock";
+import { Verify2FACodeForm } from "ente-accounts/components/Verify2FACodeForm";
+import { appHomeRoute } from "ente-accounts/services/redirect";
+import type { TwoFactorSecret } from "ente-accounts/services/user";
import {
setupTwoFactor,
setupTwoFactorFinish,
-} from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/user";
import { CenteredFill } from "ente-base/components/containers";
import { EnteLogo } from "ente-base/components/EnteLogo";
import { LinkButton } from "ente-base/components/LinkButton";
diff --git a/web/packages/accounts-rs/pages/two-factor/verify.tsx b/web/packages/accounts/pages/two-factor/verify.tsx
similarity index 93%
rename from web/packages/accounts-rs/pages/two-factor/verify.tsx
rename to web/packages/accounts/pages/two-factor/verify.tsx
index 0c17135365..f2b1f920e7 100644
--- a/web/packages/accounts-rs/pages/two-factor/verify.tsx
+++ b/web/packages/accounts/pages/two-factor/verify.tsx
@@ -1,13 +1,13 @@
-import { Verify2FACodeForm } from "ente-accounts-rs/components/Verify2FACodeForm";
+import { Verify2FACodeForm } from "ente-accounts/components/Verify2FACodeForm";
import {
savedPartialLocalUser,
saveKeyAttributes,
updateSavedLocalUser,
-} from "ente-accounts-rs/services/accounts-db";
+} from "ente-accounts/services/accounts-db";
import {
resetSavedLocalUserTokens,
verifyTwoFactor,
-} from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/user";
import { LinkButton } from "ente-base/components/LinkButton";
import { useBaseContext } from "ente-base/context";
import { isHTTPErrorWithStatus } from "ente-base/http";
diff --git a/web/packages/accounts-rs/pages/verify.tsx b/web/packages/accounts/pages/verify.tsx
similarity index 93%
rename from web/packages/accounts-rs/pages/verify.tsx
rename to web/packages/accounts/pages/verify.tsx
index da60372313..39eec9874a 100644
--- a/web/packages/accounts-rs/pages/verify.tsx
+++ b/web/packages/accounts/pages/verify.tsx
@@ -3,10 +3,10 @@ import {
AccountsPageContents,
AccountsPageFooter,
AccountsPageTitle,
-} from "ente-accounts-rs/components/layouts/centered-paper";
-import { VerifyingPasskey } from "ente-accounts-rs/components/LoginComponents";
-import { SecondFactorChoice } from "ente-accounts-rs/components/SecondFactorChoice";
-import { useSecondFactorChoiceIfNeeded } from "ente-accounts-rs/components/utils/second-factor-choice";
+} from "ente-accounts/components/layouts/centered-paper";
+import { VerifyingPasskey } from "ente-accounts/components/LoginComponents";
+import { SecondFactorChoice } from "ente-accounts/components/SecondFactorChoice";
+import { useSecondFactorChoiceIfNeeded } from "ente-accounts/components/utils/second-factor-choice";
import {
replaceSavedLocalUser,
savedKeyAttributes,
@@ -19,26 +19,26 @@ import {
unstashAfterUseSRPSetupAttributes,
unstashReferralSource,
updateSavedLocalUser,
-} from "ente-accounts-rs/services/accounts-db";
+} from "ente-accounts/services/accounts-db";
import {
openPasskeyVerificationURL,
passkeyVerificationRedirectURL,
-} from "ente-accounts-rs/services/passkey";
+} from "ente-accounts/services/passkey";
import {
stashedRedirect,
unstashRedirect,
-} from "ente-accounts-rs/services/redirect";
-import { clearSessionStorage } from "ente-accounts-rs/services/session-storage";
+} from "ente-accounts/services/redirect";
+import { clearSessionStorage } from "ente-accounts/services/session-storage";
import {
getAndSaveSRPAttributes,
getSRPAttributes,
setupSRP,
-} from "ente-accounts-rs/services/srp";
+} from "ente-accounts/services/srp";
import {
putUserKeyAttributes,
sendOTT,
verifyEmail,
-} from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/user";
import { LinkButton } from "ente-base/components/LinkButton";
import { LoadingIndicator } from "ente-base/components/loaders";
import {
diff --git a/web/packages/accounts-rs/services/accounts-db.ts b/web/packages/accounts/services/accounts-db.ts
similarity index 100%
rename from web/packages/accounts-rs/services/accounts-db.ts
rename to web/packages/accounts/services/accounts-db.ts
diff --git a/web/packages/accounts-rs/services/crypto/index.ts b/web/packages/accounts/services/crypto/index.ts
similarity index 100%
rename from web/packages/accounts-rs/services/crypto/index.ts
rename to web/packages/accounts/services/crypto/index.ts
diff --git a/web/packages/accounts-rs/services/crypto/kdf.ts b/web/packages/accounts/services/crypto/kdf.ts
similarity index 100%
rename from web/packages/accounts-rs/services/crypto/kdf.ts
rename to web/packages/accounts/services/crypto/kdf.ts
diff --git a/web/packages/accounts-rs/services/crypto/kdf.worker.ts b/web/packages/accounts/services/crypto/kdf.worker.ts
similarity index 100%
rename from web/packages/accounts-rs/services/crypto/kdf.worker.ts
rename to web/packages/accounts/services/crypto/kdf.worker.ts
diff --git a/web/packages/accounts-rs/services/logout.ts b/web/packages/accounts/services/logout.ts
similarity index 95%
rename from web/packages/accounts-rs/services/logout.ts
rename to web/packages/accounts/services/logout.ts
index 14dda04142..6c50f1d259 100644
--- a/web/packages/accounts-rs/services/logout.ts
+++ b/web/packages/accounts/services/logout.ts
@@ -1,4 +1,4 @@
-import { clearSessionStorage } from "ente-accounts-rs/services/session-storage";
+import { clearSessionStorage } from "ente-accounts/services/session-storage";
import { clearBlobCaches } from "ente-base/blob-cache";
import { clearKVDB } from "ente-base/kv";
import { clearLocalStorage } from "ente-base/local-storage";
diff --git a/web/packages/accounts-rs/services/passkey.ts b/web/packages/accounts/services/passkey.ts
similarity index 96%
rename from web/packages/accounts-rs/services/passkey.ts
rename to web/packages/accounts/services/passkey.ts
index 145c878c6f..31c1cef1e4 100644
--- a/web/packages/accounts-rs/services/passkey.ts
+++ b/web/packages/accounts/services/passkey.ts
@@ -1,12 +1,12 @@
import {
saveKeyAttributes,
updateSavedLocalUser,
-} from "ente-accounts-rs/services/accounts-db";
-import { encryptBox, generateKey } from "ente-accounts-rs/services/crypto";
+} from "ente-accounts/services/accounts-db";
+import { encryptBox, generateKey } from "ente-accounts/services/crypto";
import {
resetSavedLocalUserTokens,
TwoFactorAuthorizationResponse,
-} from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/user";
import { clientPackageName, isDesktop } from "ente-base/app";
import {
authenticatedRequestHeaders,
diff --git a/web/packages/accounts-rs/services/recovery-key.ts b/web/packages/accounts/services/recovery-key.ts
similarity index 91%
rename from web/packages/accounts-rs/services/recovery-key.ts
rename to web/packages/accounts/services/recovery-key.ts
index e037e94631..aec21ba94f 100644
--- a/web/packages/accounts-rs/services/recovery-key.ts
+++ b/web/packages/accounts/services/recovery-key.ts
@@ -1,12 +1,12 @@
-import { savedKeyAttributes } from "ente-accounts-rs/services/accounts-db";
+import { savedKeyAttributes } from "ente-accounts/services/accounts-db";
import {
decryptBox,
encryptBox,
generateKey,
recoveryKeyFromMnemonicOrHex,
recoveryKeyToMnemonicRust,
-} from "ente-accounts-rs/services/crypto";
-import { ensureMasterKeyFromSession } from "ente-accounts-rs/services/session-storage";
+} from "ente-accounts/services/crypto";
+import { ensureMasterKeyFromSession } from "ente-accounts/services/session-storage";
import { saveKeyAttributes } from "./accounts-db";
import { putUserRecoveryKeyAttributes, type KeyAttributes } from "./user";
diff --git a/web/packages/accounts-rs/services/redirect.ts b/web/packages/accounts/services/redirect.ts
similarity index 100%
rename from web/packages/accounts-rs/services/redirect.ts
rename to web/packages/accounts/services/redirect.ts
diff --git a/web/packages/accounts-rs/services/session-storage.ts b/web/packages/accounts/services/session-storage.ts
similarity index 100%
rename from web/packages/accounts-rs/services/session-storage.ts
rename to web/packages/accounts/services/session-storage.ts
diff --git a/web/packages/accounts-rs/services/session.ts b/web/packages/accounts/services/session.ts
similarity index 96%
rename from web/packages/accounts-rs/services/session.ts
rename to web/packages/accounts/services/session.ts
index 0541bf17c8..faf4e5191b 100644
--- a/web/packages/accounts-rs/services/session.ts
+++ b/web/packages/accounts/services/session.ts
@@ -1,8 +1,8 @@
import {
savedOriginalKeyAttributes,
savedSRPAttributes,
-} from "ente-accounts-rs/services/accounts-db";
-import type { KeyAttributes } from "ente-accounts-rs/services/user";
+} from "ente-accounts/services/accounts-db";
+import type { KeyAttributes } from "ente-accounts/services/user";
import { authenticatedRequestHeaders, HTTPError } from "ente-base/http";
import log from "ente-base/log";
import { apiURL } from "ente-base/origins";
diff --git a/web/packages/accounts-rs/services/sessions.ts b/web/packages/accounts/services/sessions.ts
similarity index 100%
rename from web/packages/accounts-rs/services/sessions.ts
rename to web/packages/accounts/services/sessions.ts
diff --git a/web/packages/accounts-rs/services/srp.ts b/web/packages/accounts/services/srp.ts
similarity index 99%
rename from web/packages/accounts-rs/services/srp.ts
rename to web/packages/accounts/services/srp.ts
index 12929ae76f..2a1a0814c4 100644
--- a/web/packages/accounts-rs/services/srp.ts
+++ b/web/packages/accounts/services/srp.ts
@@ -2,7 +2,7 @@ import {
deriveSubKeyBytes,
generateSRPSetupAttributesRust,
toB64,
-} from "ente-accounts-rs/services/crypto";
+} from "ente-accounts/services/crypto";
import {
authenticatedRequestHeaders,
ensureOk,
diff --git a/web/packages/accounts-rs/services/user.ts b/web/packages/accounts/services/user.ts
similarity index 98%
rename from web/packages/accounts-rs/services/user.ts
rename to web/packages/accounts/services/user.ts
index 43d375c22b..7a72271177 100644
--- a/web/packages/accounts-rs/services/user.ts
+++ b/web/packages/accounts/services/user.ts
@@ -5,7 +5,7 @@ import {
savedPartialLocalUser,
saveKeyAttributes,
updateSavedLocalUser,
-} from "ente-accounts-rs/services/accounts-db";
+} from "ente-accounts/services/accounts-db";
import {
boxSealOpenBytes,
decryptBox,
@@ -15,14 +15,14 @@ import {
generateKey,
generateKeyPair,
toB64URLSafe,
-} from "ente-accounts-rs/services/crypto";
-import { ensureMasterKeyFromSession } from "ente-accounts-rs/services/session-storage";
+} from "ente-accounts/services/crypto";
+import { ensureMasterKeyFromSession } from "ente-accounts/services/session-storage";
import {
generateSRPSetupAttributes,
getAndSaveSRPAttributes,
updateSRPAndKeyAttributes,
type UpdatedKeyAttr,
-} from "ente-accounts-rs/services/srp";
+} from "ente-accounts/services/srp";
import {
authenticatedRequestHeaders,
ensureOk,
diff --git a/web/packages/accounts-rs/tsconfig.json b/web/packages/accounts/tsconfig.json
similarity index 100%
rename from web/packages/accounts-rs/tsconfig.json
rename to web/packages/accounts/tsconfig.json
diff --git a/web/packages/accounts-rs/utils/password.ts b/web/packages/accounts/utils/password.ts
similarity index 100%
rename from web/packages/accounts-rs/utils/password.ts
rename to web/packages/accounts/utils/password.ts
diff --git a/web/packages/contacts/index.test.ts b/web/packages/contacts/index.test.ts
index 7d201ce1d9..a95b3358c9 100644
--- a/web/packages/contacts/index.test.ts
+++ b/web/packages/contacts/index.test.ts
@@ -151,10 +151,10 @@ const setupContactsModule = async (options: SetupOptions = {}) => {
default: { info, warn, error },
logToDisk: vi.fn(),
}));
- vi.doMock("ente-accounts-rs/services/session-storage", () => ({
+ vi.doMock("ente-accounts/services/session-storage", () => ({
masterKeyFromSession: vi.fn(() => "MASTER_KEY"),
}));
- vi.doMock("ente-accounts-rs/services/user", () => ({
+ vi.doMock("ente-accounts/services/user", () => ({
ensureLocalUser: vi.fn(() => ({ id: 101 })),
}));
vi.doMock("ente-base/app", () => ({
diff --git a/web/packages/contacts/index.ts b/web/packages/contacts/index.ts
index ad805f2ed5..2a5779a2c2 100644
--- a/web/packages/contacts/index.ts
+++ b/web/packages/contacts/index.ts
@@ -1,7 +1,7 @@
-import { savedKeyAttributes } from "ente-accounts-rs/services/accounts-db";
-import { getUserRecoveryKey } from "ente-accounts-rs/services/recovery-key";
-import { masterKeyFromSession } from "ente-accounts-rs/services/session-storage";
-import { ensureLocalUser } from "ente-accounts-rs/services/user";
+import { savedKeyAttributes } from "ente-accounts/services/accounts-db";
+import { getUserRecoveryKey } from "ente-accounts/services/recovery-key";
+import { masterKeyFromSession } from "ente-accounts/services/session-storage";
+import { ensureLocalUser } from "ente-accounts/services/user";
import { clientPackageName, desktopAppVersion, isDesktop } from "ente-base/app";
import { ensureArrayBufferBacked } from "ente-base/bytes";
import { retryAsyncOperation } from "ente-base/http";
diff --git a/web/packages/contacts/legacy/components/LegacyAddContactContent.tsx b/web/packages/contacts/legacy/components/LegacyAddContactContent.tsx
index 82b2c007b9..b4fe428fa6 100644
--- a/web/packages/contacts/legacy/components/LegacyAddContactContent.tsx
+++ b/web/packages/contacts/legacy/components/LegacyAddContactContent.tsx
@@ -6,7 +6,7 @@ import {
TextField,
Typography,
} from "@mui/material";
-import { ensureLocalUser } from "ente-accounts-rs/services/user";
+import { ensureLocalUser } from "ente-accounts/services/user";
import { useBaseContext } from "ente-base/context";
import React, { useMemo, useState } from "react";
import {
diff --git a/web/packages/contacts/legacy/components/LegacyResetPasswordPage.tsx b/web/packages/contacts/legacy/components/LegacyResetPasswordPage.tsx
index 338d65cbd0..06fef54b40 100644
--- a/web/packages/contacts/legacy/components/LegacyResetPasswordPage.tsx
+++ b/web/packages/contacts/legacy/components/LegacyResetPasswordPage.tsx
@@ -1,5 +1,5 @@
import { Input, Stack, TextField } from "@mui/material";
-import { isWeakPassword } from "ente-accounts-rs/utils/password";
+import { isWeakPassword } from "ente-accounts/utils/password";
import { ShowHidePasswordInputAdornment } from "ente-base/components/mui/PasswordInputAdornment";
import React, { useState } from "react";
import type { LegacyRecoverySession } from "..";
diff --git a/web/packages/contacts/package.json b/web/packages/contacts/package.json
index 2f785b8fdb..4bbac33ffc 100644
--- a/web/packages/contacts/package.json
+++ b/web/packages/contacts/package.json
@@ -10,7 +10,7 @@
"dependencies": {
"@mui/icons-material": "9.3.1",
"@mui/material": "9.3.1",
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*",
"ente-wasm": "*",
"react": "19.2.7",
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index f3800bcf7e..66d38f5c33 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-rs/services/user";
+import type { LocalUser } from "ente-accounts/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.json
index ba1fc8ccf7..99c3ab3c34 100644
--- a/web/packages/gallery/package.json
+++ b/web/packages/gallery/package.json
@@ -7,7 +7,7 @@
"@hugeicons/core-free-icons": "1.2.1",
"@hugeicons/react": "1.1.6",
"bs58": "6.0.0",
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*",
"ente-contacts-web": "*",
"ente-utils": "*",
diff --git a/web/packages/gallery/services/video.ts b/web/packages/gallery/services/video.ts
index 71f3442c74..7c75cc25b2 100644
--- a/web/packages/gallery/services/video.ts
+++ b/web/packages/gallery/services/video.ts
@@ -1,4 +1,4 @@
-import { ensureLocalUser } from "ente-accounts-rs/services/user";
+import { ensureLocalUser } from "ente-accounts/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.json
index 1281ac41d8..bc434fe906 100644
--- a/web/packages/new/package.json
+++ b/web/packages/new/package.json
@@ -6,7 +6,7 @@
"@mui/material": "9.3.1",
"@mui/x-date-pickers": "9.8.0",
"dayjs": "1.11.21",
- "ente-accounts-rs": "*",
+ "ente-accounts": "*",
"ente-base": "*",
"ente-gallery": "*",
"ente-utils": "*",
diff --git a/web/packages/new/photos/services/collection.ts b/web/packages/new/photos/services/collection.ts
index 9cd44a8ac6..bb5b0adcb7 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-rs/services/user";
+import { ensureLocalUser } from "ente-accounts/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.ts
index 1aed90a9cc..0dd73d5a88 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-rs/services/user";
+import { ensureLocalUser } from "ente-accounts/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.ts
index ca80bc80fd..49a79c4f3f 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-rs/services/user";
+import { ensureLocalUser } from "ente-accounts/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.ts
index 96a6effbab..895cf68e4f 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-rs/services/accounts-db";
-import { ensureLocalUser } from "ente-accounts-rs/services/user";
+import { updateSavedLocalUser } from "ente-accounts/services/accounts-db";
+import { ensureLocalUser } from "ente-accounts/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.ts
index 7df70c918b..4d3fc0c362 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-rs/services/user";
+import { ensureSavedKeyAttributes } from "ente-accounts/services/user";
import { boxSealOpenBytes, decryptBox } from "ente-base/crypto";
import type { KeyPair } from "ente-base/crypto/types";
import { authenticatedRequestHeaders, ensureOk } from "ente-base/http";