Merge pull request sinamics#498 from sinamics/middleware

Replace custom locale middleware with nextjs i18n redirects
tinola · Aug 19, 2024 · 13bccd6 · 13bccd6
2 parents 71ab890 + 0b7051f
commit 13bccd6
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 105 deletions.
diff --git a/next.config.mjs b/next.config.mjs
@@ -27,12 +27,22 @@ const config = {
 	 * @see https://github.com/vercel/next.js/issues/41980
 	 */
 	i18n: {
-		defaultLocale: "default",
-		locales: ["default", "en", "fr", "no", "pl", "zh-tw", "zh", "es"],
+		defaultLocale: "en",
+		// localeDetection: false,
+		locales: ["en", "fr", "no", "pl", "zh-tw", "zh", "es"],
 	},
 	trailingSlash: true,
 	eslint: {
 		ignoreDuringBuilds: true,
 	},
+	async redirects() {
+		return [
+			{
+				source: "/",
+				destination: "/auth/login",
+				permanent: true,
+			},
+		];
+	},
 };
 export default config;
diff --git a/package.json b/package.json
@@ -107,4 +107,4 @@
 	"prisma": {
 		"seed": "ts-node --compiler-options {\"module\":\"CommonJS\"} prisma/seed.ts"
 	}
-}
+}
diff --git a/src/components/adminPage/mail/mailForgotPasswordTemplate.tsx b/src/components/adminPage/mail/mailForgotPasswordTemplate.tsx
@@ -3,7 +3,7 @@ import { useState, useEffect } from "react";
 import { api } from "~/utils/api";
 import { toast } from "react-hot-toast";
 import cn from "classnames";
-import { useTranslations } from "use-intl";
+import { useTranslations } from "next-intl";
 import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,

diff --git a/src/components/adminPage/mail/mailNotificationTemplate.tsx b/src/components/adminPage/mail/mailNotificationTemplate.tsx
@@ -2,7 +2,7 @@ import { useState, useEffect } from "react";
 import { api } from "~/utils/api";
 import { toast } from "react-hot-toast";
 import cn from "classnames";
-import { useTranslations } from "use-intl";
+import { useTranslations } from "next-intl";
 import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,

diff --git a/src/components/adminPage/mail/mailOrganizationInviteTemplate.tsx b/src/components/adminPage/mail/mailOrganizationInviteTemplate.tsx
@@ -2,7 +2,7 @@ import { useState, useEffect } from "react";
 import { api } from "~/utils/api";
 import { toast } from "react-hot-toast";
 import cn from "classnames";
-import { useTranslations } from "use-intl";
+import { useTranslations } from "next-intl";
 import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,

diff --git a/src/components/adminPage/mail/mailUserInviteTemplate.tsx b/src/components/adminPage/mail/mailUserInviteTemplate.tsx
@@ -3,7 +3,7 @@ import { useState, useEffect } from "react";
 import { api } from "~/utils/api";
 import { toast } from "react-hot-toast";
 import cn from "classnames";
-import { useTranslations } from "use-intl";
+import { useTranslations } from "next-intl";
 import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,

diff --git a/src/components/networkByIdPage/networkMtu.tsx b/src/components/networkByIdPage/networkMtu.tsx
@@ -1,7 +1,7 @@
 import { useRouter } from "next/router";
 import { useState, useEffect } from "react";
 import { api } from "~/utils/api";
-import { useTranslations } from "use-intl";
+import { useTranslations } from "next-intl";
 import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,

diff --git a/src/components/networkByIdPage/networkMulticast.tsx b/src/components/networkByIdPage/networkMulticast.tsx
@@ -1,7 +1,7 @@
 import { useRouter } from "next/router";
 import { useState, useEffect } from "react";
 import { api } from "~/utils/api";
-import { useTranslations } from "use-intl";
+import { useTranslations } from "next-intl";
 import {
 	useTrpcApiErrorHandler,
 	useTrpcApiSuccessHandler,

diff --git a/src/middleware.ts b/src/middleware.ts
diff --git a/src/pages/admin/mail/index.tsx b/src/pages/admin/mail/index.tsx
@@ -6,7 +6,7 @@ import { type GlobalOptions } from "@prisma/client";
 import MailUserInviteTemplate from "~/components/adminPage/mail/mailUserInviteTemplate";
 import ForgotPasswordMailTemplate from "~/components/adminPage/mail/mailForgotPasswordTemplate";
 import NotificationTemplate from "~/components/adminPage/mail/mailNotificationTemplate";
-import { useTranslations } from "use-intl";
+import { useTranslations } from "next-intl";
 import OrganizationInviteTemplate from "~/components/adminPage/mail/mailOrganizationInviteTemplate";
 import {
 	useTrpcApiErrorHandler,

diff --git a/src/pages/auth/login/index.tsx b/src/pages/auth/login/index.tsx
@@ -11,7 +11,7 @@ import { api } from "~/utils/api";
 import { useRouter } from "next/router";
 import classNames from "classnames";
 import { ErrorCode, getErrorMessage } from "~/utils/errorCode";
-import { useTranslations } from "use-intl";
+import { useTranslations } from "next-intl";
 
 const Login = ({ title, oauthExclusiveLogin, oauthEnabled }) => {
 	const t = useTranslations();

diff --git a/src/pages/auth/mfaRecovery/reset/index.tsx b/src/pages/auth/mfaRecovery/reset/index.tsx
@@ -1,6 +1,7 @@
 import { useState } from "react";
 import { useRouter } from "next/router";
 import { api } from "~/utils/api";
+import { Session } from "next-auth";
 import { toast } from "react-hot-toast";
 import { type ErrorData, type ZodErrorFieldErrors } from "~/types/errorHandling";
 import Head from "next/head";
@@ -9,6 +10,8 @@ import FormInput from "~/components/auth/formInput";
 import FormSubmitButtons from "~/components/auth/formSubmitButton";
 import { ErrorCode } from "~/utils/errorCode";
 import { useTranslations } from "next-intl";
+import { GetServerSideProps, GetServerSidePropsContext } from "next";
+import { getSession } from "next-auth/react";
 
 const MfaRecoveryReset = () => {
 	const t = useTranslations();
@@ -181,4 +184,33 @@ const MfaRecoveryReset = () => {
 	);
 };
 
+interface Props {
+	auth?: Session["user"];
+}
+export const getServerSideProps: GetServerSideProps<Props> = async (
+	context: GetServerSidePropsContext,
+) => {
+	const session = await getSession(context);
+	if (!session || !("user" in session) || !session.user) {
+		return {
+			props: {
+				messages: (await import(`~/locales/${context.locale}/common.json`)).default,
+			},
+		};
+	}
+
+	if (session.user) {
+		return {
+			redirect: {
+				destination: "/network",
+				permanent: false,
+			},
+		};
+	}
+
+	return {
+		props: { auth: session.user },
+	};
+};
+
 export default MfaRecoveryReset;
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
diff --git a/src/pages/organization/[orgid]/admin/network/index.tsx b/src/pages/organization/[orgid]/admin/network/index.tsx
@@ -1,7 +1,7 @@
 import { type ReactElement } from "react";
 import { LayoutOrganizationAuthenticated } from "~/components/layouts/layout";
 import { api } from "~/utils/api";
-import { useTranslations } from "use-intl";
+import { useTranslations } from "next-intl";
 import { useRouter } from "next/router";
 import MenuSectionDividerWrapper from "~/components/shared/menuSectionDividerWrapper";
 

diff --git a/src/pages/user-settings/network/index.tsx b/src/pages/user-settings/network/index.tsx
@@ -1,7 +1,7 @@
 import { type ReactElement } from "react";
 import { LayoutAuthenticated } from "~/components/layouts/layout";
 import { api } from "~/utils/api";
-import { useTranslations } from "use-intl";
+import { useTranslations } from "next-intl";
 import { User, UserOptions } from "@prisma/client";
 import MenuSectionDividerWrapper from "~/components/shared/menuSectionDividerWrapper";
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,4 +107,4 @@ @@
     	"prisma": {
     		"seed": "ts-node --compiler-options {\"module\":\"CommonJS\"} prisma/seed.ts"
     	}
-    }
+    }