refactor: 💡 throw errors

s-hirano-ist · Oct 15, 2024 · da437dc · da437dc
1 parent ea89589
commit da437dc
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 37 deletions.
diff --git a/src/features/auth/actions/change-role.ts b/src/features/auth/actions/change-role.ts
@@ -2,7 +2,7 @@
 import "server-only";
 import { SUCCESS_MESSAGES } from "@/constants";
 import { wrapServerSideErrorForClient } from "@/error-wrapper";
-import { checkSelfAdminRoleOrThrow } from "@/features/auth/utils/get-session";
+import { hasAdminPermissionOrThrow } from "@/features/auth/utils/get-session";
 import prisma from "@/prisma";
 import type { ServerAction } from "@/types";
 import { sendLineNotifyMessage } from "@/utils/fetch-message";
@@ -14,7 +14,7 @@ export async function changeRole(
 	role: Role,
 ): Promise<ServerAction<undefined>> {
 	try {
-		await checkSelfAdminRoleOrThrow();
+		await hasAdminPermissionOrThrow();
 
 		await prisma.users.update({
 			where: { id: userId },

diff --git a/src/features/auth/actions/sign-in.tsx b/src/features/auth/actions/sign-in.tsx
@@ -16,15 +16,15 @@ async function createSelfLoginHistory(
 	ipAddress: string | undefined,
 	userAgent: string | undefined,
 ) {
+	// MEMO: auth()によって制限をかけると動かない
 	const user = await prisma.users.findUniqueOrThrow({
 		where: { username },
 		select: { id: true },
 	});
-	const userId = user.id;
 
 	return await prisma.loginHistories.create({
 		data: {
-			userId,
+			userId: user.id,
 			ipAddress,
 			userAgent,
 		},

diff --git a/src/features/auth/utils/get-session.ts b/src/features/auth/utils/get-session.ts
@@ -1,8 +1,12 @@
-"use server";
 import "server-only";
 import { NotAllowedError, UnauthorizedError } from "@/error-classes";
 // import { redirect } from "next/navigation";
 import { auth } from "./auth";
+import {
+	checkAdminPermission,
+	checkPostPermission,
+	checkUpdateStatusPermission,
+} from "./role";
 
 export async function checkSelfAuth() {
 	const session = await auth();
@@ -13,9 +17,19 @@ export async function checkSelfAuth() {
 	return session;
 }
 
-export async function checkSelfAdminRoleOrThrow() {
-	const role = await getSelfRole();
-	if (role !== "ADMIN") throw new NotAllowedError();
+export async function hasAdminPermissionOrThrow() {
+	const hasAdminPermission = await checkAdminPermission();
+	if (!hasAdminPermission) throw new NotAllowedError();
+}
+
+export async function hasSelfPostPermissionOrThrow() {
+	const hasPostPermission = await checkPostPermission();
+	if (!hasPostPermission) throw new NotAllowedError();
+}
+
+export async function hasUpdateStatusPermissionOrThrow() {
+	const hasUpdateStatusPermission = await checkUpdateStatusPermission();
+	if (!hasUpdateStatusPermission) throw new NotAllowedError();
 }
 
 export async function getUserId() {

diff --git a/src/features/auth/utils/header-info.ts b/src/features/auth/utils/header-info.ts
@@ -1,3 +1,4 @@
+import "server-only";
 import { headers } from "next/headers";
 
 export function getLoginUserInfo() {

diff --git a/src/features/auth/utils/role.ts b/src/features/auth/utils/role.ts
@@ -1,4 +1,3 @@
-"use server";
 import "server-only";
 import { UnexpectedError } from "@/error-classes";
 import prisma from "@/prisma";

diff --git a/src/features/dump/actions/add-contents.ts b/src/features/dump/actions/add-contents.ts
@@ -1,10 +1,11 @@
 "use server";
 import "server-only";
 import { SUCCESS_MESSAGES } from "@/constants";
-import { NotAllowedError } from "@/error-classes";
 import { wrapServerSideErrorForClient } from "@/error-wrapper";
-import { getUserId } from "@/features/auth/utils/get-session";
-import { checkPostPermission } from "@/features/auth/utils/role";
+import {
+	getUserId,
+	hasSelfPostPermissionOrThrow,
+} from "@/features/auth/utils/get-session";
 import type { ContentsContext } from "@/features/dump/stores/contents-context";
 import { validateContents } from "@/features/dump/utils/validate-contents";
 import prisma from "@/prisma";
@@ -16,8 +17,7 @@ export async function addContents(
 	formData: FormData,
 ): Promise<ServerAction<ContentsContext>> {
 	try {
-		const hasPostPermission = await checkPostPermission();
-		if (!hasPostPermission) throw new NotAllowedError();
+		await hasSelfPostPermissionOrThrow();
 
 		const userId = await getUserId();
 

diff --git a/src/features/dump/actions/add-news.ts b/src/features/dump/actions/add-news.ts
@@ -1,10 +1,11 @@
 "use server";
 import "server-only";
 import { SUCCESS_MESSAGES } from "@/constants";
-import { NotAllowedError } from "@/error-classes";
 import { wrapServerSideErrorForClient } from "@/error-wrapper";
-import { getUserId } from "@/features/auth/utils/get-session";
-import { checkPostPermission } from "@/features/auth/utils/role";
+import {
+	getUserId,
+	hasSelfPostPermissionOrThrow,
+} from "@/features/auth/utils/get-session";
 import type { NewsContext } from "@/features/dump/stores/news-context";
 import { validateCategory } from "@/features/dump/utils/validate-category";
 import { validateNews } from "@/features/dump/utils/validate-news";
@@ -20,13 +21,13 @@ export async function addNews(
 	formData: FormData,
 ): Promise<ServerAction<NewsContext>> {
 	try {
-		const hasPostPermission = await checkPostPermission();
-		if (!hasPostPermission) throw new NotAllowedError();
+		await hasSelfPostPermissionOrThrow();
+
+		const userId = await getUserId();
 
 		const hasCategory = formData.get("new_category") !== null;
 
 		if (hasCategory) {
-			const userId = await getUserId();
 			const category = await prisma.categories.create({
 				data: { userId, ...validateCategory(formData) },
 			});
@@ -37,7 +38,6 @@ export async function addNews(
 			formData.set("category", String(category.id));
 		}
 
-		const userId = await getUserId();
 		const createdNews = await prisma.news.create({
 			data: { userId, ...validateNews(formData) },
 			select: {

diff --git a/src/features/profile/actions/change-scope.ts b/src/features/profile/actions/change-scope.ts
@@ -12,9 +12,9 @@ export async function changeScope(
 	checked: boolean,
 ): Promise<ServerAction<undefined>> {
 	try {
-		const scope = checked ? "PUBLIC" : "PRIVATE";
-
 		const userId = await getUserId();
+
+		const scope = checked ? "PUBLIC" : "PRIVATE";
 		await prisma.users.update({
 			where: { id: userId },
 			data: { scope },

diff --git a/src/features/update-status/actions/change-contents-status.ts b/src/features/update-status/actions/change-contents-status.ts
@@ -1,10 +1,12 @@
 "use server";
 import "server-only";
 import { SUCCESS_MESSAGES } from "@/constants";
-import { NotAllowedError, UnexpectedError } from "@/error-classes";
+import { UnexpectedError } from "@/error-classes";
 import { wrapServerSideErrorForClient } from "@/error-wrapper";
-import { getUserId } from "@/features/auth/utils/get-session";
-import { checkUpdateStatusPermission } from "@/features/auth/utils/role";
+import {
+	getUserId,
+	hasUpdateStatusPermissionOrThrow,
+} from "@/features/auth/utils/get-session";
 import type { Status, UpdateOrRevert } from "@/features/update-status/types";
 import prisma from "@/prisma";
 import type { ServerAction } from "@/types";
@@ -68,8 +70,7 @@ export async function changeContentsStatus(
 	changeType: UpdateOrRevert,
 ): Promise<ServerAction<ToastMessage>> {
 	try {
-		const hasUpdateStatusPermission = await checkUpdateStatusPermission();
-		if (!hasUpdateStatusPermission) throw new NotAllowedError();
+		await hasUpdateStatusPermissionOrThrow();
 
 		const data = formatChangeStatusMessage(
 			await handleStatusChange(changeType),

diff --git a/src/features/update-status/actions/change-news-status.ts b/src/features/update-status/actions/change-news-status.ts
@@ -1,10 +1,12 @@
 "use server";
 import "server-only";
 import { SUCCESS_MESSAGES } from "@/constants";
-import { NotAllowedError, UnexpectedError } from "@/error-classes";
+import { UnexpectedError } from "@/error-classes";
 import { wrapServerSideErrorForClient } from "@/error-wrapper";
-import { getUserId } from "@/features/auth/utils/get-session";
-import { checkUpdateStatusPermission } from "@/features/auth/utils/role";
+import {
+	getUserId,
+	hasUpdateStatusPermissionOrThrow,
+} from "@/features/auth/utils/get-session";
 import type { Status, UpdateOrRevert } from "@/features/update-status/types";
 import prisma from "@/prisma";
 import type { ServerAction } from "@/types";
@@ -68,8 +70,7 @@ export async function changeNewsStatus(
 	updateOrRevert: UpdateOrRevert,
 ): Promise<ServerAction<ToastMessage>> {
 	try {
-		const hasUpdateStatusPermission = await checkUpdateStatusPermission();
-		if (!hasUpdateStatusPermission) throw new NotAllowedError();
+		await hasUpdateStatusPermissionOrThrow();
 
 		const data = formatChangeStatusMessage(
 			await handleStatusChange(updateOrRevert),

diff --git a/src/features/update-status/components/contents-table.tsx b/src/features/update-status/components/contents-table.tsx
@@ -1,13 +1,13 @@
 "use server";
 import { StatusCodeView } from "@/components/status-code-view";
-import { checkSelfAdminRoleOrThrow } from "@/features/auth/utils/get-session";
+import { hasAdminPermissionOrThrow } from "@/features/auth/utils/get-session";
 import type { ContentsContext } from "@/features/dump/stores/contents-context";
 import { DumpTable } from "@/features/update-status/components/dump-table";
 import prisma from "@/prisma";
 
 export async function ContentsTable() {
 	try {
-		await checkSelfAdminRoleOrThrow();
+		await hasAdminPermissionOrThrow();
 
 		const contents = await prisma.contents.findMany({
 			select: {

diff --git a/src/features/update-status/components/news-table.tsx b/src/features/update-status/components/news-table.tsx
@@ -1,13 +1,13 @@
 "use server";
 import { StatusCodeView } from "@/components/status-code-view";
-import { checkSelfAdminRoleOrThrow } from "@/features/auth/utils/get-session";
+import { hasAdminPermissionOrThrow } from "@/features/auth/utils/get-session";
 import type { NewsContext } from "@/features/dump/stores/news-context";
 import { DumpTable } from "@/features/update-status/components/dump-table";
 import prisma from "@/prisma";
 
 export async function NewsTable() {
 	try {
-		await checkSelfAdminRoleOrThrow();
+		await hasAdminPermissionOrThrow();
 
 		const news = await prisma.news.findMany({
 			select: {