Skip to content

armgit / ente

Public Imported from GitHub
0

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

migrate(auth):to-accounts-rs

Aswin Asokadf24273fee6
diff --git a/web/apps/auth/package.json b/web/apps/auth/package.json
index e561031ccc..3a34081371 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": "*",
+ "ente-accounts-rs": "*",
"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 7733f17857..a5ac4ced76 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/services/accounts-db";
-import { accountLogout } from "ente-accounts/services/logout";
+import { savedLocalUser } from "ente-accounts-rs/services/accounts-db";
+import { accountLogout } from "ente-accounts-rs/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 b8ef07cf08..7b3a0e2514 100644
--- a/web/apps/auth/src/pages/auth.tsx
+++ b/web/apps/auth/src/pages/auth.tsx
@@ -14,8 +14,8 @@ import {
useTheme,
} from "@mui/material";
import { useColorScheme } from "@mui/material/styles";
-import { sessionExpiredDialogAttributes } from "ente-accounts/components/utils/dialog";
-import { stashRedirect } from "ente-accounts/services/redirect";
+import { sessionExpiredDialogAttributes } from "ente-accounts-rs/components/utils/dialog";
+import { stashRedirect } from "ente-accounts-rs/services/redirect";
import { EnteLogo } from "ente-base/components/EnteLogo";
import { LoadingIndicator } from "ente-base/components/loaders";
import { FocusVisibleButton } from "ente-base/components/mui/FocusVisibleButton";
@@ -27,7 +27,7 @@ import {
import { useBaseContext } from "ente-base/context";
import { isHTTP401Error } from "ente-base/http";
import log from "ente-base/log";
-import { masterKeyFromSession } from "ente-base/session";
+import { masterKeyFromSession } from "ente-accounts-rs/services/session-storage";
import { t } from "i18next";
import { useRouter } from "next/router";
import React, { useCallback, useEffect, useState } from "react";
diff --git a/web/apps/auth/src/pages/change-password.tsx b/web/apps/auth/src/pages/change-password.tsx
index 0e494377ee..a90174521a 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/pages/change-password";
+export { default } from "ente-accounts-rs/pages/change-password";
diff --git a/web/apps/auth/src/pages/credentials.tsx b/web/apps/auth/src/pages/credentials.tsx
index 9b8df2e13d..54278a0282 100644
--- a/web/apps/auth/src/pages/credentials.tsx
+++ b/web/apps/auth/src/pages/credentials.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts/pages/credentials";
+export { default } from "ente-accounts-rs/pages/credentials";
diff --git a/web/apps/auth/src/pages/generate.tsx b/web/apps/auth/src/pages/generate.tsx
index 670ed3e823..54710e2994 100644
--- a/web/apps/auth/src/pages/generate.tsx
+++ b/web/apps/auth/src/pages/generate.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts/pages/generate";
+export { default } from "ente-accounts-rs/pages/generate";
diff --git a/web/apps/auth/src/pages/login.tsx b/web/apps/auth/src/pages/login.tsx
index 846da93856..012a3dd890 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/components/LoginContents";
-import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";
+import { LoginContents } from "ente-accounts-rs/components/LoginContents";
+import { savedPartialLocalUser } from "ente-accounts-rs/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 88c2314928..44678c882d 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/pages/passkeys/finish";
+export { default } from "ente-accounts-rs/pages/passkeys/finish";
diff --git a/web/apps/auth/src/pages/passkeys/recover.tsx b/web/apps/auth/src/pages/passkeys/recover.tsx
index 972142211c..f4539280c6 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/pages/two-factor/recover";
+import Page_ from "ente-accounts-rs/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 eb6a74c593..4793539fa6 100644
--- a/web/apps/auth/src/pages/recover.tsx
+++ b/web/apps/auth/src/pages/recover.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts/pages/recover";
+export { default } from "ente-accounts-rs/pages/recover";
diff --git a/web/apps/auth/src/pages/signup.tsx b/web/apps/auth/src/pages/signup.tsx
index fa3c32852a..ad006c980d 100644
--- a/web/apps/auth/src/pages/signup.tsx
+++ b/web/apps/auth/src/pages/signup.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts/pages/signup";
+export { default } from "ente-accounts-rs/pages/signup";
diff --git a/web/apps/auth/src/pages/two-factor/recover.tsx b/web/apps/auth/src/pages/two-factor/recover.tsx
index 201393276a..9182186db6 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/pages/two-factor/recover";
+import Page_ from "ente-accounts-rs/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 7f9adb38e6..0a1f8d86b9 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/pages/two-factor/setup";
+export { default } from "ente-accounts-rs/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 f3f3c99656..b5f8497ad3 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/pages/two-factor/verify";
+export { default } from "ente-accounts-rs/pages/two-factor/verify";
diff --git a/web/apps/auth/src/pages/verify.tsx b/web/apps/auth/src/pages/verify.tsx
index 7ec623fac9..4c231f052e 100644
--- a/web/apps/auth/src/pages/verify.tsx
+++ b/web/apps/auth/src/pages/verify.tsx
@@ -1 +1 @@
-export { default } from "ente-accounts/pages/verify";
+export { default } from "ente-accounts-rs/pages/verify";
diff --git a/web/package-lock.json b/web/package-lock.json
index 442fe57b07..a40d05a868 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -110,7 +110,7 @@
"version": "0.0.0",
"dependencies": {
"@noble/hashes": "2.2.0",
- "ente-accounts": "*",
+ "ente-accounts-rs": "*",
"ente-base": "*",
"otpauth": "9.5.1"
},