Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion components/docs/modals.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
IconGif,
IconVideo,
IconUpload,
IconFolder,
} from "@tabler/icons-react";
import { docsPanelShadow } from "./shell";
import {
Expand Down
38 changes: 38 additions & 0 deletions lib/security.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import type {
NextApiHandler,
NextApiRequest,
NextApiResponse
} from "next";

export function verifyWorkspace(req: NextApiRequest): boolean {
const { id: workspaceId } = req.query;
if (!workspaceId) return true;

const workspace = Array.isArray(workspaceId) ? workspaceId[0] : workspaceId;

const isValidWorkspaceId = /^[A-Za-z0-9_-]+$/.test(workspace);
if (!isValidWorkspaceId) return false;
return true
}

export function withHandler(
handler: (req: NextApiRequest, res: NextApiResponse) => any,
): NextApiHandler {
return async (req: NextApiRequest, res: NextApiResponse) => {
try {
if (!verifyWorkspace(req)) return res.status(400).send({
success: false,
error: "Not valid workspace"
});

return handler(req, res);
} catch (error) {
console.error("Handler error:", error);

return res.status(500).json({
success: false,
error: "Internal Server Error",
});
}
};
}
9 changes: 9 additions & 0 deletions lib/withAuth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import * as cookie from "cookie";
import * as crypto from "crypto";
import { getConfig } from "@/utils/configEngine";
import prisma from "@/utils/database";
import { verifyWorkspace } from "./security";

if (process.env.NODE_ENV === "production") {
const secret =
Expand Down Expand Up @@ -56,6 +57,10 @@ export function withAuth(
handler: (req: AuthenticatedRequest, res: NextApiResponse) => any,
): NextApiHandler {
return async (req: NextApiRequest, res: NextApiResponse) => {
if (!verifyWorkspace(req)) return res.status(400).send({
success: false,
error: "Not valid workspace"
});
try {
const cookies = cookie.parse(req.headers.cookie || "");

Expand Down Expand Up @@ -115,6 +120,10 @@ export function withKey(
handler: (req: NextApiRequest, res: NextApiResponse) => any,
): NextApiHandler {
return async (req: NextApiRequest, res: NextApiResponse) => {
if (!verifyWorkspace(req)) return res.status(400).send({
success: false,
error: "Not valid workspace"
})
const { id } = req.query;
try {
const auth = req.headers.authorization;
Expand Down
2 changes: 1 addition & 1 deletion pages/api/setup/opencloudtest.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NextApiResponse } from "next";
import axios from "axios";
import { AuthenticatedRequest, withAuth } from "@/lib/withAuth";
import { AuthenticatedRequest } from "@/lib/withAuth";

interface OpenCloudKeyRes {
name: string;
Expand Down
2 changes: 1 addition & 1 deletion pages/api/user/firstLogin.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type { NextApiRequest, NextApiResponse } from 'next'
import type { NextApiResponse } from 'next'
import prisma from '@/utils/database';
import { AuthenticatedRequest, withAuth } from '@/lib/withAuth';

Expand Down
3 changes: 1 addition & 2 deletions pages/api/workspace/[id]/activity/history/[userId].ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { withPermissionCheck } from "@/utils/permissionsManager";
import { AuthenticatedRequest, withAuth } from "@/lib/withAuth";
import type { NextApiRequest, NextApiResponse } from "next";
import type { NextApiResponse } from "next";
import prisma from "@/utils/database";

export default withAuth(async function handler(
Expand Down
8 changes: 2 additions & 6 deletions pages/api/workspace/[id]/allies/[aid]/delete.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type { NextApiRequest, NextApiResponse } from 'next'
import { fetchworkspace, getConfig, setConfig } from '@/utils/configEngine'
import prisma, { inactivityNotice } from '@/utils/database';
// import { withAuth } from '@/lib/withSession'
import type { NextApiResponse } from 'next'
import prisma from '@/utils/database';
import { withPermissionCheck } from '@/utils/permissionsManager'
import { getUsername, getThumbnail, getDisplayName } from '@/utils/userinfoEngine'
import * as noblox from 'noblox.js'
import { AuthenticatedRequest } from '@/lib/withAuth';
type Data = {
success: boolean
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/allies/[aid]/discipline.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextApiRequest, NextApiResponse } from "next";
import type { NextApiResponse } from "next";
import { AuthenticatedRequest, withAuth } from "@/lib/withAuth";
import prisma from "@/utils/database";
import { getConfig } from "@/utils/configEngine";
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/allies/[aid]/notes.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type { NextApiRequest, NextApiResponse } from 'next'
import type { NextApiResponse } from 'next'
import prisma from '@/utils/database';
import { AuthenticatedRequest, withAuth } from '@/lib/withAuth';

Expand Down
8 changes: 2 additions & 6 deletions pages/api/workspace/[id]/allies/[aid]/reps.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type { NextApiRequest, NextApiResponse } from 'next'
import { fetchworkspace, getConfig, setConfig } from '@/utils/configEngine'
import prisma, { inactivityNotice } from '@/utils/database';
// import { withAuth } from '@/lib/withSession'
import type { NextApiResponse } from 'next'
import prisma from '@/utils/database';
import { withPermissionCheck } from '@/utils/permissionsManager'
import { getUsername, getThumbnail, getDisplayName } from '@/utils/userinfoEngine'
import * as noblox from 'noblox.js'
import { AuthenticatedRequest } from '@/lib/withAuth';
type Data = {
success: boolean
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/allies/[aid]/update.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextApiRequest, NextApiResponse } from 'next';
import type { NextApiResponse } from 'next';
import prisma from '@/utils/database';
import { AuthenticatedRequest, withAuth } from '@/lib/withAuth';

Expand Down
8 changes: 2 additions & 6 deletions pages/api/workspace/[id]/allies/[aid]/visits/[vid].ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type { NextApiRequest, NextApiResponse } from 'next'
import { fetchworkspace, getConfig, setConfig } from '@/utils/configEngine'
import prisma, { allyVisit } from '@/utils/database';
import { withPermissionCheck } from '@/utils/permissionsManager'
import { getUsername, getThumbnail, getDisplayName } from '@/utils/userinfoEngine'
import * as noblox from 'noblox.js'
import type { NextApiResponse } from 'next'
import prisma from '@/utils/database';
import { AuthenticatedRequest, withAuth } from '@/lib/withAuth';
type Data = {
success: boolean
Expand Down
3 changes: 1 addition & 2 deletions pages/api/workspace/[id]/allies/[aid]/visits/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type { NextApiRequest, NextApiResponse } from 'next'
import type { NextApiResponse } from 'next'
import prisma from '@/utils/database';
import { AuthenticatedRequest, withAuth } from '@/lib/withAuth';
// import { withAuth } from '@/lib/withSession'

type Data = {
success: boolean
Expand Down
3 changes: 1 addition & 2 deletions pages/api/workspace/[id]/allies/new.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type { NextApiRequest, NextApiResponse } from 'next'
import type { NextApiResponse } from 'next'
import prisma from '@/utils/database';
import { withPermissionCheck } from '@/utils/permissionsManager'
import moment from 'moment';
import * as noblox from 'noblox.js'
import { AuthenticatedRequest } from '@/lib/withAuth';
type Data = {
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/announcement/update.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextApiRequest, NextApiResponse } from "next";
import type { NextApiResponse } from "next";
import prisma from "@/utils/database";
import { withPermissionCheck } from "@/utils/permissionsManager";
import { logAudit } from "@/utils/logs";
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/api-keys/[keyId]/create.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextApiRequest, NextApiResponse } from "next"
import type { NextApiResponse } from "next"
import { withPermissionCheck } from "@/utils/permissionsManager"
import prisma from "@/utils/database"
import crypto from "crypto"
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/api-keys/[keyId]/delete.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextApiRequest, NextApiResponse } from "next"
import type { NextApiResponse } from "next"
import { withPermissionCheck } from "@/utils/permissionsManager"
import prisma from "@/utils/database"
import { AuthenticatedRequest } from "@/lib/withAuth"
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/birthday/[userId].ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextApiRequest, NextApiResponse } from 'next';
import type { NextApiResponse } from 'next';
import prisma from '@/utils/database';
import { AuthenticatedRequest, withAuth } from '@/lib/withAuth';

Expand Down
5 changes: 1 addition & 4 deletions pages/api/workspace/[id]/guides/[docid]/delete.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type { NextApiRequest, NextApiResponse } from 'next'
import { fetchworkspace, getConfig, setConfig } from '@/utils/configEngine'
import type { NextApiResponse } from 'next'
import prisma from '@/utils/database';
import { withPermissionCheck } from '@/utils/permissionsManager'
import { logAudit } from '@/utils/logs'
import { getUsername, getThumbnail, getDisplayName } from '@/utils/userinfoEngine'
import * as noblox from 'noblox.js'
import { AuthenticatedRequest } from '@/lib/withAuth';
type Data = {
success: boolean
Expand Down
7 changes: 1 addition & 6 deletions pages/api/workspace/[id]/home/activeSessions.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type { NextApiRequest, NextApiResponse } from 'next'
import { fetchworkspace, getConfig, setConfig } from '@/utils/configEngine'
import prisma, { SessionType, Session } from '@/utils/database';
// import { withAuth } from '@/lib/withSession'
import prisma, { Session } from '@/utils/database';
import { withPermissionCheck } from '@/utils/permissionsManager'

import { getUsername, getThumbnail, getDisplayName } from '@/utils/userinfoEngine'
import * as noblox from 'noblox.js'
type Data = {
success: boolean
error?: string
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/home/docs.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextApiRequest, NextApiResponse } from "next";
import type { NextApiResponse } from "next";
import prisma, { document } from "@/utils/database";
import { withPermissionCheck } from "@/utils/permissionsManager";
import { AuthenticatedRequest } from "@/lib/withAuth";
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/home/new-members.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextApiRequest, NextApiResponse } from 'next';
import type { NextApiResponse } from 'next';
import prisma from '@/utils/database';
import { AuthenticatedRequest, withAuth } from '@/lib/withAuth';

Expand Down
1 change: 0 additions & 1 deletion pages/api/workspace/[id]/home/quickLinks.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type { NextApiRequest, NextApiResponse } from 'next'
import prisma, { document } from '@/utils/database';
import { withPermissionCheck } from '@/utils/permissionsManager'
import axios from 'axios';
import PackageInfo from '@/package.json'
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/home/upcoming.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextApiRequest, NextApiResponse } from "next";
import type { NextApiResponse } from "next";
import prisma from "@/utils/database";
import { AuthenticatedRequest, withAuth } from "@/lib/withAuth";

Expand Down
8 changes: 1 addition & 7 deletions pages/api/workspace/[id]/home/wall.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type { NextApiRequest, NextApiResponse } from 'next'
import { fetchworkspace, getConfig, setConfig } from '@/utils/configEngine'
import prisma, { SessionType, Session, wallPost } from '@/utils/database';
// import { withAuth } from '@/lib/withSession'
import prisma, { wallPost } from '@/utils/database';
import { withPermissionCheck } from '@/utils/permissionsManager'

import { getUsername, getThumbnail, getDisplayName } from '@/utils/userinfoEngine'
import * as noblox from 'noblox.js'
type Data = {
success: boolean
error?: string
Expand Down
3 changes: 1 addition & 2 deletions pages/api/workspace/[id]/policies/[docId].ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import type { NextApiRequest, NextApiResponse } from 'next'
import type { NextApiResponse } from 'next'
import prisma from '@/utils/database';
import { logAudit } from '@/utils/logs';
// import { withAuth } from '@/lib/withSession'
import { withPermissionCheck } from '@/utils/permissionsManager'
import { AuthenticatedRequest } from '@/lib/withAuth';

Expand Down
1 change: 0 additions & 1 deletion pages/api/workspace/[id]/policies/create.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { fetchworkspace, getConfig, setConfig } from '@/utils/configEngine'
import prisma, { SessionType, document } from '@/utils/database';
import { logAudit } from '@/utils/logs';
import { sanitizeJSON } from '@/utils/sanitise';
// import { withAuth } from '@/lib/withSession'
import { withPermissionCheck } from '@/utils/permissionsManager'

import { getUsername, getThumbnail, getDisplayName } from '@/utils/userinfoEngine'
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/policies/pending.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { withPermissionCheck } from "@/utils/permissionsManager";
import type { NextApiRequest, NextApiResponse } from "next";
import type { NextApiResponse } from "next";
import prisma from "@/utils/database";
import { AuthenticatedRequest } from "@/lib/withAuth";

Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/resignations/count.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextApiRequest, NextApiResponse } from "next";
import type { NextApiResponse } from "next";
import prisma from "@/utils/database";
import { withPermissionCheck } from "@/utils/permissionsManager";
import { AuthenticatedRequest } from "@/lib/withAuth";
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/resignations/create.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextApiRequest, NextApiResponse } from "next";
import type { NextApiResponse } from "next";
import prisma from "@/utils/database";
import { withPermissionCheck } from "@/utils/permissionsManager";
import { AuthenticatedRequest } from "@/lib/withAuth";
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/resignations/update.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextApiRequest, NextApiResponse } from "next";
import type { NextApiResponse } from "next";
import prisma from "@/utils/database";
import { logAudit } from "@/utils/logs";
import { withPermissionCheck } from "@/utils/permissionsManager";
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/sessions/[sid]/notes/[noteId].ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextApiRequest, NextApiResponse } from "next";
import type { NextApiResponse } from "next";
import prisma from "@/utils/database";
import { AuthenticatedRequest, withAuth } from "@/lib/withAuth";

Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/sessions/create-unscheduled.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextApiRequest, NextApiResponse } from "next";
import type { NextApiResponse } from "next";
import prisma from "@/utils/database";
import { AuthenticatedRequest, withAuth } from "@/lib/withAuth";

Expand Down
5 changes: 2 additions & 3 deletions pages/api/workspace/[id]/sessions/manage/[sid]/claim.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type { NextApiRequest, NextApiResponse } from "next";
import type { NextApiResponse } from "next";
import prisma, { schedule } from "@/utils/database";
import roles from "../../../settings/roles";
import { AuthenticatedRequest, withAuth } from "@/lib/withAuth";
type Data = {
success: boolean;
Expand All @@ -21,7 +20,7 @@ export async function handler(req: AuthenticatedRequest, res: NextApiResponse<Da
return res
.status(400)
.json({ success: false, error: "Missing required fields" });
const { date, timezoneOffset } = req.body;
const { date } = req.body;
if (!date)
return res
.status(400)
Expand Down
4 changes: 1 addition & 3 deletions pages/api/workspace/[id]/sessions/manage/[sid]/claimSlot.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type { NextApiRequest, NextApiResponse } from "next";
import type { NextApiResponse } from "next";
import prisma, { schedule } from "@/utils/database";
import { AuthenticatedRequest, withAuth } from "@/lib/withAuth";

Expand Down Expand Up @@ -28,8 +28,6 @@ export async function handler(req: AuthenticatedRequest, res: NextApiResponse<Da
.json({ success: false, error: "Missing required fields" });
const day = new Date(date);

const days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];

const user = await prisma.user.findUnique({
where: {
userid: BigInt(req.auth.userId),
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/sessions/manage/[sid]/end.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type { NextApiRequest, NextApiResponse } from "next";
import type { NextApiResponse } from "next";
import prisma from "@/utils/database";
import { AuthenticatedRequest, withAuth } from "@/lib/withAuth";
type Data = {
Expand Down
4 changes: 2 additions & 2 deletions pages/api/workspace/[id]/sessions/manage/[sid]/unclaim.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
import type { NextApiRequest, NextApiResponse } from "next";
import type { NextApiResponse } from "next";
import prisma, { schedule } from "@/utils/database";
import { AuthenticatedRequest, withAuth } from "@/lib/withAuth";

Expand All @@ -21,7 +21,7 @@ export async function handler(req: AuthenticatedRequest, res: NextApiResponse<Da
return res
.status(400)
.json({ success: false, error: "Missing required fields" });
const { date, timezoneOffset } = req.body;
const { date } = req.body;
if (!date)
return res
.status(400)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextApiRequest, NextApiResponse } from "next"
import type { NextApiResponse } from "next"
import { withPermissionCheck } from "@/utils/permissionsManager"
import prisma from "@/utils/database"
import { AuthenticatedRequest } from "@/lib/withAuth"
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/settings/api-keys/create.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextApiRequest, NextApiResponse } from "next"
import type { NextApiResponse } from "next"
import { withPermissionCheck } from "@/utils/permissionsManager"
import prisma from "@/utils/database"
import crypto from "crypto"
Expand Down
2 changes: 1 addition & 1 deletion pages/api/workspace/[id]/settings/api-keys/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextApiRequest, NextApiResponse } from "next"
import type { NextApiResponse } from "next"
import { withPermissionCheck } from "@/utils/permissionsManager"
import prisma from "@/utils/database"
import { AuthenticatedRequest } from "@/lib/withAuth"
Expand Down
Loading
Loading