-
Room Settings
+ {isSignedIn &&
+ !!roomFromDb &&
+ (roomFromDb.userId === user.id || isAdmin(user?.publicMetadata)) && (
+ <>
+
+
+
Room Settings
-
+
-
{
- setRoomScale(event.target.value);
- }}
- />
+
{
+ setRoomScale(event.target.value);
+ }}
+ />
-
+
-
{
- setStoryNameText(event.target.value);
- }}
- />
+
{
+ setStoryNameText(event.target.value);
+ }}
+ />
-
-
-
-
-
-
-
-
-
- {votesFromDb &&
- (roomFromDb.logs.length > 0 || votesFromDb.length > 0) && (
-
-
-
-
- )}
+
+ )}
);
// Room does not exist
diff --git a/src/server/api/root.ts b/src/server/api/root.ts
index 4acf4e6..46b8d53 100644
--- a/src/server/api/root.ts
+++ b/src/server/api/root.ts
@@ -1,7 +1,6 @@
import { roomRouter } from "~/server/api/routers/room";
import { createTRPCRouter } from "~/server/api/trpc";
import { voteRouter } from "./routers/vote";
-import { restRouter } from "./routers/rest";
/**
* This is the primary router for your server.
@@ -11,7 +10,6 @@ import { restRouter } from "./routers/rest";
export const appRouter = createTRPCRouter({
room: roomRouter,
vote: voteRouter,
- rest: restRouter,
});
// export type definition of API
diff --git a/src/server/api/routers/rest.ts b/src/server/api/routers/rest.ts
deleted file mode 100644
index ad90207..0000000
--- a/src/server/api/routers/rest.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { validateApiKey } from "~/server/unkey";
-import { z } from "zod";
-
-import { createTRPCRouter, publicProcedure } from "~/server/api/trpc";
-import { TRPCError } from "@trpc/server";
-import { fetchCache, setCache } from "~/server/redis";
-import { sql } from "drizzle-orm";
-import { rooms, votes } from "~/server/schema";
-
-export const restRouter = createTRPCRouter({
- dbWarmer: publicProcedure
- .meta({ openapi: { method: "POST", path: "/rest/dbwarmer" } })
- .input(z.object({ key: z.string() }))
- .output(z.string())
- .query(async ({ ctx, input }) => {
- const isValidKey = await validateApiKey(input.key);
- if (isValidKey) {
- await ctx.db.query.votes.findMany();
- return "Toasted the DB";
- } else {
- throw new TRPCError({ code: "UNAUTHORIZED" });
- }
- }),
-
- voteCount: publicProcedure
- .meta({ openapi: { method: "GET", path: "/rest/votes/count" } })
- .input(z.void())
- .output(z.number())
- .query(async ({ ctx }) => {
- const cachedResult = await fetchCache
(`kv_votecount`);
-
- if (cachedResult) {
- return cachedResult;
- } else {
- const votesResult = (
- await ctx.db.select({ count: sql`count(*)` }).from(votes)
- )[0];
-
- const votesCount = votesResult ? Number(votesResult.count) : 0;
-
- await setCache(`kv_votecount`, votesCount);
-
- return votesCount;
- }
- }),
-
- roomCount: publicProcedure
- .meta({ openapi: { method: "GET", path: "/rest/rooms/count" } })
- .input(z.void())
- .output(z.number())
- .query(async ({ ctx }) => {
- const cachedResult = await fetchCache(`kv_roomcount`);
-
- if (cachedResult) {
- return cachedResult;
- } else {
- const roomsResult = (
- await ctx.db.select({ count: sql`count(*)` }).from(rooms)
- )[0];
-
- const roomsCount = roomsResult ? Number(roomsResult.count) : 0;
-
- await setCache(`kv_roomcount`, roomsCount);
-
- return roomsCount;
- }
- }),
-});
diff --git a/src/server/api/routers/room.ts b/src/server/api/routers/room.ts
index cf8c096..c27709f 100644
--- a/src/server/api/routers/room.ts
+++ b/src/server/api/routers/room.ts
@@ -49,8 +49,8 @@ export const roomRouter = createTRPCRouter({
// Get One
get: protectedProcedure
.input(z.object({ id: z.string() }))
- .query(({ ctx, input }) => {
- return ctx.db.query.rooms.findFirst({
+ .query(async ({ ctx, input }) => {
+ const roomFromDb = await ctx.db.query.rooms.findFirst({
where: eq(rooms.id, input.id),
with: {
logs: {
@@ -65,6 +65,7 @@ export const roomRouter = createTRPCRouter({
},
},
});
+ return roomFromDb || null;
}),
// Get All
@@ -139,7 +140,6 @@ export const roomRouter = createTRPCRouter({
.update(rooms)
.set({
storyName: input.name,
- userId: ctx.auth.userId,
visible: input.visible,
scale: [...new Set(input.scale.split(","))]
.filter((item) => item !== "")
diff --git a/src/server/api/trpc.ts b/src/server/api/trpc.ts
index ebce472..32e3ae8 100644
--- a/src/server/api/trpc.ts
+++ b/src/server/api/trpc.ts
@@ -61,17 +61,13 @@ export const createTRPCContext = (opts: CreateNextContextOptions) => {
*/
import { initTRPC, TRPCError } from "@trpc/server";
import superjson from "superjson";
-import type { OpenApiMeta } from "trpc-openapi";
-const t = initTRPC
- .context()
- .meta()
- .create({
- transformer: superjson,
- errorFormatter({ shape }) {
- return shape;
- },
- });
+const t = initTRPC.context().create({
+ transformer: superjson,
+ errorFormatter({ shape }) {
+ return shape;
+ },
+});
// check if the user is signed in, otherwise through a UNAUTHORIZED CODE
const isAuthed = t.middleware(({ next, ctx }) => {
diff --git a/src/server/openapi.ts b/src/server/openapi.ts
deleted file mode 100644
index f0ee72f..0000000
--- a/src/server/openapi.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { generateOpenApiDocument } from 'trpc-openapi';
-
-import { appRouter } from './api/root';
-
-// Generate OpenAPI schema document
-export const openApiDocument = generateOpenApiDocument(appRouter, {
- title: 'Example CRUD API',
- description: 'OpenAPI compliant REST API built using tRPC with Next.js',
- version: '1.0.0',
- baseUrl: 'http://localhost:3000/api',
- docsUrl: 'https://github.com/jlalmes/trpc-openapi',
-});
\ No newline at end of file
diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
index 2303fdc..04ec281 100644
--- a/src/utils/helpers.ts
+++ b/src/utils/helpers.ts
@@ -15,3 +15,11 @@ export function downloadCSV(
link.click();
document.body.removeChild(link);
}
+
+export function isAdmin(meta: UserPublicMetadata | undefined) {
+ return (meta?.isAdmin as boolean | undefined) || false;
+}
+
+export function isVIP(meta: UserPublicMetadata | undefined) {
+ return (meta?.isVIP as boolean | undefined) || false;
+}