From b28f6c3d8c301fa476dac8b21f4339814a060ee4 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Sun, 26 May 2024 20:29:53 +0530 Subject: [PATCH] reduce auth --- web/apps/auth/src/pages/_app.tsx | 6 +++++- web/apps/auth/src/pages/change-email.tsx | 6 ++---- web/apps/auth/src/pages/change-password.tsx | 6 ++---- web/apps/auth/src/pages/credentials.tsx | 6 ++---- web/apps/auth/src/pages/generate.tsx | 6 ++---- web/apps/auth/src/pages/login.tsx | 6 ++---- web/apps/auth/src/pages/recover.tsx | 6 ++---- web/apps/auth/src/pages/signup.tsx | 6 ++---- web/apps/auth/src/pages/two-factor/recover.tsx | 6 ++---- web/apps/auth/src/pages/two-factor/setup.tsx | 6 ++---- web/apps/auth/src/pages/two-factor/verify.tsx | 6 ++---- web/apps/auth/src/pages/verify.tsx | 6 ++---- 12 files changed, 27 insertions(+), 45 deletions(-) diff --git a/web/apps/auth/src/pages/_app.tsx b/web/apps/auth/src/pages/_app.tsx index 6aa1246d3d..0ada75c3fc 100644 --- a/web/apps/auth/src/pages/_app.tsx +++ b/web/apps/auth/src/pages/_app.tsx @@ -5,6 +5,7 @@ import { logUnhandledErrorsAndRejections, } from "@/next/log-web"; import type { AppName, BaseAppContextT } from "@/next/types/app"; +import { ensure } from "@/utils/ensure"; import { accountLogout } from "@ente/accounts/services/logout"; import { APPS, @@ -29,7 +30,7 @@ import { ThemeProvider } from "@mui/material/styles"; import { t } from "i18next"; import type { AppProps } from "next/app"; import { useRouter } from "next/router"; -import { createContext, useEffect, useRef, useState } from "react"; +import { createContext, useContext, useEffect, useRef, useState } from "react"; import LoadingBar, { type LoadingBarRef } from "react-top-loading-bar"; import "../../public/css/global.css"; @@ -47,6 +48,9 @@ type AppContextT = BaseAppContextT & { /** The React {@link Context} available to all pages. */ export const AppContext = createContext(undefined); +/** Utility hook to reduce amount of boilerplate in account related pages. */ +export const useAppContext = () => ensure(useContext(AppContext)); + export default function App({ Component, pageProps }: AppProps) { const appName: AppName = "auth"; diff --git a/web/apps/auth/src/pages/change-email.tsx b/web/apps/auth/src/pages/change-email.tsx index 451c5ebfe1..89a765fbf9 100644 --- a/web/apps/auth/src/pages/change-email.tsx +++ b/web/apps/auth/src/pages/change-email.tsx @@ -1,8 +1,6 @@ -import { ensure } from "@/utils/ensure"; import Page_ from "@ente/accounts/pages/change-email"; -import { useContext } from "react"; -import { AppContext } from "./_app"; +import { useAppContext } from "./_app"; -const Page = () => ; +const Page = () => ; export default Page; diff --git a/web/apps/auth/src/pages/change-password.tsx b/web/apps/auth/src/pages/change-password.tsx index ba8e1ac3d0..ed82edd92c 100644 --- a/web/apps/auth/src/pages/change-password.tsx +++ b/web/apps/auth/src/pages/change-password.tsx @@ -1,8 +1,6 @@ -import { ensure } from "@/utils/ensure"; import Page_ from "@ente/accounts/pages/change-password"; -import { useContext } from "react"; -import { AppContext } from "./_app"; +import { useAppContext } from "./_app"; -const Page = () => ; +const Page = () => ; export default Page; diff --git a/web/apps/auth/src/pages/credentials.tsx b/web/apps/auth/src/pages/credentials.tsx index 7d21b33ac6..070aace4a1 100644 --- a/web/apps/auth/src/pages/credentials.tsx +++ b/web/apps/auth/src/pages/credentials.tsx @@ -1,8 +1,6 @@ -import { ensure } from "@/utils/ensure"; import Page_ from "@ente/accounts/pages/credentials"; -import { useContext } from "react"; -import { AppContext } from "./_app"; +import { useAppContext } from "./_app"; -const Page = () => ; +const Page = () => ; export default Page; diff --git a/web/apps/auth/src/pages/generate.tsx b/web/apps/auth/src/pages/generate.tsx index 718172d49f..c6804255af 100644 --- a/web/apps/auth/src/pages/generate.tsx +++ b/web/apps/auth/src/pages/generate.tsx @@ -1,8 +1,6 @@ -import { ensure } from "@/utils/ensure"; import Page_ from "@ente/accounts/pages/generate"; -import { useContext } from "react"; -import { AppContext } from "./_app"; +import { useAppContext } from "./_app"; -const Page = () => ; +const Page = () => ; export default Page; diff --git a/web/apps/auth/src/pages/login.tsx b/web/apps/auth/src/pages/login.tsx index b40b9f914c..1a7de0497f 100644 --- a/web/apps/auth/src/pages/login.tsx +++ b/web/apps/auth/src/pages/login.tsx @@ -1,8 +1,6 @@ -import { ensure } from "@/utils/ensure"; import Page_ from "@ente/accounts/pages/login"; -import { useContext } from "react"; -import { AppContext } from "./_app"; +import { useAppContext } from "./_app"; -const Page = () => ; +const Page = () => ; export default Page; diff --git a/web/apps/auth/src/pages/recover.tsx b/web/apps/auth/src/pages/recover.tsx index cc6d8da82d..d825729e5e 100644 --- a/web/apps/auth/src/pages/recover.tsx +++ b/web/apps/auth/src/pages/recover.tsx @@ -1,8 +1,6 @@ -import { ensure } from "@/utils/ensure"; import Page_ from "@ente/accounts/pages/recover"; -import { useContext } from "react"; -import { AppContext } from "./_app"; +import { useAppContext } from "./_app"; -const Page = () => ; +const Page = () => ; export default Page; diff --git a/web/apps/auth/src/pages/signup.tsx b/web/apps/auth/src/pages/signup.tsx index 8cc5202a81..403d3e7357 100644 --- a/web/apps/auth/src/pages/signup.tsx +++ b/web/apps/auth/src/pages/signup.tsx @@ -1,8 +1,6 @@ -import { ensure } from "@/utils/ensure"; import Page_ from "@ente/accounts/pages/signup"; -import { useContext } from "react"; -import { AppContext } from "./_app"; +import { useAppContext } from "./_app"; -const Page = () => ; +const Page = () => ; export default Page; diff --git a/web/apps/auth/src/pages/two-factor/recover.tsx b/web/apps/auth/src/pages/two-factor/recover.tsx index aa9c6faf99..d3f40be49c 100644 --- a/web/apps/auth/src/pages/two-factor/recover.tsx +++ b/web/apps/auth/src/pages/two-factor/recover.tsx @@ -1,8 +1,6 @@ -import { ensure } from "@/utils/ensure"; import Page_ from "@ente/accounts/pages/two-factor/recover"; -import { useContext } from "react"; -import { AppContext } from "../_app"; +import { useAppContext } from "../_app"; -const Page = () => ; +const Page = () => ; export default Page; diff --git a/web/apps/auth/src/pages/two-factor/setup.tsx b/web/apps/auth/src/pages/two-factor/setup.tsx index 35a24149fc..12716e2dfb 100644 --- a/web/apps/auth/src/pages/two-factor/setup.tsx +++ b/web/apps/auth/src/pages/two-factor/setup.tsx @@ -1,8 +1,6 @@ -import { ensure } from "@/utils/ensure"; import Page_ from "@ente/accounts/pages/two-factor/setup"; -import { useContext } from "react"; -import { AppContext } from "../_app"; +import { useAppContext } from "../_app"; -const Page = () => ; +const Page = () => ; export default Page; diff --git a/web/apps/auth/src/pages/two-factor/verify.tsx b/web/apps/auth/src/pages/two-factor/verify.tsx index 3f4ed7e399..7c682b1b99 100644 --- a/web/apps/auth/src/pages/two-factor/verify.tsx +++ b/web/apps/auth/src/pages/two-factor/verify.tsx @@ -1,8 +1,6 @@ -import { ensure } from "@/utils/ensure"; import Page_ from "@ente/accounts/pages/two-factor/verify"; -import { useContext } from "react"; -import { AppContext } from "../_app"; +import { useAppContext } from "../_app"; -const Page = () => ; +const Page = () => ; export default Page; diff --git a/web/apps/auth/src/pages/verify.tsx b/web/apps/auth/src/pages/verify.tsx index 5fb2ed10d5..bb2dc87788 100644 --- a/web/apps/auth/src/pages/verify.tsx +++ b/web/apps/auth/src/pages/verify.tsx @@ -1,8 +1,6 @@ -import { ensure } from "@/utils/ensure"; import Page_ from "@ente/accounts/pages/verify"; -import { useContext } from "react"; -import { AppContext } from "./_app"; +import { useAppContext } from "./_app"; -const Page = () => ; +const Page = () => ; export default Page;