Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

small changes (#170)

ggrandic8a021f7f869
diff --git a/.env.example b/.env.example
index 1455ab1e..ab63d6e9 100644
--- a/.env.example
+++ b/.env.example
@@ -1,3 +1,4 @@
DATABASE_URL="mysql://dev:dev@localhost/typehero"
GITHUB_ID=
GITHUB_SECRET=
+NEXTAUTH_SECRET=
\ No newline at end of file
diff --git a/src/app/challenge/[id]/page.tsx b/src/app/challenge/[id]/page.tsx
index fbd79731..b9dde4a0 100644
--- a/src/app/challenge/[id]/page.tsx
+++ b/src/app/challenge/[id]/page.tsx
@@ -17,7 +17,5 @@ export default async function Challenges({ params: { id } }: Props) {
return notFound();
}
- console.log('challenge root');
-
return <LeftPanel challenge={challenge} selectedTab={'description'} />;
}
diff --git a/src/components/admin/admin.actions.tsx b/src/components/admin/admin.actions.tsx
index 724adb31..99a6fe51 100644
--- a/src/components/admin/admin.actions.tsx
+++ b/src/components/admin/admin.actions.tsx
@@ -1,7 +1,6 @@
'use server';
-import { getServerSession } from 'next-auth';
-import { authOptions } from '~/server/auth';
+import { getServerAuthSession } from '~/server/auth';
import { prisma } from '~/server/db';
export type AdminReportDetails = Awaited<ReturnType<typeof getChallengeReports>>;
@@ -10,7 +9,7 @@ export type AdminReportDetails = Awaited<ReturnType<typeof getChallengeReports>>
* The function fetches all the reports along
* with challenge and the user.
*/
-export async function getChallengeReports() {
+export function getChallengeReports() {
return prisma.challengeReport.findMany({
include: {
challenge: {
@@ -46,7 +45,7 @@ export async function getBannedUsers() {
* @returns
*/
export async function disableChallenge(challengeId: number, reportId: number) {
- const session = await getServerSession(authOptions);
+ const session = await getServerAuthSession();
try {
await prisma.$transaction([
prisma.challenge.update({
@@ -80,7 +79,7 @@ export async function disableChallenge(challengeId: number, reportId: number) {
* @returns
*/
export async function dismissChallengeReport(reportId: number) {
- const session = await getServerSession(authOptions);
+ const session = await getServerAuthSession();
return prisma.challengeReport.update({
where: {
id: reportId,
@@ -100,7 +99,7 @@ export async function dismissChallengeReport(reportId: number) {
* @returns
*/
export async function banUser(userId: string, reportId: number, banReason?: string) {
- const session = await getServerSession(authOptions);
+ const session = await getServerAuthSession();
try {
await prisma.$transaction([
diff --git a/src/components/challenge/comments/comment.action.ts b/src/components/challenge/comments/comment.action.ts
index e20e1105..4f4abfd3 100644
--- a/src/components/challenge/comments/comment.action.ts
+++ b/src/components/challenge/comments/comment.action.ts
@@ -1,8 +1,8 @@
'use server';
import { getServerSession } from 'next-auth';
-import { CommentReportSchemaType } from '~/components/challenge/comments/comment';
-import { authOptions } from '~/server/auth';
+import { type CommentReportSchemaType } from '~/components/challenge/comments/comment';
+import { authOptions, getServerAuthSession } from '~/server/auth';
import { prisma } from '~/server/db';
/**
@@ -12,7 +12,7 @@ import { prisma } from '~/server/db';
* @param text The comment text.
*/
export async function addChallengeComment(challengeId: number, text: string) {
- const session = await getServerSession(authOptions);
+ const session = await getServerAuthSession();
// 1. Checks.
if (!session?.user.id) return 'unauthorized';
diff --git a/src/env.mjs b/src/env.mjs
index f8f4ccd6..9d636dca 100644
--- a/src/env.mjs
+++ b/src/env.mjs
@@ -12,6 +12,7 @@ export const env = createEnv({
GITHUB_ID: z.string(),
GITHUB_SECRET: z.string(),
// EDGE_CONFIG: z.string(),
+ NEXTAUTH_SECRET: z.string(),
},
/**
@@ -33,6 +34,7 @@ export const env = createEnv({
GITHUB_SECRET: process.env.GITHUB_SECRET,
GITHUB_ID: process.env.GITHUB_ID,
// EDGE_CONFIG: process.env.EDGE_CONFIG,
+ NEXTAUTH_SECRET: process.env.NEXTAUTH_SECRET,
},
/**
* Run `build` or `dev` with `SKIP_ENV_VALIDATION` to skip env validation.
diff --git a/src/server/auth.ts b/src/server/auth.ts
index 077db316..7a0fa822 100644
--- a/src/server/auth.ts
+++ b/src/server/auth.ts
@@ -79,6 +79,7 @@ export const authOptions: NextAuthOptions = {
};
},
},
+ secret: env.NEXTAUTH_SECRET,
adapter: PrismaAdapter(prisma),
providers: [
GitHubProvider({