Add 401 page (#1508)

This commit is contained in:
Manuel
2023-10-27 23:10:42 +02:00
committed by GitHub
parent 4072ebc5a5
commit 5b3a236194
11 changed files with 107 additions and 46 deletions

View File

@@ -44,6 +44,7 @@ import { MainLayout } from '~/components/layout/Templates/MainLayout';
import { createTrpcServersideHelpers } from '~/server/api/helper';
import { getServerAuthSession } from '~/server/auth';
import { getServerSideTranslations } from '~/tools/server/getServerSideTranslations';
import { checkForSessionOrAskForLogin } from '~/tools/server/loginBuilder';
import { firstUpperCase } from '~/tools/shared/strings';
import { api } from '~/utils/api';
import { useI18nZodResolver } from '~/utils/i18n-zod-resolver';
@@ -275,22 +276,22 @@ const routeParamsSchema = z.object({
slug: z.string(),
});
export const getServerSideProps: GetServerSideProps = async ({ req, res, locale, params }) => {
const routeParams = routeParamsSchema.safeParse(params);
export const getServerSideProps: GetServerSideProps = async (context) => {
const routeParams = routeParamsSchema.safeParse(context.params);
if (!routeParams.success) {
return {
notFound: true,
};
}
const session = await getServerAuthSession({ req, res });
if (!session?.user.isAdmin) {
return {
notFound: true,
};
const session = await getServerAuthSession({ req: context.req, res: context.res });
const result = checkForSessionOrAskForLogin(context, session, () => session?.user.isAdmin == true);
if (result) {
return result;
}
const helpers = await createTrpcServersideHelpers({ req, res });
const helpers = await createTrpcServersideHelpers({ req: context.req, res: context.res });
const config = await helpers.config.byName.fetch({ name: routeParams.data.slug });
@@ -305,9 +306,9 @@ export const getServerSideProps: GetServerSideProps = async ({ req, res, locale,
'settings/customization/gridstack',
'settings/customization/access',
],
locale,
req,
res
context.locale,
context.req,
context.res
);
return {

View File

@@ -11,6 +11,7 @@ import { getDefaultBoardAsync } from '~/server/db/queries/userSettings';
import { userSettings } from '~/server/db/schema';
import { getFrontendConfig } from '~/tools/config/getFrontendConfig';
import { getServerSideTranslations } from '~/tools/server/getServerSideTranslations';
import { checkForSessionOrAskForLogin } from '~/tools/server/loginBuilder';
import { boardNamespaces } from '~/tools/server/translation-namespaces';
import { ConfigType } from '~/types/config';
@@ -45,15 +46,9 @@ export const getServerSideProps: GetServerSideProps<BoardGetServerSideProps> = a
);
const config = await getFrontendConfig(boardName);
if (!config?.settings?.access?.allowGuests && !session?.user) {
return {
notFound: true,
props: {
primaryColor: config.settings.customization.colors.primary,
secondaryColor: config.settings.customization.colors.secondary,
primaryShade: config.settings.customization.colors.shade,
},
};
const result = checkForSessionOrAskForLogin(ctx, session, () => true);
if (result) {
return result;
}
return {