diff --git a/next-swagger-doc.json b/next-swagger-doc.json deleted file mode 100644 index eec01cb..0000000 --- a/next-swagger-doc.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "apiFolder": "src/app/api", - "definition": { - "openapi": "3.0.0", - "info": { - "title": "MeetUP API", - "version": "1.0" - }, - "components": { - "schemas": { - "ErrorResponse": { - "type": "object", - "properties": { - "success": { - "type": "boolean", - "default": false - }, - "message": { - "type": "string", - "description": "Error message" - } - } - }, - "ZodErrorResponse": { - "type": "object", - "properties": { - "success": { - "type": "boolean", - "default": false - }, - "message": { - "type": "string", - "description": "Error message" - }, - "errors": { - "type": "array", - "items": { - "type": "object", - "properties": { - "path": { "type": "string" }, - "message": { "type": "string" } - } - } - } - } - }, - "User": { - "type": "object", - "properties": { - "id": { "type": "string" }, - "name": { "type": "string" }, - "first_name": { "type": "string" }, - "last_name": { "type": "string" }, - "email": { "type": "string", "format": "email" }, - "image": { "type": "string", "format": "uri" }, - "timezone": { "type": "string", "description": "User timezone" }, - "created_at": { "type": "string", "format": "date-time" }, - "updated_at": { "type": "string", "format": "date-time" } - } - }, - "PublicUser": { - "type": "object", - "properties": { - "id": { "type": "string" }, - "name": { "type": "string" }, - "first_name": { "type": "string" }, - "last_name": { "type": "string" }, - "image": { "type": "string", "format": "uri" }, - "timezone": { "type": "string", "description": "User timezone" } - } - }, - "SimpleUser": { - "type": "object", - "properties": { - "id": { "type": "string" }, - "name": { "type": "string" } - } - }, - "Participant": { - "type": "object", - "properties": { - "user": { - "$ref": "#/components/schemas/SimpleUser" - }, - "status": { "type": "string" } - } - }, - "Event": { - "type": "object", - "properties": { - "id": { "type": "string" }, - "title": { "type": "string" }, - "description": { "type": "string" }, - "start_time": { "type": "string", "format": "date-time" }, - "end_time": { "type": "string", "format": "date-time" }, - "status": { "type": "string" }, - "location": { "type": "string" }, - "organizer": { - "$ref": "#/components/schemas/SimpleUser" - }, - "participants": { - "type": "array", - "items": { - "type": "object", - "properties": { - "user": { - "$ref": "#/components/schemas/SimpleUser" - }, - "status": { "type": "string" } - } - } - }, - "created_at": { "type": "string", "format": "date-time" }, - "updated_at": { "type": "string", "format": "date-time" } - } - } - } - }, - "security": [] - } -} diff --git a/package.json b/package.json index 5f217cc..36f4d80 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,6 @@ "lucide-react": "^0.511.0", "next": "15.4.0-canary.94", "next-auth": "^5.0.0-beta.25", - "next-swagger-doc": "^0.4.1", "next-themes": "^0.4.6", "react": "^19.0.0", "react-dom": "^19.0.0", @@ -72,7 +71,7 @@ "ts-node": "10.9.2", "tsconfig-paths": "4.2.0", "tw-animate-css": "1.3.4", - "typescript": "5.8.3" + "typescript": "^5.8.3" }, "packageManager": "yarn@4.9.2" } diff --git a/src/auth.ts b/src/auth.ts index a490900..405b729 100644 --- a/src/auth.ts +++ b/src/auth.ts @@ -37,7 +37,7 @@ const providers: Provider[] = [ if (process.env.DISABLE_PASSWORD_LOGIN) return null; try { - const { email, password } = await loginClientSchema.parseAsync(c); + const { email, password } = await loginSchema.parseAsync(c); const user = await prisma.user.findFirst({ where: { OR: [{ email }, { name: email }] }, diff --git a/src/components/forms/login-form.tsx b/src/components/forms/login-form.tsx index 230b578..8f6b709 100644 --- a/src/components/forms/login-form.tsx +++ b/src/components/forms/login-form.tsx @@ -18,7 +18,7 @@ function LoginFormElement({ formRef?: React.RefObject; }) { const { handleSubmit, formState, register, setError } = - useZodForm(loginClientSchema); + useZodForm(loginSchema); const router = useRouter(); const onSubmit = handleSubmit(async (data) => { @@ -95,7 +95,7 @@ function RegisterFormElement({ formRef?: React.RefObject; }) { const { handleSubmit, formState, register, setError } = - useZodForm(registerClientSchema); + useZodForm(registerSchema); const onSubmit = handleSubmit(async (data) => { try { diff --git a/src/lib/auth/login.ts b/src/lib/auth/login.ts index db90b1e..1c03356 100644 --- a/src/lib/auth/login.ts +++ b/src/lib/auth/login.ts @@ -4,7 +4,7 @@ import { z } from 'zod/v4'; import { loginSchema } from './validation'; import { signIn } from '@/auth'; -export async function loginAction(data: z.infer) { +export async function loginAction(data: z.infer) { try { await signIn('credentials', { ...data, diff --git a/yarn.lock b/yarn.lock index a2502e9..4cfa26c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -33,19 +33,7 @@ __metadata: languageName: node linkType: hard -"@apidevtools/json-schema-ref-parser@npm:^9.0.6": - version: 9.1.2 - resolution: "@apidevtools/json-schema-ref-parser@npm:9.1.2" - dependencies: - "@jsdevtools/ono": "npm:^7.1.3" - "@types/json-schema": "npm:^7.0.6" - call-me-maybe: "npm:^1.0.1" - js-yaml: "npm:^4.1.0" - checksum: 10c0/ebf952eb2e00bf0919f024e72897e047fd5012f0a9e47ac361873f6de0a733b9334513cdbc73205a6b43ac4a652b8c87f55e489c39b2d60bd0bc1cb2b411e218 - languageName: node - linkType: hard - -"@apidevtools/openapi-schemas@npm:^2.0.4, @apidevtools/openapi-schemas@npm:^2.1.0": +"@apidevtools/openapi-schemas@npm:^2.1.0": version: 2.1.0 resolution: "@apidevtools/openapi-schemas@npm:2.1.0" checksum: 10c0/f4aa0f9df32e474d166c84ef91bceb18fa1c4f44b5593879529154ef340846811ea57dc2921560f157f692262827d28d988dd6e19fb21f00320e9961964176b4 @@ -59,22 +47,6 @@ __metadata: languageName: node linkType: hard -"@apidevtools/swagger-parser@npm:10.0.3": - version: 10.0.3 - resolution: "@apidevtools/swagger-parser@npm:10.0.3" - dependencies: - "@apidevtools/json-schema-ref-parser": "npm:^9.0.6" - "@apidevtools/openapi-schemas": "npm:^2.0.4" - "@apidevtools/swagger-methods": "npm:^3.0.2" - "@jsdevtools/ono": "npm:^7.1.3" - call-me-maybe: "npm:^1.0.1" - z-schema: "npm:^5.0.1" - peerDependencies: - openapi-types: ">=7" - checksum: 10c0/3b43f719c2d647ac8dcf30f132834d413ce21cbf7a8d9c3b35ec91149dd25d608c8fd892358fcd61a8edd8c5140a7fb13676f948e2d87067d081a47b8c7107e9 - languageName: node - linkType: hard - "@apidevtools/swagger-parser@npm:^10.1.1": version: 10.1.1 resolution: "@apidevtools/swagger-parser@npm:10.1.1" @@ -3107,7 +3079,7 @@ __metadata: languageName: node linkType: hard -"@types/json-schema@npm:^7.0.11, @types/json-schema@npm:^7.0.15, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.6, @types/json-schema@npm:^7.0.7": +"@types/json-schema@npm:^7.0.11, @types/json-schema@npm:^7.0.15, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.7": version: 7.0.15 resolution: "@types/json-schema@npm:7.0.15" checksum: 10c0/a996a745e6c5d60292f36731dd41341339d4eeed8180bb09226e5c8d23759067692b1d88e5d91d72ee83dfc00d3aca8e7bd43ea120516c17922cbcb7c3e252db @@ -3166,13 +3138,6 @@ __metadata: languageName: node linkType: hard -"@types/swagger-jsdoc@npm:6.0.4": - version: 6.0.4 - resolution: "@types/swagger-jsdoc@npm:6.0.4" - checksum: 10c0/fbe17d91a12e1e60a255b02e6def6877c81b356c75ffcd0e5167fbaf1476e2d6600cd7eea79e6b3e0ff7929dec33ade345147509ed3b98026f63c782b74514f6 - languageName: node - linkType: hard - "@types/swagger-ui-react@npm:5": version: 5.18.0 resolution: "@types/swagger-ui-react@npm:5.18.0" @@ -4068,16 +4033,6 @@ __metadata: languageName: node linkType: hard -"cleye@npm:1.3.2": - version: 1.3.2 - resolution: "cleye@npm:1.3.2" - dependencies: - terminal-columns: "npm:^1.4.1" - type-flag: "npm:^3.0.0" - checksum: 10c0/2cd63c194d8476230cb9730dae87ae106995ff36b5e43436965caf14ebc6386b7a33e61cc12f90f27e42f4490383fb6032f1f1956bbbc12a3bb13e5cc74cbd78 - languageName: node - linkType: hard - "client-only@npm:0.0.1": version: 0.0.1 resolution: "client-only@npm:0.0.1" @@ -4155,20 +4110,6 @@ __metadata: languageName: node linkType: hard -"commander@npm:6.2.0": - version: 6.2.0 - resolution: "commander@npm:6.2.0" - checksum: 10c0/1b701c6726fc2b6c6a7d9ab017be9465153546a05767cdd0e15e9f9a11c07f88f64d47684b90b07e5fb103d173efb6afdf4a21f6d6c4c25f7376bd027d21062c - languageName: node - linkType: hard - -"commander@npm:^9.4.1": - version: 9.5.0 - resolution: "commander@npm:9.5.0" - checksum: 10c0/5f7784fbda2aaec39e89eb46f06a999e00224b3763dc65976e05929ec486e174fe9aac2655f03ba6a5e83875bd173be5283dc19309b7c65954701c02025b3c1d - languageName: node - linkType: hard - "compare-versions@npm:^6.1.1": version: 6.1.1 resolution: "compare-versions@npm:6.1.1" @@ -4379,15 +4320,6 @@ __metadata: languageName: node linkType: hard -"doctrine@npm:3.0.0": - version: 3.0.0 - resolution: "doctrine@npm:3.0.0" - dependencies: - esutils: "npm:^2.0.2" - checksum: 10c0/c96bdccabe9d62ab6fea9399fdff04a66e6563c1d6fb3a3a063e8d53c3bb136ba63e84250bbf63d00086a769ad53aef92d2bd483f03f837fc97b71cbee6b2520 - languageName: node - linkType: hard - "doctrine@npm:^2.1.0": version: 2.1.0 resolution: "doctrine@npm:2.1.0" @@ -5330,13 +5262,6 @@ __metadata: languageName: node linkType: hard -"fs.realpath@npm:^1.0.0": - version: 1.0.0 - resolution: "fs.realpath@npm:1.0.0" - checksum: 10c0/444cf1291d997165dfd4c0d58b69f0e4782bfd9149fd72faa4fe299e68e0e93d6db941660b37dd29153bf7186672ececa3b50b7e7249477b03fdf850f287c948 - languageName: node - linkType: hard - "function-bind@npm:^1.1.2": version: 1.1.2 resolution: "function-bind@npm:1.1.2" @@ -5452,20 +5377,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:7.1.6": - version: 7.1.6 - resolution: "glob@npm:7.1.6" - dependencies: - fs.realpath: "npm:^1.0.0" - inflight: "npm:^1.0.4" - inherits: "npm:2" - minimatch: "npm:^3.0.4" - once: "npm:^1.3.0" - path-is-absolute: "npm:^1.0.0" - checksum: 10c0/2575cce9306ac534388db751f0aa3e78afedb6af8f3b529ac6b2354f66765545145dba8530abf7bff49fb399a047d3f9b6901c38ee4c9503f592960d9af67763 - languageName: node - linkType: hard - "glob@npm:^10.2.2": version: 10.4.5 resolution: "glob@npm:10.4.5" @@ -5727,17 +5638,7 @@ __metadata: languageName: node linkType: hard -"inflight@npm:^1.0.4": - version: 1.0.6 - resolution: "inflight@npm:1.0.6" - dependencies: - once: "npm:^1.3.0" - wrappy: "npm:1" - checksum: 10c0/7faca22584600a9dc5b9fca2cd5feb7135ac8c935449837b315676b4c90aa4f391ec4f42240178244b5a34e8bede1948627fda392ca3191522fc46b34e985ab2 - languageName: node - linkType: hard - -"inherits@npm:2, inherits@npm:^2.0.1": +"inherits@npm:^2.0.1": version: 2.0.4 resolution: "inherits@npm:2.0.4" checksum: 10c0/4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2 @@ -6067,7 +5968,7 @@ __metadata: languageName: node linkType: hard -"isarray@npm:2.0.5, isarray@npm:^2.0.5": +"isarray@npm:^2.0.5": version: 2.0.5 resolution: "isarray@npm:2.0.5" checksum: 10c0/4199f14a7a13da2177c66c31080008b7124331956f47bca57dd0b6ea9f11687aa25e565a2c7a2b519bc86988d10398e3049a1f5df13c9f6b7664154690ae79fd @@ -6455,13 +6356,6 @@ __metadata: languageName: node linkType: hard -"lodash.get@npm:^4.4.2": - version: 4.4.2 - resolution: "lodash.get@npm:4.4.2" - checksum: 10c0/48f40d471a1654397ed41685495acb31498d5ed696185ac8973daef424a749ca0c7871bf7b665d5c14f5cc479394479e0307e781f61d5573831769593411be6e - languageName: node - linkType: hard - "lodash.isempty@npm:^4.4.0": version: 4.4.0 resolution: "lodash.isempty@npm:4.4.0" @@ -6469,13 +6363,6 @@ __metadata: languageName: node linkType: hard -"lodash.isequal@npm:^4.5.0": - version: 4.5.0 - resolution: "lodash.isequal@npm:4.5.0" - checksum: 10c0/dfdb2356db19631a4b445d5f37868a095e2402292d59539a987f134a8778c62a2810c2452d11ae9e6dcac71fc9de40a6fedcb20e2952a15b431ad8b29e50e28f - languageName: node - linkType: hard - "lodash.merge@npm:^4.6.2": version: 4.6.2 resolution: "lodash.merge@npm:4.6.2" @@ -6483,13 +6370,6 @@ __metadata: languageName: node linkType: hard -"lodash.mergewith@npm:^4.6.2": - version: 4.6.2 - resolution: "lodash.mergewith@npm:4.6.2" - checksum: 10c0/4adbed65ff96fd65b0b3861f6899f98304f90fd71e7f1eb36c1270e05d500ee7f5ec44c02ef979b5ddbf75c0a0b9b99c35f0ad58f4011934c4d4e99e5200b3b5 - languageName: node - linkType: hard - "lodash.omitby@npm:^4.6.0": version: 4.6.0 resolution: "lodash.omitby@npm:4.6.0" @@ -6695,7 +6575,6 @@ __metadata: lucide-react: "npm:^0.511.0" next: "npm:15.4.0-canary.94" next-auth: "npm:^5.0.0-beta.25" - next-swagger-doc: "npm:^0.4.1" next-themes: "npm:^0.4.6" orval: "npm:7.10.0" postcss: "npm:8.5.6" @@ -6710,7 +6589,7 @@ __metadata: ts-node: "npm:10.9.2" tsconfig-paths: "npm:4.2.0" tw-animate-css: "npm:1.3.4" - typescript: "npm:5.8.3" + typescript: "npm:^5.8.3" zod: "npm:^3.25.60" languageName: unknown linkType: soft @@ -6771,7 +6650,7 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:3.1.2, minimatch@npm:^3.0.4, minimatch@npm:^3.1.2": +"minimatch@npm:3.1.2, minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" dependencies: @@ -6967,22 +6846,6 @@ __metadata: languageName: node linkType: hard -"next-swagger-doc@npm:^0.4.1": - version: 0.4.1 - resolution: "next-swagger-doc@npm:0.4.1" - dependencies: - "@types/swagger-jsdoc": "npm:6.0.4" - cleye: "npm:1.3.2" - isarray: "npm:2.0.5" - swagger-jsdoc: "npm:6.2.8" - peerDependencies: - next: ">=9" - bin: - next-swagger-doc-cli: dist/cli.js - checksum: 10c0/8ff0d33aad41296eb88f03243a627f9f0db528ea6889e528bbdbf66e38499069bfb9b7c29d2787c49f90f0b2a86a9c3e3475218d5af7a13dd4b0a37bec959703 - languageName: node - linkType: hard - "next-themes@npm:^0.4.6": version: 0.4.6 resolution: "next-themes@npm:0.4.6" @@ -7334,15 +7197,6 @@ __metadata: languageName: node linkType: hard -"once@npm:^1.3.0": - version: 1.4.0 - resolution: "once@npm:1.4.0" - dependencies: - wrappy: "npm:1" - checksum: 10c0/5d48aca287dfefabd756621c5dfce5c91a549a93e9fdb7b8246bc4c4790aa2ec17b34a260530474635147aeb631a2dcc8b32c613df0675f96041cbb8244517d0 - languageName: node - linkType: hard - "onetime@npm:^5.1.2": version: 5.1.2 resolution: "onetime@npm:5.1.2" @@ -7520,13 +7374,6 @@ __metadata: languageName: node linkType: hard -"path-is-absolute@npm:^1.0.0": - version: 1.0.1 - resolution: "path-is-absolute@npm:1.0.1" - checksum: 10c0/127da03c82172a2a50099cddbf02510c1791fc2cc5f7713ddb613a56838db1e8168b121a920079d052e0936c23005562059756d653b7c544c53185efe53be078 - languageName: node - linkType: hard - "path-key@npm:^3.0.0, path-key@npm:^3.1.0": version: 3.1.1 resolution: "path-key@npm:3.1.1" @@ -8851,31 +8698,6 @@ __metadata: languageName: node linkType: hard -"swagger-jsdoc@npm:6.2.8": - version: 6.2.8 - resolution: "swagger-jsdoc@npm:6.2.8" - dependencies: - commander: "npm:6.2.0" - doctrine: "npm:3.0.0" - glob: "npm:7.1.6" - lodash.mergewith: "npm:^4.6.2" - swagger-parser: "npm:^10.0.3" - yaml: "npm:2.0.0-1" - bin: - swagger-jsdoc: bin/swagger-jsdoc.js - checksum: 10c0/7e20f08e8d90cc1e787cd82c096291cf12533359f89c70fbe4295a01f7c4734f2e82a03ba94027127bcd3da04b817abfe979f00d00ef0cd8283e449250a66215 - languageName: node - linkType: hard - -"swagger-parser@npm:^10.0.3": - version: 10.0.3 - resolution: "swagger-parser@npm:10.0.3" - dependencies: - "@apidevtools/swagger-parser": "npm:10.0.3" - checksum: 10c0/d1a5c05f651f21a23508a36416071630b83e91dfffd52a6d44b06ca2cd1b86304c0dd2f4c04526c999b70062fa89bde3f5d54a1436626f4350590b6c6265a098 - languageName: node - linkType: hard - "swagger-ui-react@npm:^5.24.1": version: 5.25.2 resolution: "swagger-ui-react@npm:5.25.2" @@ -8978,13 +8800,6 @@ __metadata: languageName: node linkType: hard -"terminal-columns@npm:^1.4.1": - version: 1.4.1 - resolution: "terminal-columns@npm:1.4.1" - checksum: 10c0/e79135b0e9605d247ac26addf2afc0a4313ca4b70e6ff5b8571ab95c93703ab60db5b7b8a61a715e0ea5b6067434cfe1ae58f4392e01ad86c514b347a2a34e34 - languageName: node - linkType: hard - "tinyglobby@npm:^0.2.12, tinyglobby@npm:^0.2.13": version: 0.2.14 resolution: "tinyglobby@npm:0.2.14" @@ -9191,13 +9006,6 @@ __metadata: languageName: node linkType: hard -"type-flag@npm:^3.0.0": - version: 3.0.0 - resolution: "type-flag@npm:3.0.0" - checksum: 10c0/b1015d4eb18cd85432fa3bcd0228149dd6893a9c1360a2ad619f79b72e19acfb648a932e2a9ccf2e2db0f0c4b86385bd886a3364e221afb116424e0ae6d1b1ba - languageName: node - linkType: hard - "typed-array-buffer@npm:^1.0.3": version: 1.0.3 resolution: "typed-array-buffer@npm:1.0.3" @@ -9286,7 +9094,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.8.3, typescript@npm:^5.6.3": +"typescript@npm:^5.6.3, typescript@npm:^5.8.3": version: 5.8.3 resolution: "typescript@npm:5.8.3" bin: @@ -9296,7 +9104,7 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A5.8.3#optional!builtin, typescript@patch:typescript@npm%3A^5.6.3#optional!builtin": +"typescript@patch:typescript@npm%3A^5.6.3#optional!builtin, typescript@patch:typescript@npm%3A^5.8.3#optional!builtin": version: 5.8.3 resolution: "typescript@patch:typescript@npm%3A5.8.3#optional!builtin::version=5.8.3&hash=5786d5" bin: @@ -9518,7 +9326,7 @@ __metadata: languageName: node linkType: hard -"validator@npm:^13.11.0, validator@npm:^13.7.0": +"validator@npm:^13.11.0": version: 13.15.15 resolution: "validator@npm:13.15.15" checksum: 10c0/f5349d1fbb9cc36f9f6c5dab1880764ddad1d0d2b084e2a71e5964f7de1635d20e406611559df9a3db24828ce775cbee5e3b6dd52f0d555a61939ed7ea5990bd @@ -9668,13 +9476,6 @@ __metadata: languageName: node linkType: hard -"wrappy@npm:1": - version: 1.0.2 - resolution: "wrappy@npm:1.0.2" - checksum: 10c0/56fece1a4018c6a6c8e28fbc88c87e0fbf4ea8fd64fc6c63b18f4acc4bd13e0ad2515189786dd2c30d3eec9663d70f4ecf699330002f8ccb547e4a18231fc9f0 - languageName: node - linkType: hard - "xml-but-prettier@npm:^1.0.1": version: 1.0.1 resolution: "xml-but-prettier@npm:1.0.1" @@ -9719,13 +9520,6 @@ __metadata: languageName: node linkType: hard -"yaml@npm:2.0.0-1": - version: 2.0.0-1 - resolution: "yaml@npm:2.0.0-1" - checksum: 10c0/e76eba2fbae37cd3e5bff057184be7cdca849895149d2f5660386871a501d76d2e1ec5906c48269a9fe798f214df31d342675b37bcd9d09af7c12eb6fb46a740 - languageName: node - linkType: hard - "yaml@npm:^1.10.0": version: 1.10.2 resolution: "yaml@npm:1.10.2" @@ -9778,23 +9572,6 @@ __metadata: languageName: node linkType: hard -"z-schema@npm:^5.0.1": - version: 5.0.5 - resolution: "z-schema@npm:5.0.5" - dependencies: - commander: "npm:^9.4.1" - lodash.get: "npm:^4.4.2" - lodash.isequal: "npm:^4.5.0" - validator: "npm:^13.7.0" - dependenciesMeta: - commander: - optional: true - bin: - z-schema: bin/z-schema - checksum: 10c0/e4c812cfe6468c19b2a21d07d4ff8fb70359062d33400b45f89017eaa3efe9d51e85963f2b115eaaa99a16b451782249bf9b1fa8b31d35cc473e7becb3e44264 - languageName: node - linkType: hard - "zenscroll@npm:^4.0.2": version: 4.0.2 resolution: "zenscroll@npm:4.0.2"