diff --git a/src/lib/server/api/common/config.ts b/src/lib/server/api/common/config.ts
index 518c73f..0daf6d4 100644
--- a/src/lib/server/api/common/config.ts
+++ b/src/lib/server/api/common/config.ts
@@ -34,5 +34,3 @@ export const config: Config = {
max: env.DB_MIGRATING || env.DB_SEEDING ? 1 : undefined,
},
}
-
-console.log('config', config)
diff --git a/src/lib/server/api/common/env.ts b/src/lib/server/api/common/env.ts
index 17796e8..5dd1157 100644
--- a/src/lib/server/api/common/env.ts
+++ b/src/lib/server/api/common/env.ts
@@ -17,6 +17,10 @@ const EnvSchema = z.object({
DATABASE_DB: z.string(),
DB_MIGRATING: stringBoolean,
DB_SEEDING: stringBoolean,
+ GITHUB_CLIENT_ID: z.string(),
+ GITHUB_CLIENT_SECRET: z.string(),
+ GOOGLE_CLIENT_ID: z.string(),
+ GOOGLE_CLIENT_SECRET: z.string(),
NODE_ENV: z.string().default('development'),
ORIGIN: z.string(),
PUBLIC_SITE_NAME: z.string(),
diff --git a/src/lib/server/api/common/exceptions.ts b/src/lib/server/api/common/exceptions.ts
index fee54c4..cbda928 100644
--- a/src/lib/server/api/common/exceptions.ts
+++ b/src/lib/server/api/common/exceptions.ts
@@ -1,26 +1,26 @@
-import { StatusCodes } from '$lib/constants/status-codes';
-import { HTTPException } from 'hono/http-exception';
+import { StatusCodes } from '$lib/constants/status-codes'
+import { HTTPException } from 'hono/http-exception'
-export function TooManyRequests(message: string = 'Too many requests') {
- return new HTTPException(StatusCodes.TOO_MANY_REQUESTS, { message });
+export function TooManyRequests(message = 'Too many requests') {
+ return new HTTPException(StatusCodes.TOO_MANY_REQUESTS, { message })
}
-export function Forbidden(message: string = 'Forbidden') {
- return new HTTPException(StatusCodes.FORBIDDEN, { message });
+export function Forbidden(message = 'Forbidden') {
+ return new HTTPException(StatusCodes.FORBIDDEN, { message })
}
-export function Unauthorized(message: string = 'Unauthorized') {
- return new HTTPException(StatusCodes.UNAUTHORIZED, { message });
+export function Unauthorized(message = 'Unauthorized') {
+ return new HTTPException(StatusCodes.UNAUTHORIZED, { message })
}
-export function NotFound(message: string = 'Not Found') {
- return new HTTPException(StatusCodes.NOT_FOUND, { message });
+export function NotFound(message = 'Not Found') {
+ return new HTTPException(StatusCodes.NOT_FOUND, { message })
}
-export function BadRequest(message: string = 'Bad Request') {
- return new HTTPException(StatusCodes.BAD_REQUEST, { message });
+export function BadRequest(message = 'Bad Request') {
+ return new HTTPException(StatusCodes.BAD_REQUEST, { message })
}
-export function InternalError(message: string = 'Internal Error') {
- return new HTTPException(StatusCodes.INTERNAL_SERVER_ERROR, { message });
+export function InternalError(message = 'Internal Error') {
+ return new HTTPException(StatusCodes.INTERNAL_SERVER_ERROR, { message })
}
diff --git a/src/lib/server/api/common/types/oauth.ts b/src/lib/server/api/common/types/oauth.ts
new file mode 100644
index 0000000..60e8bbd
--- /dev/null
+++ b/src/lib/server/api/common/types/oauth.ts
@@ -0,0 +1,11 @@
+export type OAuthUser = {
+ sub: string;
+ given_name?: string;
+ family_name?: string;
+ picture?: string;
+ username: string;
+ email?: string;
+ email_verified?: boolean;
+}
+
+export type OAuthProviders = 'github' | 'google' | 'apple'
\ No newline at end of file
diff --git a/src/lib/server/api/controllers/collection.controller.ts b/src/lib/server/api/controllers/collection.controller.ts
index 56a53aa..5cc94cd 100644
--- a/src/lib/server/api/controllers/collection.controller.ts
+++ b/src/lib/server/api/controllers/collection.controller.ts
@@ -2,7 +2,7 @@ import 'reflect-metadata'
import { Controller } from '$lib/server/api/common/types/controller'
import { CollectionsService } from '$lib/server/api/services/collections.service'
import { inject, injectable } from 'tsyringe'
-import { requireAuth } from '../middleware/auth.middleware'
+import { requireAuth } from '../middleware/require-auth.middleware'
@injectable()
export class CollectionController extends Controller {
@@ -18,6 +18,11 @@ export class CollectionController extends Controller {
console.log('collections service', collections)
return c.json({ collections })
})
+ .get('/count', requireAuth, async (c) => {
+ const user = c.var.user
+ const collections = await this.collectionsService.findAllByUserIdWithDetails(user.id)
+ return c.json({ collections })
+ })
.get('/:cuid', requireAuth, async (c) => {
const cuid = c.req.param('cuid')
const collection = await this.collectionsService.findOneByCuid(cuid)
diff --git a/src/lib/server/api/controllers/iam.controller.ts b/src/lib/server/api/controllers/iam.controller.ts
index 708b7ef..0d2010c 100644
--- a/src/lib/server/api/controllers/iam.controller.ts
+++ b/src/lib/server/api/controllers/iam.controller.ts
@@ -1,20 +1,23 @@
import { StatusCodes } from '$lib/constants/status-codes'
import { Controller } from '$lib/server/api/common/types/controller'
+import { changePasswordDto } from '$lib/server/api/dtos/change-password.dto'
import { updateEmailDto } from '$lib/server/api/dtos/update-email.dto'
import { updateProfileDto } from '$lib/server/api/dtos/update-profile.dto'
import { verifyPasswordDto } from '$lib/server/api/dtos/verify-password.dto'
import { limiter } from '$lib/server/api/middleware/rate-limiter.middleware'
import { IamService } from '$lib/server/api/services/iam.service'
+import { LoginRequestsService } from '$lib/server/api/services/loginrequest.service'
import { LuciaService } from '$lib/server/api/services/lucia.service'
import { zValidator } from '@hono/zod-validator'
import { setCookie } from 'hono/cookie'
import { inject, injectable } from 'tsyringe'
-import { requireAuth } from '../middleware/auth.middleware'
+import { requireAuth } from '../middleware/require-auth.middleware'
@injectable()
export class IamController extends Controller {
constructor(
@inject(IamService) private readonly iamService: IamService,
+ @inject(LoginRequestsService) private readonly loginRequestService: LoginRequestsService,
@inject(LuciaService) private luciaService: LuciaService,
) {
super()
@@ -45,6 +48,32 @@ export class IamController extends Controller {
}
return c.json({}, StatusCodes.OK)
})
+ .put('/update/password', requireAuth, zValidator('json', changePasswordDto), limiter({ limit: 10, minutes: 60 }), async (c) => {
+ const user = c.var.user
+ const { password, confirm_password } = c.req.valid('json')
+ if (password !== confirm_password) {
+ return c.json('Passwords do not match', StatusCodes.BAD_REQUEST)
+ }
+ try {
+ await this.iamService.updatePassword(user.id, { password, confirm_password })
+ await this.luciaService.lucia.invalidateUserSessions(user.id)
+ await this.loginRequestService.createUserSession(user.id, c.req, undefined)
+ const sessionCookie = this.luciaService.lucia.createBlankSessionCookie()
+ setCookie(c, sessionCookie.name, sessionCookie.value, {
+ path: sessionCookie.attributes.path,
+ maxAge: sessionCookie.attributes.maxAge,
+ domain: sessionCookie.attributes.domain,
+ sameSite: sessionCookie.attributes.sameSite as any,
+ secure: sessionCookie.attributes.secure,
+ httpOnly: sessionCookie.attributes.httpOnly,
+ expires: sessionCookie.attributes.expires,
+ })
+ return c.json({ status: 'success' })
+ } catch (error) {
+ console.error('Error updating password', error)
+ return c.json('Error updating password', StatusCodes.BAD_REQUEST)
+ }
+ })
.post('/update/email', requireAuth, zValidator('json', updateEmailDto), limiter({ limit: 10, minutes: 60 }), async (c) => {
const user = c.var.user
const { email } = c.req.valid('json')
diff --git a/src/lib/server/api/controllers/mfa.controller.ts b/src/lib/server/api/controllers/mfa.controller.ts
index f70aa04..b08b8c1 100644
--- a/src/lib/server/api/controllers/mfa.controller.ts
+++ b/src/lib/server/api/controllers/mfa.controller.ts
@@ -8,7 +8,7 @@ import { UsersService } from '$lib/server/api/services/users.service'
import { zValidator } from '@hono/zod-validator'
import { inject, injectable } from 'tsyringe'
import { CredentialsType } from '../databases/tables'
-import { requireAuth } from '../middleware/auth.middleware'
+import { requireAuth } from '../middleware/require-auth.middleware'
@injectable()
export class MfaController extends Controller {
diff --git a/src/lib/server/api/controllers/oauth.controller.ts b/src/lib/server/api/controllers/oauth.controller.ts
new file mode 100644
index 0000000..6a542d0
--- /dev/null
+++ b/src/lib/server/api/controllers/oauth.controller.ts
@@ -0,0 +1,150 @@
+import 'reflect-metadata'
+import { Controller } from '$lib/server/api/common/types/controller'
+import { LuciaService } from '$lib/server/api/services/lucia.service'
+import { OAuthService } from '$lib/server/api/services/oauth.service'
+import { github, google } from '$lib/server/auth'
+import { OAuth2RequestError } from 'arctic'
+import { getCookie, setCookie } from 'hono/cookie'
+import { TimeSpan } from 'oslo'
+import { inject, injectable } from 'tsyringe'
+import type {OAuthUser} from "$lib/server/api/common/types/oauth";
+
+@injectable()
+export class OAuthController extends Controller {
+ constructor(
+ @inject(LuciaService) private luciaService: LuciaService,
+ @inject(OAuthService) private oauthService: OAuthService,
+ ) {
+ super()
+ }
+
+ routes() {
+ return this.controller
+ .get('/github', async (c) => {
+ try {
+ const code = c.req.query('code')?.toString() ?? null
+ const state = c.req.query('state')?.toString() ?? null
+ const storedState = getCookie(c).github_oauth_state ?? null
+
+ if (!code || !state || !storedState || state !== storedState) {
+ return c.body(null, 400)
+ }
+
+ const tokens = await github.validateAuthorizationCode(code)
+ const githubUserResponse = await fetch('https://api.github.com/user', {
+ headers: {
+ Authorization: `Bearer ${tokens.accessToken}`,
+ },
+ })
+ const githubUser: GitHubUser = await githubUserResponse.json()
+
+ const oAuthUser: OAuthUser = {
+ sub: `${githubUser.id}`,
+ username: githubUser.login,
+ email: undefined
+ }
+
+ const userId = await this.oauthService.handleOAuthUser(oAuthUser, 'github')
+
+ const session = await this.luciaService.lucia.createSession(userId, {})
+ const sessionCookie = this.luciaService.lucia.createSessionCookie(session.id)
+
+ setCookie(c, sessionCookie.name, sessionCookie.value, {
+ path: sessionCookie.attributes.path,
+ maxAge:
+ sessionCookie?.attributes?.maxAge && sessionCookie?.attributes?.maxAge < new TimeSpan(365, 'd').seconds()
+ ? sessionCookie.attributes.maxAge
+ : new TimeSpan(2, 'w').seconds(),
+ domain: sessionCookie.attributes.domain,
+ sameSite: sessionCookie.attributes.sameSite as any,
+ secure: sessionCookie.attributes.secure,
+ httpOnly: sessionCookie.attributes.httpOnly,
+ expires: sessionCookie.attributes.expires,
+ })
+
+ return c.json({ message: 'ok' })
+ } catch (error) {
+ console.error(error)
+ // the specific error message depends on the provider
+ if (error instanceof OAuth2RequestError) {
+ // invalid code
+ return c.body(null, 400)
+ }
+ return c.body(null, 500)
+ }
+ })
+ .get('/google', async (c) => {
+ try {
+ const code = c.req.query('code')?.toString() ?? null
+ const state = c.req.query('state')?.toString() ?? null
+ const storedState = getCookie(c).google_oauth_state ?? null
+ const storedCodeVerifier = getCookie(c).google_oauth_code_verifier ?? null
+
+ if (!code || !storedState || !storedCodeVerifier || state !== storedState) {
+ return c.body(null, 400)
+ }
+
+ const tokens = await google.validateAuthorizationCode(code, storedCodeVerifier)
+ const googleUserResponse = await fetch("https://openidconnect.googleapis.com/v1/userinfo", {
+ headers: {
+ Authorization: `Bearer ${tokens.accessToken}`,
+ },
+ })
+ const googleUser: GoogleUser = await googleUserResponse.json()
+
+ const oAuthUser: OAuthUser = {
+ sub: googleUser.sub,
+ given_name: googleUser.given_name,
+ family_name: googleUser.family_name,
+ picture: googleUser.picture,
+ username: googleUser.email,
+ email: googleUser.email,
+ email_verified: googleUser.email_verified,
+ }
+
+ const userId = await this.oauthService.handleOAuthUser(oAuthUser, 'google')
+
+ const session = await this.luciaService.lucia.createSession(userId, {})
+ const sessionCookie = this.luciaService.lucia.createSessionCookie(session.id)
+
+ setCookie(c, sessionCookie.name, sessionCookie.value, {
+ path: sessionCookie.attributes.path,
+ maxAge:
+ sessionCookie?.attributes?.maxAge && sessionCookie?.attributes?.maxAge < new TimeSpan(365, 'd').seconds()
+ ? sessionCookie.attributes.maxAge
+ : new TimeSpan(2, 'w').seconds(),
+ domain: sessionCookie.attributes.domain,
+ sameSite: sessionCookie.attributes.sameSite as any,
+ secure: sessionCookie.attributes.secure,
+ httpOnly: sessionCookie.attributes.httpOnly,
+ expires: sessionCookie.attributes.expires,
+ })
+
+ return c.json({ message: 'ok' })
+ } catch (error) {
+ console.error(error)
+ // the specific error message depends on the provider
+ if (error instanceof OAuth2RequestError) {
+ // invalid code
+ return c.body(null, 400)
+ }
+ return c.body(null, 500)
+ }
+ })
+ }
+}
+
+interface GitHubUser {
+ id: number
+ login: string
+}
+
+interface GoogleUser {
+ sub: string
+ name: string
+ given_name: string
+ family_name: string
+ picture: string
+ email: string
+ email_verified: boolean
+}
diff --git a/src/lib/server/api/controllers/user.controller.ts b/src/lib/server/api/controllers/user.controller.ts
index e7c5deb..c05cd2e 100644
--- a/src/lib/server/api/controllers/user.controller.ts
+++ b/src/lib/server/api/controllers/user.controller.ts
@@ -2,7 +2,7 @@ import 'reflect-metadata'
import { Controller } from '$lib/server/api/common/types/controller'
import { UsersService } from '$lib/server/api/services/users.service'
import { inject, injectable } from 'tsyringe'
-import { requireAuth } from '../middleware/auth.middleware'
+import { requireAuth } from '../middleware/require-auth.middleware'
@injectable()
export class UserController extends Controller {
diff --git a/src/lib/server/api/controllers/wishlist.controller.ts b/src/lib/server/api/controllers/wishlist.controller.ts
index 44a4a11..1a8da1c 100644
--- a/src/lib/server/api/controllers/wishlist.controller.ts
+++ b/src/lib/server/api/controllers/wishlist.controller.ts
@@ -2,7 +2,7 @@ import 'reflect-metadata'
import { Controller } from '$lib/server/api/common/types/controller'
import { WishlistsService } from '$lib/server/api/services/wishlists.service'
import { inject, injectable } from 'tsyringe'
-import { requireAuth } from '../middleware/auth.middleware'
+import { requireAuth } from '../middleware/require-auth.middleware'
@injectable()
export class WishlistController extends Controller {
diff --git a/src/lib/server/api/databases/migrations/0001_pink_the_enforcers.sql b/src/lib/server/api/databases/migrations/0001_pink_the_enforcers.sql
new file mode 100644
index 0000000..1135b5e
--- /dev/null
+++ b/src/lib/server/api/databases/migrations/0001_pink_the_enforcers.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "users" ADD COLUMN "email_verified" boolean DEFAULT false;--> statement-breakpoint
+ALTER TABLE "users" ADD COLUMN "picture" text;
\ No newline at end of file
diff --git a/src/lib/server/api/databases/migrations/meta/0001_snapshot.json b/src/lib/server/api/databases/migrations/meta/0001_snapshot.json
new file mode 100644
index 0000000..ae9ae5b
--- /dev/null
+++ b/src/lib/server/api/databases/migrations/meta/0001_snapshot.json
@@ -0,0 +1,1876 @@
+{
+ "id": "e1230cae-67ce-4669-885a-3d3fe4462f9e",
+ "prevId": "4760134e-48bb-47db-b431-56903dad6e24",
+ "version": "7",
+ "dialect": "postgresql",
+ "tables": {
+ "public.categories": {
+ "name": "categories",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "uuid",
+ "primaryKey": true,
+ "notNull": true,
+ "default": "gen_random_uuid()"
+ },
+ "cuid": {
+ "name": "cuid",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "name": {
+ "name": "name",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "slug": {
+ "name": "slug",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ },
+ "updated_at": {
+ "name": "updated_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {},
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {
+ "categories_cuid_unique": {
+ "name": "categories_cuid_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "cuid"
+ ]
+ }
+ }
+ },
+ "public.categories_to_external_ids": {
+ "name": "categories_to_external_ids",
+ "schema": "",
+ "columns": {
+ "category_id": {
+ "name": "category_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "external_id": {
+ "name": "external_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "categories_to_external_ids_category_id_categories_id_fk": {
+ "name": "categories_to_external_ids_category_id_categories_id_fk",
+ "tableFrom": "categories_to_external_ids",
+ "tableTo": "categories",
+ "columnsFrom": [
+ "category_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "restrict",
+ "onUpdate": "cascade"
+ },
+ "categories_to_external_ids_external_id_external_ids_id_fk": {
+ "name": "categories_to_external_ids_external_id_external_ids_id_fk",
+ "tableFrom": "categories_to_external_ids",
+ "tableTo": "external_ids",
+ "columnsFrom": [
+ "external_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "restrict",
+ "onUpdate": "cascade"
+ }
+ },
+ "compositePrimaryKeys": {
+ "categories_to_external_ids_category_id_external_id_pk": {
+ "name": "categories_to_external_ids_category_id_external_id_pk",
+ "columns": [
+ "category_id",
+ "external_id"
+ ]
+ }
+ },
+ "uniqueConstraints": {}
+ },
+ "public.categories_to_games": {
+ "name": "categories_to_games",
+ "schema": "",
+ "columns": {
+ "category_id": {
+ "name": "category_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "game_id": {
+ "name": "game_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "categories_to_games_category_id_categories_id_fk": {
+ "name": "categories_to_games_category_id_categories_id_fk",
+ "tableFrom": "categories_to_games",
+ "tableTo": "categories",
+ "columnsFrom": [
+ "category_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "restrict",
+ "onUpdate": "cascade"
+ },
+ "categories_to_games_game_id_games_id_fk": {
+ "name": "categories_to_games_game_id_games_id_fk",
+ "tableFrom": "categories_to_games",
+ "tableTo": "games",
+ "columnsFrom": [
+ "game_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "restrict",
+ "onUpdate": "cascade"
+ }
+ },
+ "compositePrimaryKeys": {
+ "categories_to_games_category_id_game_id_pk": {
+ "name": "categories_to_games_category_id_game_id_pk",
+ "columns": [
+ "category_id",
+ "game_id"
+ ]
+ }
+ },
+ "uniqueConstraints": {}
+ },
+ "public.collection_items": {
+ "name": "collection_items",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "uuid",
+ "primaryKey": true,
+ "notNull": true,
+ "default": "gen_random_uuid()"
+ },
+ "cuid": {
+ "name": "cuid",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "collection_id": {
+ "name": "collection_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "game_id": {
+ "name": "game_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "times_played": {
+ "name": "times_played",
+ "type": "integer",
+ "primaryKey": false,
+ "notNull": false,
+ "default": 0
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ },
+ "updated_at": {
+ "name": "updated_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "collection_items_collection_id_collections_id_fk": {
+ "name": "collection_items_collection_id_collections_id_fk",
+ "tableFrom": "collection_items",
+ "tableTo": "collections",
+ "columnsFrom": [
+ "collection_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "cascade",
+ "onUpdate": "no action"
+ },
+ "collection_items_game_id_games_id_fk": {
+ "name": "collection_items_game_id_games_id_fk",
+ "tableFrom": "collection_items",
+ "tableTo": "games",
+ "columnsFrom": [
+ "game_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "cascade",
+ "onUpdate": "no action"
+ }
+ },
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {
+ "collection_items_cuid_unique": {
+ "name": "collection_items_cuid_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "cuid"
+ ]
+ }
+ }
+ },
+ "public.collections": {
+ "name": "collections",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "uuid",
+ "primaryKey": true,
+ "notNull": true,
+ "default": "gen_random_uuid()"
+ },
+ "cuid": {
+ "name": "cuid",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "user_id": {
+ "name": "user_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "name": {
+ "name": "name",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "'My Collection'"
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ },
+ "updated_at": {
+ "name": "updated_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "collections_user_id_users_id_fk": {
+ "name": "collections_user_id_users_id_fk",
+ "tableFrom": "collections",
+ "tableTo": "users",
+ "columnsFrom": [
+ "user_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "cascade",
+ "onUpdate": "no action"
+ }
+ },
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {
+ "collections_cuid_unique": {
+ "name": "collections_cuid_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "cuid"
+ ]
+ }
+ }
+ },
+ "public.credentials": {
+ "name": "credentials",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "uuid",
+ "primaryKey": true,
+ "notNull": true,
+ "default": "gen_random_uuid()"
+ },
+ "user_id": {
+ "name": "user_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "type": {
+ "name": "type",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "'password'"
+ },
+ "secret_data": {
+ "name": "secret_data",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ },
+ "updated_at": {
+ "name": "updated_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "credentials_user_id_users_id_fk": {
+ "name": "credentials_user_id_users_id_fk",
+ "tableFrom": "credentials",
+ "tableTo": "users",
+ "columnsFrom": [
+ "user_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "cascade",
+ "onUpdate": "no action"
+ }
+ },
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {}
+ },
+ "public.expansions": {
+ "name": "expansions",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "uuid",
+ "primaryKey": true,
+ "notNull": true,
+ "default": "gen_random_uuid()"
+ },
+ "cuid": {
+ "name": "cuid",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "base_game_id": {
+ "name": "base_game_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "game_id": {
+ "name": "game_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ },
+ "updated_at": {
+ "name": "updated_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "expansions_base_game_id_games_id_fk": {
+ "name": "expansions_base_game_id_games_id_fk",
+ "tableFrom": "expansions",
+ "tableTo": "games",
+ "columnsFrom": [
+ "base_game_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "restrict",
+ "onUpdate": "cascade"
+ },
+ "expansions_game_id_games_id_fk": {
+ "name": "expansions_game_id_games_id_fk",
+ "tableFrom": "expansions",
+ "tableTo": "games",
+ "columnsFrom": [
+ "game_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "restrict",
+ "onUpdate": "cascade"
+ }
+ },
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {
+ "expansions_cuid_unique": {
+ "name": "expansions_cuid_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "cuid"
+ ]
+ }
+ }
+ },
+ "public.external_ids": {
+ "name": "external_ids",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "uuid",
+ "primaryKey": true,
+ "notNull": true,
+ "default": "gen_random_uuid()"
+ },
+ "cuid": {
+ "name": "cuid",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "type": {
+ "name": "type",
+ "type": "external_id_type",
+ "typeSchema": "public",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "external_id": {
+ "name": "external_id",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {},
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {
+ "external_ids_cuid_unique": {
+ "name": "external_ids_cuid_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "cuid"
+ ]
+ }
+ }
+ },
+ "public.federated_identity": {
+ "name": "federated_identity",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "uuid",
+ "primaryKey": true,
+ "notNull": true,
+ "default": "gen_random_uuid()"
+ },
+ "user_id": {
+ "name": "user_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "identity_provider": {
+ "name": "identity_provider",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "federated_user_id": {
+ "name": "federated_user_id",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "federated_username": {
+ "name": "federated_username",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ },
+ "updated_at": {
+ "name": "updated_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "federated_identity_user_id_users_id_fk": {
+ "name": "federated_identity_user_id_users_id_fk",
+ "tableFrom": "federated_identity",
+ "tableTo": "users",
+ "columnsFrom": [
+ "user_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "cascade",
+ "onUpdate": "no action"
+ }
+ },
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {}
+ },
+ "public.games": {
+ "name": "games",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "uuid",
+ "primaryKey": true,
+ "notNull": true,
+ "default": "gen_random_uuid()"
+ },
+ "cuid": {
+ "name": "cuid",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "name": {
+ "name": "name",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "slug": {
+ "name": "slug",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "description": {
+ "name": "description",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "year_published": {
+ "name": "year_published",
+ "type": "integer",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "min_players": {
+ "name": "min_players",
+ "type": "integer",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "max_players": {
+ "name": "max_players",
+ "type": "integer",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "playtime": {
+ "name": "playtime",
+ "type": "integer",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "min_playtime": {
+ "name": "min_playtime",
+ "type": "integer",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "max_playtime": {
+ "name": "max_playtime",
+ "type": "integer",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "min_age": {
+ "name": "min_age",
+ "type": "integer",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "image_url": {
+ "name": "image_url",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "thumb_url": {
+ "name": "thumb_url",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "url": {
+ "name": "url",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "last_sync_at": {
+ "name": "last_sync_at",
+ "type": "timestamp",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ },
+ "updated_at": {
+ "name": "updated_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ }
+ },
+ "indexes": {
+ "search_index": {
+ "name": "search_index",
+ "columns": [
+ {
+ "expression": "(\n\t\t\t\tsetweight(to_tsvector('english', \"name\"), 'A') ||\n setweight(to_tsvector('english', \"slug\"), 'B')\n )",
+ "asc": true,
+ "isExpression": true,
+ "nulls": "last"
+ }
+ ],
+ "isUnique": false,
+ "concurrently": false,
+ "method": "gin",
+ "with": {}
+ }
+ },
+ "foreignKeys": {},
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {
+ "games_cuid_unique": {
+ "name": "games_cuid_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "cuid"
+ ]
+ }
+ }
+ },
+ "public.games_to_external_ids": {
+ "name": "games_to_external_ids",
+ "schema": "",
+ "columns": {
+ "game_id": {
+ "name": "game_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "external_id": {
+ "name": "external_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "games_to_external_ids_game_id_games_id_fk": {
+ "name": "games_to_external_ids_game_id_games_id_fk",
+ "tableFrom": "games_to_external_ids",
+ "tableTo": "games",
+ "columnsFrom": [
+ "game_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "restrict",
+ "onUpdate": "cascade"
+ },
+ "games_to_external_ids_external_id_external_ids_id_fk": {
+ "name": "games_to_external_ids_external_id_external_ids_id_fk",
+ "tableFrom": "games_to_external_ids",
+ "tableTo": "external_ids",
+ "columnsFrom": [
+ "external_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "restrict",
+ "onUpdate": "cascade"
+ }
+ },
+ "compositePrimaryKeys": {
+ "games_to_external_ids_game_id_external_id_pk": {
+ "name": "games_to_external_ids_game_id_external_id_pk",
+ "columns": [
+ "game_id",
+ "external_id"
+ ]
+ }
+ },
+ "uniqueConstraints": {}
+ },
+ "public.mechanics": {
+ "name": "mechanics",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "uuid",
+ "primaryKey": true,
+ "notNull": true,
+ "default": "gen_random_uuid()"
+ },
+ "cuid": {
+ "name": "cuid",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "name": {
+ "name": "name",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "slug": {
+ "name": "slug",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ },
+ "updated_at": {
+ "name": "updated_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {},
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {
+ "mechanics_cuid_unique": {
+ "name": "mechanics_cuid_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "cuid"
+ ]
+ }
+ }
+ },
+ "public.mechanics_to_external_ids": {
+ "name": "mechanics_to_external_ids",
+ "schema": "",
+ "columns": {
+ "mechanic_id": {
+ "name": "mechanic_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "external_id": {
+ "name": "external_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "mechanics_to_external_ids_mechanic_id_mechanics_id_fk": {
+ "name": "mechanics_to_external_ids_mechanic_id_mechanics_id_fk",
+ "tableFrom": "mechanics_to_external_ids",
+ "tableTo": "mechanics",
+ "columnsFrom": [
+ "mechanic_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "restrict",
+ "onUpdate": "cascade"
+ },
+ "mechanics_to_external_ids_external_id_external_ids_id_fk": {
+ "name": "mechanics_to_external_ids_external_id_external_ids_id_fk",
+ "tableFrom": "mechanics_to_external_ids",
+ "tableTo": "external_ids",
+ "columnsFrom": [
+ "external_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "restrict",
+ "onUpdate": "cascade"
+ }
+ },
+ "compositePrimaryKeys": {
+ "mechanics_to_external_ids_mechanic_id_external_id_pk": {
+ "name": "mechanics_to_external_ids_mechanic_id_external_id_pk",
+ "columns": [
+ "mechanic_id",
+ "external_id"
+ ]
+ }
+ },
+ "uniqueConstraints": {}
+ },
+ "public.mechanics_to_games": {
+ "name": "mechanics_to_games",
+ "schema": "",
+ "columns": {
+ "mechanic_id": {
+ "name": "mechanic_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "game_id": {
+ "name": "game_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "mechanics_to_games_mechanic_id_mechanics_id_fk": {
+ "name": "mechanics_to_games_mechanic_id_mechanics_id_fk",
+ "tableFrom": "mechanics_to_games",
+ "tableTo": "mechanics",
+ "columnsFrom": [
+ "mechanic_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "restrict",
+ "onUpdate": "cascade"
+ },
+ "mechanics_to_games_game_id_games_id_fk": {
+ "name": "mechanics_to_games_game_id_games_id_fk",
+ "tableFrom": "mechanics_to_games",
+ "tableTo": "games",
+ "columnsFrom": [
+ "game_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "restrict",
+ "onUpdate": "cascade"
+ }
+ },
+ "compositePrimaryKeys": {
+ "mechanics_to_games_mechanic_id_game_id_pk": {
+ "name": "mechanics_to_games_mechanic_id_game_id_pk",
+ "columns": [
+ "mechanic_id",
+ "game_id"
+ ]
+ }
+ },
+ "uniqueConstraints": {}
+ },
+ "public.password_reset_tokens": {
+ "name": "password_reset_tokens",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "text",
+ "primaryKey": true,
+ "notNull": true
+ },
+ "user_id": {
+ "name": "user_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "expires_at": {
+ "name": "expires_at",
+ "type": "timestamp",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ },
+ "updated_at": {
+ "name": "updated_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "password_reset_tokens_user_id_users_id_fk": {
+ "name": "password_reset_tokens_user_id_users_id_fk",
+ "tableFrom": "password_reset_tokens",
+ "tableTo": "users",
+ "columnsFrom": [
+ "user_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "cascade",
+ "onUpdate": "no action"
+ }
+ },
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {}
+ },
+ "public.publishers": {
+ "name": "publishers",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "uuid",
+ "primaryKey": true,
+ "notNull": true,
+ "default": "gen_random_uuid()"
+ },
+ "cuid": {
+ "name": "cuid",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "name": {
+ "name": "name",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "slug": {
+ "name": "slug",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ },
+ "updated_at": {
+ "name": "updated_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {},
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {
+ "publishers_cuid_unique": {
+ "name": "publishers_cuid_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "cuid"
+ ]
+ }
+ }
+ },
+ "public.publishers_to_external_ids": {
+ "name": "publishers_to_external_ids",
+ "schema": "",
+ "columns": {
+ "publisher_id": {
+ "name": "publisher_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "external_id": {
+ "name": "external_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "publishers_to_external_ids_publisher_id_publishers_id_fk": {
+ "name": "publishers_to_external_ids_publisher_id_publishers_id_fk",
+ "tableFrom": "publishers_to_external_ids",
+ "tableTo": "publishers",
+ "columnsFrom": [
+ "publisher_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "restrict",
+ "onUpdate": "cascade"
+ },
+ "publishers_to_external_ids_external_id_external_ids_id_fk": {
+ "name": "publishers_to_external_ids_external_id_external_ids_id_fk",
+ "tableFrom": "publishers_to_external_ids",
+ "tableTo": "external_ids",
+ "columnsFrom": [
+ "external_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "restrict",
+ "onUpdate": "cascade"
+ }
+ },
+ "compositePrimaryKeys": {
+ "publishers_to_external_ids_publisher_id_external_id_pk": {
+ "name": "publishers_to_external_ids_publisher_id_external_id_pk",
+ "columns": [
+ "publisher_id",
+ "external_id"
+ ]
+ }
+ },
+ "uniqueConstraints": {}
+ },
+ "public.publishers_to_games": {
+ "name": "publishers_to_games",
+ "schema": "",
+ "columns": {
+ "publisher_id": {
+ "name": "publisher_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "game_id": {
+ "name": "game_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "publishers_to_games_publisher_id_publishers_id_fk": {
+ "name": "publishers_to_games_publisher_id_publishers_id_fk",
+ "tableFrom": "publishers_to_games",
+ "tableTo": "publishers",
+ "columnsFrom": [
+ "publisher_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "restrict",
+ "onUpdate": "cascade"
+ },
+ "publishers_to_games_game_id_games_id_fk": {
+ "name": "publishers_to_games_game_id_games_id_fk",
+ "tableFrom": "publishers_to_games",
+ "tableTo": "games",
+ "columnsFrom": [
+ "game_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "restrict",
+ "onUpdate": "cascade"
+ }
+ },
+ "compositePrimaryKeys": {
+ "publishers_to_games_publisher_id_game_id_pk": {
+ "name": "publishers_to_games_publisher_id_game_id_pk",
+ "columns": [
+ "publisher_id",
+ "game_id"
+ ]
+ }
+ },
+ "uniqueConstraints": {}
+ },
+ "public.recovery_codes": {
+ "name": "recovery_codes",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "uuid",
+ "primaryKey": true,
+ "notNull": true,
+ "default": "gen_random_uuid()"
+ },
+ "user_id": {
+ "name": "user_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "code": {
+ "name": "code",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "used": {
+ "name": "used",
+ "type": "boolean",
+ "primaryKey": false,
+ "notNull": false,
+ "default": false
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ },
+ "updated_at": {
+ "name": "updated_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "recovery_codes_user_id_users_id_fk": {
+ "name": "recovery_codes_user_id_users_id_fk",
+ "tableFrom": "recovery_codes",
+ "tableTo": "users",
+ "columnsFrom": [
+ "user_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "no action",
+ "onUpdate": "no action"
+ }
+ },
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {}
+ },
+ "public.roles": {
+ "name": "roles",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "uuid",
+ "primaryKey": true,
+ "notNull": true,
+ "default": "gen_random_uuid()"
+ },
+ "cuid": {
+ "name": "cuid",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "name": {
+ "name": "name",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ },
+ "updated_at": {
+ "name": "updated_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {},
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {
+ "roles_cuid_unique": {
+ "name": "roles_cuid_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "cuid"
+ ]
+ },
+ "roles_name_unique": {
+ "name": "roles_name_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "name"
+ ]
+ }
+ }
+ },
+ "public.sessions": {
+ "name": "sessions",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "text",
+ "primaryKey": true,
+ "notNull": true
+ },
+ "user_id": {
+ "name": "user_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "expires_at": {
+ "name": "expires_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "ip_country": {
+ "name": "ip_country",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "ip_address": {
+ "name": "ip_address",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "two_factor_auth_enabled": {
+ "name": "two_factor_auth_enabled",
+ "type": "boolean",
+ "primaryKey": false,
+ "notNull": false,
+ "default": false
+ },
+ "is_two_factor_authenticated": {
+ "name": "is_two_factor_authenticated",
+ "type": "boolean",
+ "primaryKey": false,
+ "notNull": false,
+ "default": false
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "sessions_user_id_users_id_fk": {
+ "name": "sessions_user_id_users_id_fk",
+ "tableFrom": "sessions",
+ "tableTo": "users",
+ "columnsFrom": [
+ "user_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "no action",
+ "onUpdate": "no action"
+ }
+ },
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {}
+ },
+ "public.two_factor": {
+ "name": "two_factor",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "uuid",
+ "primaryKey": true,
+ "notNull": true,
+ "default": "gen_random_uuid()"
+ },
+ "cuid": {
+ "name": "cuid",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "secret": {
+ "name": "secret",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "enabled": {
+ "name": "enabled",
+ "type": "boolean",
+ "primaryKey": false,
+ "notNull": true,
+ "default": false
+ },
+ "initiated_time": {
+ "name": "initiated_time",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "user_id": {
+ "name": "user_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ },
+ "updated_at": {
+ "name": "updated_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "two_factor_user_id_users_id_fk": {
+ "name": "two_factor_user_id_users_id_fk",
+ "tableFrom": "two_factor",
+ "tableTo": "users",
+ "columnsFrom": [
+ "user_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "no action",
+ "onUpdate": "no action"
+ }
+ },
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {
+ "two_factor_cuid_unique": {
+ "name": "two_factor_cuid_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "cuid"
+ ]
+ },
+ "two_factor_user_id_unique": {
+ "name": "two_factor_user_id_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "user_id"
+ ]
+ }
+ }
+ },
+ "public.user_roles": {
+ "name": "user_roles",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "uuid",
+ "primaryKey": true,
+ "notNull": true,
+ "default": "gen_random_uuid()"
+ },
+ "cuid": {
+ "name": "cuid",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "user_id": {
+ "name": "user_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "role_id": {
+ "name": "role_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "primary": {
+ "name": "primary",
+ "type": "boolean",
+ "primaryKey": false,
+ "notNull": false,
+ "default": false
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ },
+ "updated_at": {
+ "name": "updated_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "user_roles_user_id_users_id_fk": {
+ "name": "user_roles_user_id_users_id_fk",
+ "tableFrom": "user_roles",
+ "tableTo": "users",
+ "columnsFrom": [
+ "user_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "cascade",
+ "onUpdate": "no action"
+ },
+ "user_roles_role_id_roles_id_fk": {
+ "name": "user_roles_role_id_roles_id_fk",
+ "tableFrom": "user_roles",
+ "tableTo": "roles",
+ "columnsFrom": [
+ "role_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "cascade",
+ "onUpdate": "no action"
+ }
+ },
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {
+ "user_roles_cuid_unique": {
+ "name": "user_roles_cuid_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "cuid"
+ ]
+ }
+ }
+ },
+ "public.users": {
+ "name": "users",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "uuid",
+ "primaryKey": true,
+ "notNull": true,
+ "default": "gen_random_uuid()"
+ },
+ "cuid": {
+ "name": "cuid",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "username": {
+ "name": "username",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "email": {
+ "name": "email",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "first_name": {
+ "name": "first_name",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "last_name": {
+ "name": "last_name",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "verified": {
+ "name": "verified",
+ "type": "boolean",
+ "primaryKey": false,
+ "notNull": false,
+ "default": false
+ },
+ "receive_email": {
+ "name": "receive_email",
+ "type": "boolean",
+ "primaryKey": false,
+ "notNull": false,
+ "default": false
+ },
+ "email_verified": {
+ "name": "email_verified",
+ "type": "boolean",
+ "primaryKey": false,
+ "notNull": false,
+ "default": false
+ },
+ "picture": {
+ "name": "picture",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "mfa_enabled": {
+ "name": "mfa_enabled",
+ "type": "boolean",
+ "primaryKey": false,
+ "notNull": true,
+ "default": false
+ },
+ "theme": {
+ "name": "theme",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false,
+ "default": "'system'"
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ },
+ "updated_at": {
+ "name": "updated_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {},
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {
+ "users_cuid_unique": {
+ "name": "users_cuid_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "cuid"
+ ]
+ },
+ "users_username_unique": {
+ "name": "users_username_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "username"
+ ]
+ },
+ "users_email_unique": {
+ "name": "users_email_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "email"
+ ]
+ }
+ }
+ },
+ "public.wishlist_items": {
+ "name": "wishlist_items",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "uuid",
+ "primaryKey": true,
+ "notNull": true,
+ "default": "gen_random_uuid()"
+ },
+ "cuid": {
+ "name": "cuid",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "wishlist_id": {
+ "name": "wishlist_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "game_id": {
+ "name": "game_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ },
+ "updated_at": {
+ "name": "updated_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "wishlist_items_wishlist_id_wishlists_id_fk": {
+ "name": "wishlist_items_wishlist_id_wishlists_id_fk",
+ "tableFrom": "wishlist_items",
+ "tableTo": "wishlists",
+ "columnsFrom": [
+ "wishlist_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "cascade",
+ "onUpdate": "no action"
+ },
+ "wishlist_items_game_id_games_id_fk": {
+ "name": "wishlist_items_game_id_games_id_fk",
+ "tableFrom": "wishlist_items",
+ "tableTo": "games",
+ "columnsFrom": [
+ "game_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "cascade",
+ "onUpdate": "no action"
+ }
+ },
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {
+ "wishlist_items_cuid_unique": {
+ "name": "wishlist_items_cuid_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "cuid"
+ ]
+ }
+ }
+ },
+ "public.wishlists": {
+ "name": "wishlists",
+ "schema": "",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "uuid",
+ "primaryKey": true,
+ "notNull": true,
+ "default": "gen_random_uuid()"
+ },
+ "cuid": {
+ "name": "cuid",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false
+ },
+ "user_id": {
+ "name": "user_id",
+ "type": "uuid",
+ "primaryKey": false,
+ "notNull": true
+ },
+ "name": {
+ "name": "name",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "'My Wishlist'"
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ },
+ "updated_at": {
+ "name": "updated_at",
+ "type": "timestamp with time zone",
+ "primaryKey": false,
+ "notNull": true,
+ "default": "now()"
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "wishlists_user_id_users_id_fk": {
+ "name": "wishlists_user_id_users_id_fk",
+ "tableFrom": "wishlists",
+ "tableTo": "users",
+ "columnsFrom": [
+ "user_id"
+ ],
+ "columnsTo": [
+ "id"
+ ],
+ "onDelete": "cascade",
+ "onUpdate": "no action"
+ }
+ },
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {
+ "wishlists_cuid_unique": {
+ "name": "wishlists_cuid_unique",
+ "nullsNotDistinct": false,
+ "columns": [
+ "cuid"
+ ]
+ }
+ }
+ }
+ },
+ "enums": {
+ "public.external_id_type": {
+ "name": "external_id_type",
+ "schema": "public",
+ "values": [
+ "game",
+ "category",
+ "mechanic",
+ "publisher",
+ "designer",
+ "artist"
+ ]
+ }
+ },
+ "schemas": {},
+ "sequences": {},
+ "_meta": {
+ "columns": {},
+ "schemas": {},
+ "tables": {}
+ }
+}
\ No newline at end of file
diff --git a/src/lib/server/api/databases/migrations/meta/_journal.json b/src/lib/server/api/databases/migrations/meta/_journal.json
index 1f88a00..6022f03 100644
--- a/src/lib/server/api/databases/migrations/meta/_journal.json
+++ b/src/lib/server/api/databases/migrations/meta/_journal.json
@@ -8,6 +8,13 @@
"when": 1725489682980,
"tag": "0000_volatile_warhawk",
"breakpoints": true
+ },
+ {
+ "idx": 1,
+ "version": "7",
+ "when": 1726877846811,
+ "tag": "0001_pink_the_enforcers",
+ "breakpoints": true
}
]
}
\ No newline at end of file
diff --git a/src/lib/server/api/databases/seeds/roles.ts b/src/lib/server/api/databases/seeds/roles.ts
index 35cefcd..a299a94 100644
--- a/src/lib/server/api/databases/seeds/roles.ts
+++ b/src/lib/server/api/databases/seeds/roles.ts
@@ -1,5 +1,5 @@
import * as schema from '$lib/server/api/databases/tables'
-import { type db } from '$lib/server/api/packages/drizzle'
+import type { db } from '$lib/server/api/packages/drizzle'
import roles from './data/roles.json'
export default async function seed(db: db) {
diff --git a/src/lib/server/api/databases/tables/collections.table.ts b/src/lib/server/api/databases/tables/collections.table.ts
index 715bf4d..4b483df 100644
--- a/src/lib/server/api/databases/tables/collections.table.ts
+++ b/src/lib/server/api/databases/tables/collections.table.ts
@@ -3,6 +3,7 @@ import { type InferSelectModel, relations } from 'drizzle-orm'
import { pgTable, text, uuid } from 'drizzle-orm/pg-core'
import { timestamps } from '../../common/utils/table'
import { usersTable } from './users.table'
+import { collection_items } from './collectionItems.table'
export const collections = pgTable('collections', {
id: uuid('id').primaryKey().defaultRandom(),
@@ -16,11 +17,12 @@ export const collections = pgTable('collections', {
...timestamps,
})
-export const collection_relations = relations(collections, ({ one }) => ({
+export const collection_relations = relations(collections, ({ one, many }) => ({
user: one(usersTable, {
fields: [collections.user_id],
references: [usersTable.id],
}),
+ collection_items: many(collection_items),
}))
export type Collections = InferSelectModel
diff --git a/src/lib/server/api/databases/tables/roles.table.ts b/src/lib/server/api/databases/tables/roles.table.ts
index 1dfcfc2..e9f036f 100644
--- a/src/lib/server/api/databases/tables/roles.table.ts
+++ b/src/lib/server/api/databases/tables/roles.table.ts
@@ -4,6 +4,13 @@ import { pgTable, text, uuid } from 'drizzle-orm/pg-core'
import { timestamps } from '../../common/utils/table'
import { user_roles } from './userRoles.table'
+export enum RoleName {
+ ADMIN = 'admin',
+ EDITOR = 'editor',
+ MODERATOR = 'moderator',
+ USER = 'user',
+}
+
export const rolesTable = pgTable('roles', {
id: uuid('id').primaryKey().defaultRandom(),
cuid: text('cuid')
diff --git a/src/lib/server/api/databases/tables/users.table.ts b/src/lib/server/api/databases/tables/users.table.ts
index 2836dba..c244bbd 100644
--- a/src/lib/server/api/databases/tables/users.table.ts
+++ b/src/lib/server/api/databases/tables/users.table.ts
@@ -15,6 +15,8 @@ export const usersTable = pgTable('users', {
last_name: text('last_name'),
verified: boolean('verified').default(false),
receive_email: boolean('receive_email').default(false),
+ email_verified: boolean('email_verified').default(false),
+ picture: text('picture'),
mfa_enabled: boolean('mfa_enabled').notNull().default(false),
theme: text('theme').default('system'),
...timestamps,
diff --git a/src/lib/server/api/dtos/change-password.dto.ts b/src/lib/server/api/dtos/change-password.dto.ts
new file mode 100644
index 0000000..b624722
--- /dev/null
+++ b/src/lib/server/api/dtos/change-password.dto.ts
@@ -0,0 +1,17 @@
+import { refinePasswords } from '$lib/validations/account'
+import { z } from 'zod'
+
+export const changePasswordDto = z
+ .object({
+ password: z.string({ required_error: 'Password is required' }).trim(),
+ confirm_password: z
+ .string({ required_error: 'Confirm Password is required' })
+ .trim()
+ .min(8, { message: 'Must be at least 8 characters' })
+ .max(128, { message: 'Must be less than 128 characters' }),
+ })
+ .superRefine(({ confirm_password, password }, ctx) => {
+ return refinePasswords(confirm_password, password, ctx)
+ })
+
+export type ChangePasswordDto = z.infer
diff --git a/src/lib/server/api/dtos/update-profile.dto.ts b/src/lib/server/api/dtos/update-profile.dto.ts
index 9ea0c6f..1ce379b 100644
--- a/src/lib/server/api/dtos/update-profile.dto.ts
+++ b/src/lib/server/api/dtos/update-profile.dto.ts
@@ -1,23 +1,14 @@
-import { z } from "zod";
+import { z } from 'zod'
export const updateProfileDto = z.object({
firstName: z
.string()
.trim()
- .min(3, {message: 'Must be at least 3 characters'})
- .max(50, {message: 'Must be less than 50 characters'})
+ .min(3, { message: 'Must be at least 3 characters' })
+ .max(50, { message: 'Must be less than 50 characters' })
.optional(),
- lastName: z
- .string()
- .trim()
- .min(3, {message: 'Must be at least 3 characters'})
- .max(50, {message: 'Must be less than 50 characters'})
- .optional(),
- username: z
- .string()
- .trim()
- .min(3, {message: 'Must be at least 3 characters'})
- .max(50, {message: 'Must be less than 50 characters'})
-});
+ lastName: z.string().trim().min(3, { message: 'Must be at least 3 characters' }).max(50, { message: 'Must be less than 50 characters' }).optional(),
+ username: z.string().trim().min(3, { message: 'Must be at least 3 characters' }).max(50, { message: 'Must be less than 50 characters' }),
+})
-export type UpdateProfileDto = z.infer;
+export type UpdateProfileDto = z.infer
diff --git a/src/lib/server/api/index.ts b/src/lib/server/api/index.ts
index 8dd5adb..3106d86 100644
--- a/src/lib/server/api/index.ts
+++ b/src/lib/server/api/index.ts
@@ -1,6 +1,7 @@
import 'reflect-metadata'
import { CollectionController } from '$lib/server/api/controllers/collection.controller'
import { MfaController } from '$lib/server/api/controllers/mfa.controller'
+import { OAuthController } from '$lib/server/api/controllers/oauth.controller'
import { SignupController } from '$lib/server/api/controllers/signup.controller'
import { UserController } from '$lib/server/api/controllers/user.controller'
import { WishlistController } from '$lib/server/api/controllers/wishlist.controller'
@@ -44,6 +45,7 @@ const routes = app
.route('/me', container.resolve(IamController).routes())
.route('/user', container.resolve(UserController).routes())
.route('/login', container.resolve(LoginController).routes())
+ .route('/oauth', container.resolve(OAuthController).routes())
.route('/signup', container.resolve(SignupController).routes())
.route('/wishlists', container.resolve(WishlistController).routes())
.route('/collections', container.resolve(CollectionController).routes())
diff --git a/src/lib/server/api/jobs/auth-cleanup.job.ts b/src/lib/server/api/jobs/auth-cleanup.job.ts
index fb2ec6c..efaf1c1 100644
--- a/src/lib/server/api/jobs/auth-cleanup.job.ts
+++ b/src/lib/server/api/jobs/auth-cleanup.job.ts
@@ -10,11 +10,11 @@ export class AuthCleanupJobs {
this.queue = this.jobsService.createQueue('test')
/* ---------------------------- Register Workers ---------------------------- */
- this.worker().then((r) => console.log('auth-cleanup job worker started'))
+ this.worker().then(() => console.log('auth-cleanup job worker started'))
}
async deleteStaleEmailVerificationRequests() {
- await this.queue.add('delete_stale_email_verifiactions', null, {
+ await this.queue.add('delete_stale_email_verifications', null, {
repeat: {
pattern: '0 0 * * 0', // Runs once a week at midnight on Sunday
},
@@ -31,7 +31,7 @@ export class AuthCleanupJobs {
private async worker() {
return this.jobsService.createWorker(this.queue.name, async (job) => {
- if (job.name === 'delete_stale_email_verifiactions') {
+ if (job.name === 'delete_stale_email_verifications') {
// delete stale email verifications
}
if (job.name === 'delete_stale_login_requests') {
diff --git a/src/lib/server/api/middleware/auth.middleware.ts b/src/lib/server/api/middleware/auth.middleware.ts
index 3cc3766..b88418b 100644
--- a/src/lib/server/api/middleware/auth.middleware.ts
+++ b/src/lib/server/api/middleware/auth.middleware.ts
@@ -1,10 +1,8 @@
import { LuciaService } from '$lib/server/api/services/lucia.service'
import type { MiddlewareHandler } from 'hono'
import { createMiddleware } from 'hono/factory'
-import type { Session, User } from 'lucia'
import { verifyRequestOrigin } from 'oslo/request'
import { container } from 'tsyringe'
-import { Unauthorized } from '../common/exceptions'
import type { HonoTypes } from '../common/types/hono'
// resolve dependencies from the container
@@ -41,14 +39,3 @@ export const validateAuthSession: MiddlewareHandler = createMiddlewar
c.set('user', user)
return next()
})
-
-export const requireAuth: MiddlewareHandler<{
- Variables: {
- session: Session
- user: User
- }
-}> = createMiddleware(async (c, next) => {
- const user = c.var.user
- if (!user) throw Unauthorized('You must be logged in to access this resource')
- return next()
-})
diff --git a/src/lib/server/api/repositories/collections.repository.ts b/src/lib/server/api/repositories/collections.repository.ts
index c6f097b..c351714 100644
--- a/src/lib/server/api/repositories/collections.repository.ts
+++ b/src/lib/server/api/repositories/collections.repository.ts
@@ -51,6 +51,23 @@ export class CollectionsRepository {
})
}
+ async findAllByUserIdWithDetails(userId: string, db = this.drizzle.db) {
+ return db.query.collections.findMany({
+ where: eq(collections.user_id, userId),
+ columns: {
+ cuid: true,
+ name: true,
+ },
+ with: {
+ collection_items: {
+ columns: {
+ cuid: true,
+ },
+ },
+ },
+ })
+ }
+
async create(data: CreateCollection, db = this.drizzle.db) {
return db.insert(collections).values(data).returning().then(takeFirstOrThrow)
}
diff --git a/src/lib/server/api/repositories/credentials.repository.ts b/src/lib/server/api/repositories/credentials.repository.ts
index 11f56c5..bdd8de5 100644
--- a/src/lib/server/api/repositories/credentials.repository.ts
+++ b/src/lib/server/api/repositories/credentials.repository.ts
@@ -7,6 +7,7 @@ import { takeFirstOrThrow } from '../common/utils/repository'
export type CreateCredentials = InferInsertModel
export type UpdateCredentials = Partial
+export type DeleteCredentials = Pick
@injectable()
export class CredentialsRepository {
@@ -43,7 +44,7 @@ export class CredentialsRepository {
}
async findOneByIdOrThrow(id: string, db = this.drizzle.db) {
- const credentials = await this.findOneById(id)
+ const credentials = await this.findOneById(id, db)
if (!credentials) throw Error('Credentials not found')
return credentials
}
diff --git a/src/lib/server/api/repositories/federated_identity.repository.ts b/src/lib/server/api/repositories/federated_identity.repository.ts
new file mode 100644
index 0000000..2180590
--- /dev/null
+++ b/src/lib/server/api/repositories/federated_identity.repository.ts
@@ -0,0 +1,28 @@
+import { type InferInsertModel, and, eq } from 'drizzle-orm'
+import { inject, injectable } from 'tsyringe'
+import { takeFirstOrThrow } from '../common/utils/repository'
+import { federatedIdentityTable } from '../databases/tables'
+import { DrizzleService } from '../services/drizzle.service'
+
+export type CreateFederatedIdentity = InferInsertModel
+
+@injectable()
+export class FederatedIdentityRepository {
+ constructor(@inject(DrizzleService) private readonly drizzle: DrizzleService) {}
+
+ async findOneByUserIdAndProvider(userId: string, provider: string) {
+ return this.drizzle.db.query.federatedIdentityTable.findFirst({
+ where: and(eq(federatedIdentityTable.user_id, userId), eq(federatedIdentityTable.identity_provider, provider)),
+ })
+ }
+
+ async findOneByFederatedUserIdAndProvider(federatedUserId: string, provider: string) {
+ return this.drizzle.db.query.federatedIdentityTable.findFirst({
+ where: and(eq(federatedIdentityTable.federated_user_id, federatedUserId), eq(federatedIdentityTable.identity_provider, provider)),
+ })
+ }
+
+ async create(data: CreateFederatedIdentity, db = this.drizzle.db) {
+ return db.insert(federatedIdentityTable).values(data).returning().then(takeFirstOrThrow)
+ }
+}
diff --git a/src/lib/server/api/repositories/roles.repository.ts b/src/lib/server/api/repositories/roles.repository.ts
index 2750d5c..4d9f283 100644
--- a/src/lib/server/api/repositories/roles.repository.ts
+++ b/src/lib/server/api/repositories/roles.repository.ts
@@ -28,29 +28,29 @@ export class RolesRepository {
constructor(@inject(DrizzleService) private readonly drizzle: DrizzleService) {}
async findOneById(id: string, db = this.drizzle.db) {
- return db.query.roles.findFirst({
+ return db.query.rolesTable.findFirst({
where: eq(rolesTable.id, id),
})
}
async findOneByIdOrThrow(id: string, db = this.drizzle.db) {
- const role = await this.findOneById(id)
+ const role = await this.findOneById(id, db)
if (!role) throw Error('Role not found')
return role
}
async findAll(db = this.drizzle.db) {
- return db.query.roles.findMany()
+ return db.query.rolesTable.findMany()
}
async findOneByName(name: string, db = this.drizzle.db) {
- return db.query.roles.findFirst({
+ return db.query.rolesTable.findFirst({
where: eq(rolesTable.name, name),
})
}
async findOneByNameOrThrow(name: string, db = this.drizzle.db) {
- const role = await this.findOneByName(name)
+ const role = await this.findOneByName(name, db)
if (!role) throw Error('Role not found')
return role
}
diff --git a/src/lib/server/api/repositories/user_roles.repository.ts b/src/lib/server/api/repositories/user_roles.repository.ts
index 737bc0c..ef95b74 100644
--- a/src/lib/server/api/repositories/user_roles.repository.ts
+++ b/src/lib/server/api/repositories/user_roles.repository.ts
@@ -33,8 +33,8 @@ export class UserRolesRepository {
})
}
- async findOneByIdOrThrow(id: string) {
- const userRole = await this.findOneById(id)
+ async findOneByIdOrThrow(id: string, db = this.drizzle.db) {
+ const userRole = await this.findOneById(id, db)
if (!userRole) throw Error('User not found')
return userRole
}
diff --git a/src/lib/server/api/services/collections.service.ts b/src/lib/server/api/services/collections.service.ts
index 4e0a009..ccdbcbc 100644
--- a/src/lib/server/api/services/collections.service.ts
+++ b/src/lib/server/api/services/collections.service.ts
@@ -1,37 +1,50 @@
-import { inject, injectable } from "tsyringe";
-import { generateRandomAnimalName } from "$lib/utils/randomDataUtil";
-import { CollectionsRepository } from "../repositories/collections.repository";
+import type { db } from '$lib/server/api/packages/drizzle'
+import { generateRandomAnimalName } from '$lib/utils/randomDataUtil'
+import { inject, injectable } from 'tsyringe'
+import { CollectionsRepository } from '../repositories/collections.repository'
@injectable()
export class CollectionsService {
- constructor(
- @inject(CollectionsRepository) private readonly collectionsRepository: CollectionsRepository
- ) { }
+ constructor(@inject(CollectionsRepository) private readonly collectionsRepository: CollectionsRepository) {}
async findOneByUserId(userId: string) {
- return this.collectionsRepository.findOneByUserId(userId);
+ return this.collectionsRepository.findOneByUserId(userId)
}
async findAllByUserId(userId: string) {
- return this.collectionsRepository.findAllByUserId(userId);
+ return this.collectionsRepository.findAllByUserId(userId)
+ }
+
+ async findAllByUserIdWithDetails(userId: string) {
+ return this.collectionsRepository.findAllByUserIdWithDetails(userId)
}
async findOneById(id: string) {
- return this.collectionsRepository.findOneById(id);
+ return this.collectionsRepository.findOneById(id)
}
async findOneByCuid(cuid: string) {
- return this.collectionsRepository.findOneByCuid(cuid);
+ return this.collectionsRepository.findOneByCuid(cuid)
}
- async createEmptyNoName(userId: string) {
- return this.createEmpty(userId, null);
+ async createEmptyNoName(userId: string, trx: Parameters[0]>[0] | null = null) {
+ return this.createEmpty(userId, null, trx)
}
- async createEmpty(userId: string, name: string | null) {
- return this.collectionsRepository.create({
- user_id: userId,
- name: name ?? generateRandomAnimalName(),
- });
+ async createEmpty(userId: string, name: string | null, trx: Parameters[0]>[0] | null = null) {
+ if (!trx) {
+ return this.collectionsRepository.create({
+ user_id: userId,
+ name: name ?? generateRandomAnimalName(),
+ })
+ }
+
+ return this.collectionsRepository.create(
+ {
+ user_id: userId,
+ name: name ?? generateRandomAnimalName(),
+ },
+ trx,
+ )
}
-}
\ No newline at end of file
+}
diff --git a/src/lib/server/api/services/iam.service.ts b/src/lib/server/api/services/iam.service.ts
index 0c3bc6e..7d93a5f 100644
--- a/src/lib/server/api/services/iam.service.ts
+++ b/src/lib/server/api/services/iam.service.ts
@@ -1,3 +1,5 @@
+import { CredentialsType } from '$lib/server/api/databases/tables'
+import type { ChangePasswordDto } from '$lib/server/api/dtos/change-password.dto'
import type { UpdateEmailDto } from '$lib/server/api/dtos/update-email.dto'
import type { UpdateProfileDto } from '$lib/server/api/dtos/update-profile.dto'
import type { VerifyPasswordDto } from '$lib/server/api/dtos/verify-password.dto'
@@ -42,13 +44,13 @@ export class IamService {
}
const existingUserForNewUsername = await this.usersService.findOneByUsername(data.username)
- if (existingUserForNewUsername && existingUserForNewUsername.id !== userId) {
+ if (existingUserForNewUsername && existingUserForNewUsername.id !== user.id) {
return {
error: 'Username already in use',
}
}
- return this.usersService.updateUser(userId, {
+ return this.usersService.updateUser(user.id, {
first_name: data.firstName,
last_name: data.lastName,
username: data.username !== user.username ? data.username : user.username,
@@ -68,6 +70,11 @@ export class IamService {
})
}
+ async updatePassword(userId: string, data: ChangePasswordDto) {
+ const { password } = data
+ await this.usersService.updatePassword(userId, password)
+ }
+
async verifyPassword(userId: string, data: VerifyPasswordDto) {
const user = await this.usersService.findOneById(userId)
if (!user) {
diff --git a/src/lib/server/api/services/oauth.service.ts b/src/lib/server/api/services/oauth.service.ts
new file mode 100644
index 0000000..ef563c6
--- /dev/null
+++ b/src/lib/server/api/services/oauth.service.ts
@@ -0,0 +1,27 @@
+import { inject, injectable } from 'tsyringe'
+import { FederatedIdentityRepository } from '../repositories/federated_identity.repository'
+import { UsersService } from './users.service'
+import type {OAuthUser, OAuthProviders} from "$lib/server/api/common/types/oauth";
+
+@injectable()
+export class OAuthService {
+ constructor(
+ @inject(FederatedIdentityRepository) private readonly federatedIdentityRepository: FederatedIdentityRepository,
+ @inject(UsersService) private readonly usersService: UsersService,
+ ) {}
+
+ async handleOAuthUser(oAuthUser: OAuthUser, oauthProvider: OAuthProviders) {
+ const federatedUser = await this.federatedIdentityRepository.findOneByFederatedUserIdAndProvider(oAuthUser.sub, oauthProvider)
+
+ if (federatedUser) {
+ return federatedUser.user_id
+ }
+
+ const user = await this.usersService.createOAuthUser(oAuthUser, oauthProvider)
+
+ if (!user) {
+ throw new Error('Failed to create user')
+ }
+ return user.id
+ }
+}
diff --git a/src/lib/server/api/services/user_roles.service.ts b/src/lib/server/api/services/user_roles.service.ts
index 04ad1d0..ea80eff 100644
--- a/src/lib/server/api/services/user_roles.service.ts
+++ b/src/lib/server/api/services/user_roles.service.ts
@@ -1,39 +1,51 @@
-import {inject, injectable} from "tsyringe";
-import {type CreateUserRole, UserRolesRepository} from "$lib/server/api/repositories/user_roles.repository";
-import {RolesService} from "$lib/server/api/services/roles.service";
+import type { db } from '$lib/server/api/packages/drizzle'
+import { type CreateUserRole, UserRolesRepository } from '$lib/server/api/repositories/user_roles.repository'
+import { RolesService } from '$lib/server/api/services/roles.service'
+import { inject, injectable } from 'tsyringe'
@injectable()
export class UserRolesService {
constructor(
- @inject(UserRolesRepository) private readonly userRolesRepository: UserRolesRepository,
- @inject(RolesService) private readonly rolesService: RolesService
- ) { }
+ @inject(UserRolesRepository) private readonly userRolesRepository: UserRolesRepository,
+ @inject(RolesService) private readonly rolesService: RolesService,
+ ) {}
async findOneById(id: string) {
- return this.userRolesRepository.findOneById(id);
+ return this.userRolesRepository.findOneById(id)
}
async findAllByUserId(userId: string) {
- return this.userRolesRepository.findAllByUserId(userId);
+ return this.userRolesRepository.findAllByUserId(userId)
}
async create(data: CreateUserRole) {
- return this.userRolesRepository.create(data);
+ return this.userRolesRepository.create(data)
}
- async addRoleToUser(userId: string, roleName: string, primary = false) {
+ async addRoleToUser(userId: string, roleName: string, primary = false, trx: Parameters[0]>[0] | null = null) {
// Find the role by its name
- const role = await this.rolesService.findOneByNameOrThrow(roleName);
+ const role = await this.rolesService.findOneByNameOrThrow(roleName)
if (!role || !role.id) {
- throw new Error(`Role with name ${roleName} not found`);
+ throw new Error(`Role with name ${roleName} not found`)
+ }
+
+ if (!trx) {
+ return this.userRolesRepository.create({
+ user_id: userId,
+ role_id: role.id,
+ primary,
+ })
}
// Create a UserRole entry linking the user and the role
- return this.userRolesRepository.create({
- user_id: userId,
- role_id: role.id,
- primary,
- });
+ return this.userRolesRepository.create(
+ {
+ user_id: userId,
+ role_id: role.id,
+ primary,
+ },
+ trx,
+ )
}
-}
\ No newline at end of file
+}
diff --git a/src/lib/server/api/services/users.service.ts b/src/lib/server/api/services/users.service.ts
index 89e6eea..172908f 100644
--- a/src/lib/server/api/services/users.service.ts
+++ b/src/lib/server/api/services/users.service.ts
@@ -1,21 +1,28 @@
import type { SignupUsernameEmailDto } from '$lib/server/api/dtos/signup-username-email.dto'
import { CredentialsRepository } from '$lib/server/api/repositories/credentials.repository'
+import { FederatedIdentityRepository } from '$lib/server/api/repositories/federated_identity.repository'
+import { WishlistsRepository } from '$lib/server/api/repositories/wishlists.repository'
import { TokensService } from '$lib/server/api/services/tokens.service'
import { UserRolesService } from '$lib/server/api/services/user_roles.service'
import { inject, injectable } from 'tsyringe'
-import { CredentialsType } from '../databases/tables'
+import {CredentialsType, RoleName} from '../databases/tables'
import { type UpdateUser, UsersRepository } from '../repositories/users.repository'
import { CollectionsService } from './collections.service'
+import { DrizzleService } from './drizzle.service'
import { WishlistsService } from './wishlists.service'
+import type {OAuthUser} from "$lib/server/api/common/types/oauth";
@injectable()
export class UsersService {
constructor(
@inject(CollectionsService) private readonly collectionsService: CollectionsService,
@inject(CredentialsRepository) private readonly credentialsRepository: CredentialsRepository,
+ @inject(DrizzleService) private readonly drizzleService: DrizzleService,
+ @inject(FederatedIdentityRepository) private readonly federatedIdentityRepository: FederatedIdentityRepository,
@inject(TokensService) private readonly tokenService: TokensService,
@inject(UsersRepository) private readonly usersRepository: UsersRepository,
@inject(UserRolesService) private readonly userRolesService: UserRolesService,
+ @inject(WishlistsRepository) private readonly wishlistsRepository: WishlistsRepository,
@inject(WishlistsService) private readonly wishlistsService: WishlistsService,
) {}
@@ -23,34 +30,76 @@ export class UsersService {
const { firstName, lastName, email, username, password } = data
const hashedPassword = await this.tokenService.createHashedToken(password)
- const user = await this.usersRepository.create({
- first_name: firstName,
- last_name: lastName,
- email,
- username,
+ return await this.drizzleService.db.transaction(async (trx) => {
+ const createdUser = await this.usersRepository.create(
+ {
+ first_name: firstName,
+ last_name: lastName,
+ email,
+ username,
+ },
+ trx,
+ )
+
+ if (!createdUser) {
+ return null
+ }
+
+ const credentials = await this.credentialsRepository.create(
+ {
+ user_id: createdUser.id,
+ type: CredentialsType.PASSWORD,
+ secret_data: hashedPassword,
+ },
+ trx,
+ )
+
+ if (!credentials) {
+ await this.usersRepository.delete(createdUser.id)
+ return null
+ }
+
+ await this.userRolesService.addRoleToUser(createdUser.id, RoleName.USER, true, trx)
+
+ await this.wishlistsService.createEmptyNoName(createdUser.id, trx)
+ await this.collectionsService.createEmptyNoName(createdUser.id, trx)
})
+ }
- if (!user) {
- return null
- }
+ async createOAuthUser(oAuthUser: OAuthUser, oauthProvider: string) {
+ return await this.drizzleService.db.transaction(async (trx) => {
+ const createdUser = await this.usersRepository.create(
+ {
+ username: oAuthUser.username || oAuthUser.username,
+ email: oAuthUser.email || null,
+ first_name: oAuthUser.given_name || null,
+ last_name: oAuthUser.family_name || null,
+ picture: oAuthUser.picture || null,
+ email_verified: oAuthUser.email_verified || false,
+ },
+ trx,
+ )
- const credentials = await this.credentialsRepository.create({
- user_id: user.id,
- type: CredentialsType.PASSWORD,
- secret_data: hashedPassword,
+ if (!createdUser) {
+ return null
+ }
+
+ await this.federatedIdentityRepository.create(
+ {
+ identity_provider: oauthProvider,
+ user_id: createdUser.id,
+ federated_user_id: oAuthUser.sub,
+ federated_username: oAuthUser.email || oAuthUser.username,
+ },
+ trx,
+ )
+
+ await this.userRolesService.addRoleToUser(createdUser.id, RoleName.USER, true, trx)
+
+ await this.wishlistsService.createEmptyNoName(createdUser.id, trx)
+ await this.collectionsService.createEmptyNoName(createdUser.id, trx)
+ return createdUser
})
-
- if (!credentials) {
- await this.usersRepository.delete(user.id)
- return null
- }
-
- await this.userRolesService.addRoleToUser(user.id, 'user', true)
-
- await this.wishlistsService.createEmptyNoName(user.id)
- await this.collectionsService.createEmptyNoName(user.id)
-
- return user
}
async updateUser(userId: string, data: UpdateUser) {
@@ -69,6 +118,22 @@ export class UsersService {
return this.usersRepository.findOneById(id)
}
+ async updatePassword(userId: string, password: string) {
+ const hashedPassword = await this.tokenService.createHashedToken(password)
+ const currentCredentials = await this.credentialsRepository.findPasswordCredentialsByUserId(userId)
+ if (!currentCredentials) {
+ await this.credentialsRepository.create({
+ user_id: userId,
+ type: CredentialsType.PASSWORD,
+ secret_data: hashedPassword,
+ })
+ } else {
+ await this.credentialsRepository.update(currentCredentials.id, {
+ secret_data: hashedPassword,
+ })
+ }
+ }
+
async verifyPassword(userId: string, data: { password: string }) {
const user = await this.usersRepository.findOneById(userId)
if (!user) {
diff --git a/src/lib/server/api/services/wishlists.service.ts b/src/lib/server/api/services/wishlists.service.ts
index f7326a1..b06b174 100644
--- a/src/lib/server/api/services/wishlists.service.ts
+++ b/src/lib/server/api/services/wishlists.service.ts
@@ -1,34 +1,41 @@
-import { inject, injectable } from "tsyringe";
-import { WishlistsRepository } from "../repositories/wishlists.repository";
-import { generateRandomAnimalName } from "$lib/utils/randomDataUtil";
+import type { db } from '$lib/server/api/packages/drizzle'
+import { generateRandomAnimalName } from '$lib/utils/randomDataUtil'
+import { inject, injectable } from 'tsyringe'
+import { WishlistsRepository } from '../repositories/wishlists.repository'
@injectable()
export class WishlistsService {
-
- constructor(
- @inject(WishlistsRepository) private readonly wishlistsRepository: WishlistsRepository
- ) { }
+ constructor(@inject(WishlistsRepository) private readonly wishlistsRepository: WishlistsRepository) {}
async findAllByUserId(userId: string) {
- return this.wishlistsRepository.findAllByUserId(userId);
+ return this.wishlistsRepository.findAllByUserId(userId)
}
async findOneById(id: string) {
- return this.wishlistsRepository.findOneById(id);
+ return this.wishlistsRepository.findOneById(id)
}
async findOneByCuid(cuid: string) {
- return this.wishlistsRepository.findOneByCuid(cuid);
+ return this.wishlistsRepository.findOneByCuid(cuid)
}
- async createEmptyNoName(userId: string) {
- return this.createEmpty(userId, null);
+ async createEmptyNoName(userId: string, trx: Parameters[0]>[0] | null = null) {
+ return this.createEmpty(userId, null, trx)
}
- async createEmpty(userId: string, name: string | null) {
- return this.wishlistsRepository.create({
- user_id: userId,
- name: name ?? generateRandomAnimalName(),
- });
+ async createEmpty(userId: string, name: string | null, trx: Parameters[0]>[0] | null = null) {
+ if (!trx) {
+ return this.wishlistsRepository.create({
+ user_id: userId,
+ name: name ?? generateRandomAnimalName(),
+ })
+ }
+ return this.wishlistsRepository.create(
+ {
+ user_id: userId,
+ name: name ?? generateRandomAnimalName(),
+ },
+ trx,
+ )
}
-}
\ No newline at end of file
+}
diff --git a/src/lib/server/api/tests/hashing.service.test.ts b/src/lib/server/api/tests/hashing.service.test.ts
index 94c7f89..d7fe080 100644
--- a/src/lib/server/api/tests/hashing.service.test.ts
+++ b/src/lib/server/api/tests/hashing.service.test.ts
@@ -1,32 +1,38 @@
-import 'reflect-metadata';
-import { container } from 'tsyringe';
-import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
-import { HashingService } from '../services/hashing.service';
+import 'reflect-metadata'
+import { container } from 'tsyringe'
+import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
+import { HashingService } from '../services/hashing.service'
describe('HashingService', () => {
- let service: HashingService;
+ let service: HashingService
beforeAll(() => {
- service = container.resolve(HashingService);
- });
+ service = container.resolve(HashingService)
+ })
afterAll(() => {
vi.resetAllMocks()
- });
+ })
describe('Create Hash', () => {
it('should create a hash', async () => {
- const hash = await service.hash('111');
- expect(hash).not.toBeUndefined();
- expect(hash).not.toBeNull();
- });
+ const hash = await service.hash('111')
+ expect(hash).not.toBeUndefined()
+ expect(hash).not.toBeNull()
+ })
})
describe('Verify Hash', () => {
it('should verify a hash', async () => {
- const hash = await service.hash('111');
- const verifiable = await service.verify(hash, '111');
- expect(verifiable).toBeTruthy();
- });
+ const hash = await service.hash('111')
+ const verifiable = await service.verify(hash, '111')
+ expect(verifiable).toBeTruthy()
+ })
+
+ it('should not verify a hash', async () => {
+ const hash = await service.hash('111')
+ const verifiable = await service.verify(hash, '222')
+ expect(verifiable).toBeFalsy()
+ })
})
-})
\ No newline at end of file
+})
diff --git a/src/lib/server/api/tests/iam.service.test.ts b/src/lib/server/api/tests/iam.service.test.ts
new file mode 100644
index 0000000..40b0bae
--- /dev/null
+++ b/src/lib/server/api/tests/iam.service.test.ts
@@ -0,0 +1,124 @@
+import 'reflect-metadata'
+import { IamService } from '$lib/server/api/services/iam.service'
+import { LuciaService } from '$lib/server/api/services/lucia.service'
+import { UsersService } from '$lib/server/api/services/users.service'
+import { faker } from '@faker-js/faker'
+import { container } from 'tsyringe'
+import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
+
+describe('IamService', () => {
+ let service: IamService
+ const luciaService = vi.mocked(LuciaService.prototype)
+ const userService = vi.mocked(UsersService.prototype)
+
+ beforeAll(() => {
+ service = container
+ .register(LuciaService, { useValue: luciaService })
+ .register(UsersService, { useValue: userService })
+ .resolve(IamService)
+ })
+
+ beforeEach(() => {
+ vi.resetAllMocks()
+ })
+
+ afterAll(() => {
+ vi.resetAllMocks()
+ })
+
+ const timeStampDate = new Date()
+ const dbUser = {
+ id: faker.string.uuid(),
+ cuid: 'ciglo1j8q0000t9j4xq8d6p5e',
+ first_name: faker.person.firstName(),
+ last_name: faker.person.lastName(),
+ email: faker.internet.email(),
+ username: faker.internet.userName(),
+ verified: false,
+ receive_email: false,
+ mfa_enabled: false,
+ theme: 'system',
+ createdAt: timeStampDate,
+ updatedAt: timeStampDate,
+ }
+
+ describe('Update Profile', () => {
+ it('should update user', async () => {
+ userService.findOneById = vi.fn().mockResolvedValueOnce(dbUser)
+ userService.findOneByUsername = vi.fn().mockResolvedValue(undefined)
+ userService.updateUser = vi.fn().mockResolvedValue(dbUser)
+
+ const spy_userService_findOneById = vi.spyOn(userService, 'findOneById')
+ const spy_userService_findOneByUsername = vi.spyOn(userService, 'findOneByUsername')
+ const spy_userService_updateUser = vi.spyOn(userService, 'updateUser')
+ await expect(
+ service.updateProfile(faker.string.uuid(), {
+ username: faker.internet.userName(),
+ }),
+ ).resolves.toEqual(dbUser)
+ expect(spy_userService_findOneById).toBeCalledTimes(1)
+ expect(spy_userService_findOneByUsername).toBeCalledTimes(1)
+ expect(spy_userService_updateUser).toBeCalledTimes(1)
+ })
+
+ it('should error on no user found', async () => {
+ userService.findOneById = vi.fn().mockResolvedValueOnce(undefined)
+
+ const spy_userService_findOneById = vi.spyOn(userService, 'findOneById')
+ const spy_userService_findOneByUsername = vi.spyOn(userService, 'findOneByUsername')
+ const spy_userService_updateUser = vi.spyOn(userService, 'updateUser')
+ await expect(
+ service.updateProfile(faker.string.uuid(), {
+ username: faker.internet.userName(),
+ }),
+ ).resolves.toEqual({
+ error: 'User not found',
+ })
+ expect(spy_userService_findOneById).toBeCalledTimes(1)
+ expect(spy_userService_findOneByUsername).toBeCalledTimes(0)
+ expect(spy_userService_updateUser).toBeCalledTimes(0)
+ })
+
+ it('should error on duplicate username', async () => {
+ userService.findOneById = vi.fn().mockResolvedValueOnce(dbUser)
+ userService.findOneByUsername = vi.fn().mockResolvedValue({
+ id: faker.string.uuid(),
+ })
+ userService.updateUser = vi.fn().mockResolvedValue(dbUser)
+
+ const spy_userService_findOneById = vi.spyOn(userService, 'findOneById')
+ const spy_userService_findOneByUsername = vi.spyOn(userService, 'findOneByUsername')
+ const spy_userService_updateUser = vi.spyOn(userService, 'updateUser')
+ await expect(
+ service.updateProfile(faker.string.uuid(), {
+ username: faker.internet.userName(),
+ }),
+ ).resolves.toEqual({
+ error: 'Username already in use',
+ })
+ expect(spy_userService_findOneById).toBeCalledTimes(1)
+ expect(spy_userService_findOneByUsername).toBeCalledTimes(1)
+ expect(spy_userService_updateUser).toBeCalledTimes(0)
+ })
+ })
+
+ it('should not error if the user id of new username is the current user id', async () => {
+ userService.findOneById = vi.fn().mockResolvedValueOnce(dbUser)
+ userService.findOneByUsername = vi.fn().mockResolvedValue({
+ id: dbUser.id,
+ })
+ userService.updateUser = vi.fn().mockResolvedValue(dbUser)
+
+ const spy_userService_findOneById = vi.spyOn(userService, 'findOneById')
+ const spy_userService_findOneByUsername = vi.spyOn(userService, 'findOneByUsername')
+ const spy_userService_updateUser = vi.spyOn(userService, 'updateUser')
+ await expect(
+ service.updateProfile(dbUser.id, {
+ username: dbUser.id,
+ }),
+ ).resolves.toEqual(dbUser)
+ expect(spy_userService_findOneById).toBeCalledTimes(1)
+ expect(spy_userService_findOneByUsername).toBeCalledTimes(1)
+ expect(spy_userService_updateUser).toBeCalledTimes(1)
+ })
+})
diff --git a/src/lib/server/api/tests/tokens.service.test.ts b/src/lib/server/api/tests/tokens.service.test.ts
index 5c0e34e..cff2574 100644
--- a/src/lib/server/api/tests/tokens.service.test.ts
+++ b/src/lib/server/api/tests/tokens.service.test.ts
@@ -1,49 +1,45 @@
-import 'reflect-metadata';
-import { container } from 'tsyringe';
-import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
-import { TokensService } from '../services/tokens.service';
-import { HashingService } from '../services/hashing.service';
-import { Argon2id } from 'oslo/password';
+import 'reflect-metadata'
+import { Argon2id } from 'oslo/password'
+import { container } from 'tsyringe'
+import { afterAll, beforeAll, describe, expect, expectTypeOf, it, vi } from 'vitest'
+import { HashingService } from '../services/hashing.service'
+import { TokensService } from '../services/tokens.service'
describe('TokensService', () => {
- let service: TokensService;
- const hashingService = vi.mocked(HashingService.prototype);
+ let service: TokensService
+ const hashingService = vi.mocked(HashingService.prototype)
beforeAll(() => {
- service = container
- .register(HashingService, { useValue: hashingService })
- .resolve(TokensService);
- });
+ service = container.register(HashingService, { useValue: hashingService }).resolve(TokensService)
+ })
afterAll(() => {
vi.resetAllMocks()
- });
+ })
describe('Generate Token', () => {
- const hashedPassword = new Argon2id().hash('111');
-
- hashingService.hash = vi.fn().mockResolvedValue(hashedPassword);
- hashingService.verify = vi.fn().mockResolvedValue(true);
-
- const spy_hashingService_hash = vi.spyOn(hashingService, 'hash');
- const spy_hashingService_verify = vi.spyOn(hashingService, 'verify');
-
it('should resolve', async () => {
- await expect(service.createHashedToken('111')).resolves.string
+ const hashedPassword = await new Argon2id().hash('111')
+ hashingService.hash = vi.fn().mockResolvedValue(hashedPassword)
+ const spy_hashingService_hash = vi.spyOn(hashingService, 'hash')
+ const spy_hashingService_verify = vi.spyOn(hashingService, 'verify')
+ await expectTypeOf(service.createHashedToken('111')).resolves.toBeString()
+ expect(spy_hashingService_hash).toBeCalledTimes(1)
+ expect(spy_hashingService_verify).toBeCalledTimes(0)
})
it('should generate a token that is verifiable', async () => {
- const token = await service.createHashedToken('111');
- expect(token).not.toBeUndefined();
- expect(token).not.toBeNull();
- const verifiable = await service.verifyHashedToken(token, '111');
- expect(verifiable).toBeTruthy();
- });
-
- it('should generate a hashed token', async () => {
- expect(spy_hashingService_hash).toHaveBeenCalledTimes(2);
+ hashingService.hash = vi.fn().mockResolvedValue(await new Argon2id().hash('111'))
+ hashingService.verify = vi.fn().mockResolvedValue(true)
+ const spy_hashingService_hash = vi.spyOn(hashingService, 'hash')
+ const spy_hashingService_verify = vi.spyOn(hashingService, 'verify')
+ const token = await service.createHashedToken('111')
+ expect(token).not.toBeNaN()
+ expect(token).not.toBeUndefined()
+ expect(token).not.toBeNull()
+ const verifiable = await service.verifyHashedToken(token, '111')
+ expect(verifiable).toBeTruthy()
+ expect(spy_hashingService_hash).toBeCalledTimes(1)
+ expect(spy_hashingService_verify).toBeCalledTimes(1)
})
- it('should verify a hashed token', async () => {
- expect(spy_hashingService_verify).toHaveBeenCalledTimes(1);
- })
- });
-});
\ No newline at end of file
+ })
+})
diff --git a/src/lib/server/api/tests/user_roles.service.test.ts b/src/lib/server/api/tests/user_roles.service.test.ts
index dfd47d2..89cde2a 100644
--- a/src/lib/server/api/tests/user_roles.service.test.ts
+++ b/src/lib/server/api/tests/user_roles.service.test.ts
@@ -1,62 +1,75 @@
-import 'reflect-metadata';
-import { container } from 'tsyringe';
-import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
-import { UserRolesService } from '../services/user_roles.service';
-import { UserRolesRepository } from '../repositories/user_roles.repository';
-import { RolesService } from '../services/roles.service';
+import 'reflect-metadata'
+import { RoleName } from '$lib/server/api/databases/tables'
+import { faker } from '@faker-js/faker'
+import { container } from 'tsyringe'
+import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
+import { UserRolesRepository } from '../repositories/user_roles.repository'
+import { RolesService } from '../services/roles.service'
+import { UserRolesService } from '../services/user_roles.service'
describe('UserRolesService', () => {
- let service: UserRolesService;
- const userRolesRepository = vi.mocked(UserRolesRepository.prototype);
- const rolesService = vi.mocked(RolesService.prototype);
+ let service: UserRolesService
+ const userRolesRepository = vi.mocked(UserRolesRepository.prototype)
+ const rolesService = vi.mocked(RolesService.prototype)
beforeAll(() => {
service = container
.register(UserRolesRepository, { useValue: userRolesRepository })
.register(RolesService, { useValue: rolesService })
- .resolve(UserRolesService);
- });
+ .resolve(UserRolesService)
+ })
afterAll(() => {
vi.resetAllMocks()
- });
+ })
+
+ const timeStampDate = new Date()
+ const roleUUID = faker.string.uuid()
+ const userUUID = faker.string.uuid()
+ const dbRole = {
+ id: roleUUID,
+ cuid: 'ciglo1j8q0000t9j4xq8d6p5e',
+ name: RoleName.ADMIN,
+ createdAt: timeStampDate,
+ updatedAt: timeStampDate,
+ }
+
+ const dbUserRole = {
+ id: faker.string.uuid(),
+ cuid: 'ciglo1j8q0000t9j4xq8d6p5e',
+ role_id: roleUUID,
+ user_id: userUUID,
+ primary: true,
+ createdAt: timeStampDate,
+ updatedAt: timeStampDate,
+ }
describe('Create User Role', () => {
- rolesService.findOneByNameOrThrow = vi.fn().mockResolvedValue({
- id: '3e0e9f0f-0a0b-4f0b-8f0b-0a0b4f0b8f0b',
- cuid: 'ciglo1j8q0000t9j4xq8d6p5e',
- name: 'user',
- createdAt: new Date(),
- updatedAt: new Date()
- } satisfies Awaited>);
-
- userRolesRepository.create = vi.fn().mockResolvedValue({
- id: '3e0e9f0f-0a0b-4f0b-8f0b-0a0b4f0b8f0b',
- cuid: 'ciglo1j8q0000t9j4xq8d6p5e',
- user_id: '3e0e9f0f-0a0b-4f0b-8f0b-0a0b4f0b8fff',
- role_id: '3e0e9f0f-0a0b-4f0b-8f0b-0a0b4f0b8f0b',
- primary: true,
- createdAt: new Date(),
- updatedAt: new Date()
- } satisfies Awaited>);
-
- const spy_rolesService_findOneByNameOrThrow = vi.spyOn(rolesService, 'findOneByNameOrThrow');
- const spy_userRolesRepository_create = vi.spyOn(userRolesRepository, 'create');
-
it('should resolve', async () => {
- await expect(service.addRoleToUser('3e0e9f0f-0a0b-4f0b-8f0b-0a0b4f0b8fff', 'user', true)).resolves.not.toThrowError();
- })
- it('should call rolesService.findOneByNameOrThrow', async () => {
- expect(spy_rolesService_findOneByNameOrThrow).toBeCalledWith('user');
- expect(spy_rolesService_findOneByNameOrThrow).toBeCalledTimes(1);
- })
- it('should call userRolesRepository.create', async () => {
+ rolesService.findOneByNameOrThrow = vi.fn().mockResolvedValue(dbRole satisfies Awaited>)
+
+ userRolesRepository.create = vi.fn().mockResolvedValue(dbUserRole satisfies Awaited>)
+
+ const spy_rolesService_findOneByNameOrThrow = vi.spyOn(rolesService, 'findOneByNameOrThrow')
+ const spy_userRolesRepository_create = vi.spyOn(userRolesRepository, 'create')
+
+ await expect(service.addRoleToUser(userUUID, RoleName.ADMIN, true)).resolves.not.toThrowError()
+ expect(spy_rolesService_findOneByNameOrThrow).toBeCalledWith(RoleName.ADMIN)
+ expect(spy_rolesService_findOneByNameOrThrow).toBeCalledTimes(1)
expect(spy_userRolesRepository_create).toBeCalledWith({
- user_id: '3e0e9f0f-0a0b-4f0b-8f0b-0a0b4f0b8fff',
- role_id: '3e0e9f0f-0a0b-4f0b-8f0b-0a0b4f0b8f0b',
- primary: true
- });
- expect(spy_userRolesRepository_create).toBeCalledTimes(1);
+ user_id: userUUID,
+ role_id: dbRole.id,
+ primary: true,
+ })
+ expect(spy_userRolesRepository_create).toBeCalledTimes(1)
+ })
+ it('should error on no role found', async () => {
+ rolesService.findOneByNameOrThrow = vi.fn().mockResolvedValue(undefined)
+
+ const spy_rolesService_findOneByNameOrThrow = vi.spyOn(rolesService, 'findOneByNameOrThrow')
+ await expect(service.addRoleToUser(userUUID, RoleName.ADMIN, true)).rejects.toThrowError(`Role with name ${RoleName.ADMIN} not found`)
+ expect(spy_rolesService_findOneByNameOrThrow).toBeCalledWith(RoleName.ADMIN)
+ expect(spy_rolesService_findOneByNameOrThrow).toBeCalledTimes(1)
})
})
-});
\ No newline at end of file
+})
diff --git a/src/lib/server/api/tests/users.service.test.ts b/src/lib/server/api/tests/users.service.test.ts
index fb40e5f..ca916e2 100644
--- a/src/lib/server/api/tests/users.service.test.ts
+++ b/src/lib/server/api/tests/users.service.test.ts
@@ -1,104 +1,130 @@
-import 'reflect-metadata';
-import { container } from 'tsyringe';
-import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
-import { UsersService } from '../services/users.service';
-import { CredentialsRepository } from '../repositories/credentials.repository';
-import { TokensService } from '../services/tokens.service';
-import { UserRolesService } from '../services/user_roles.service';
-import { UsersRepository } from '../repositories/users.repository';
-import { Argon2id } from 'oslo/password';
-import { WishlistsService } from '../services/wishlists.service';
-import { CollectionsService } from '../services/collections.service';
+import 'reflect-metadata'
+import { CredentialsType } from '$lib/server/api/databases/tables'
+import { faker } from '@faker-js/faker'
+import { Argon2id } from 'oslo/password'
+import { container } from 'tsyringe'
+import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
+import { CredentialsRepository } from '../repositories/credentials.repository'
+import { UsersRepository } from '../repositories/users.repository'
+import { CollectionsService } from '../services/collections.service'
+import { TokensService } from '../services/tokens.service'
+import { UserRolesService } from '../services/user_roles.service'
+import { UsersService } from '../services/users.service'
+import { WishlistsService } from '../services/wishlists.service'
describe('UsersService', () => {
- let service: UsersService;
- const credentialsRepository = vi.mocked(CredentialsRepository.prototype);
- const tokensService = vi.mocked(TokensService.prototype);
- const usersRepository = vi.mocked(UsersRepository.prototype);
- const userRolesService = vi.mocked(UserRolesService.prototype);
- const wishlistsService = vi.mocked(WishlistsService.prototype);
- const collectionsService = vi.mocked(CollectionsService.prototype);
+ let service: UsersService
+ const credentialsRepository = vi.mocked(CredentialsRepository.prototype)
+ const tokensService = vi.mocked(TokensService.prototype)
+ const usersRepository = vi.mocked(UsersRepository.prototype)
+ const userRolesService = vi.mocked(UserRolesService.prototype)
+ const wishlistsService = vi.mocked(WishlistsService.prototype)
+ const collectionsService = vi.mocked(CollectionsService.prototype)
- beforeAll(() => {
- service = container
- .register(CredentialsRepository, { useValue: credentialsRepository })
+ beforeAll(() => {
+ service = container
+ .register(CredentialsRepository, { useValue: credentialsRepository })
.register(TokensService, { useValue: tokensService })
.register(UsersRepository, { useValue: usersRepository })
.register(UserRolesService, { useValue: userRolesService })
.register(WishlistsService, { useValue: wishlistsService })
.register(CollectionsService, { useValue: collectionsService })
- .resolve(UsersService);
- });
+ .resolve(UsersService)
+ })
- afterAll(() => {
- vi.resetAllMocks()
- })
+ afterAll(() => {
+ vi.resetAllMocks()
+ })
+
+ const timeStampDate = new Date()
+ const dbUser = {
+ id: faker.string.uuid(),
+ cuid: 'ciglo1j8q0000t9j4xq8d6p5e',
+ first_name: faker.person.firstName(),
+ last_name: faker.person.lastName(),
+ email: faker.internet.email(),
+ username: faker.internet.userName(),
+ verified: false,
+ receive_email: false,
+ mfa_enabled: false,
+ theme: 'system',
+ createdAt: timeStampDate,
+ updatedAt: timeStampDate,
+ }
+ const dbCredentials = {
+ id: faker.string.uuid(),
+ user_id: dbUser.id,
+ type: CredentialsType.PASSWORD,
+ secret_data: 'hashedPassword',
+ createdAt: timeStampDate,
+ updatedAt: timeStampDate,
+ }
describe('Create User', () => {
- const hashedPassword = new Argon2id().hash('111');
- tokensService.createHashedToken = vi.fn().mockResolvedValue(hashedPassword)
+ it('should resolve', async () => {
+ const hashedPassword = new Argon2id().hash('111')
+ tokensService.createHashedToken = vi.fn().mockResolvedValue(hashedPassword)
+ usersRepository.create = vi.fn().mockResolvedValue(dbUser satisfies Awaited>)
+ credentialsRepository.create = vi.fn().mockResolvedValue(dbCredentials satisfies Awaited>)
+ userRolesService.addRoleToUser = vi.fn().mockResolvedValue(undefined)
+ wishlistsService.createEmptyNoName = vi.fn().mockResolvedValue(undefined)
+ collectionsService.createEmptyNoName = vi.fn().mockResolvedValue(undefined)
- usersRepository.create = vi.fn().mockResolvedValue({
- id: '3e0e9f0f-0a0b-4f0b-8f0b-0a0b4f0b8f0b',
- cuid: 'ciglo1j8q0000t9j4xq8d6p5e',
- first_name: 'test',
- last_name: 'test',
- email: 'test@example.com',
- username: 'test',
- verified: false,
- receive_email: false,
- theme: 'system',
- createdAt: new Date(),
- updatedAt: new Date()
- } satisfies Awaited>)
-
- credentialsRepository.create = vi.fn().mockResolvedValue({
- id: '3e0e9f0f-0a0b-4f0b-8f0b-0a0b4f0b8f0b',
- user_id: '3e0e9f0f-0a0b-4f0b-8f0b-0a0b4f0b8f0b',
- type: 'PASSWORD',
- secret_data: hashedPassword
- })
-
- userRolesService.addRoleToUser = vi.fn().mockResolvedValue(undefined)
-
- wishlistsService.createEmptyNoName = vi.fn().mockResolvedValue(undefined)
-
- collectionsService.createEmptyNoName = vi.fn().mockResolvedValue(undefined)
-
- const spy_tokensService_createHashToken = vi.spyOn(tokensService, 'createHashedToken');
- const spy_usersRepository_create = vi.spyOn(usersRepository, 'create');
- const spy_credentialsRepository_create = vi.spyOn(credentialsRepository, 'create');
- const spy_userRolesService_addRoleToUser = vi.spyOn(userRolesService, 'addRoleToUser');
- const spy_wishlistsService_createEmptyNoName = vi.spyOn(wishlistsService, 'createEmptyNoName');
- const spy_collectionsService_createEmptyNoName = vi.spyOn(collectionsService, 'createEmptyNoName');
-
- it('should resolve', async () => {
- await expect(service.create({
- firstName: 'test',
- lastName: 'test',
- email: 'test@example.com',
- username: 'test',
- password: '111',
- confirm_password: '111'
- })).resolves.not.toThrow()
- })
- it('should generate a hashed token', async () => {
- expect(spy_tokensService_createHashToken).toBeCalledTimes(1)
- })
- it('should create a new user', async () => {
- expect(spy_usersRepository_create).toHaveBeenCalledTimes(1)
- })
- it('should create a new credential', async () => {
- expect(spy_credentialsRepository_create).toBeCalledTimes(1)
- })
- it('should add role to user', async () => {
+ const spy_tokensService_createHashToken = vi.spyOn(tokensService, 'createHashedToken')
+ const spy_usersRepository_create = vi.spyOn(usersRepository, 'create')
+ const spy_credentialsRepository_create = vi.spyOn(credentialsRepository, 'create')
+ const spy_userRolesService_addRoleToUser = vi.spyOn(userRolesService, 'addRoleToUser')
+ const spy_wishlistsService_createEmptyNoName = vi.spyOn(wishlistsService, 'createEmptyNoName')
+ const spy_collectionsService_createEmptyNoName = vi.spyOn(collectionsService, 'createEmptyNoName')
+ await expect(
+ service.create({
+ firstName: faker.person.firstName(),
+ lastName: faker.person.lastName(),
+ email: faker.internet.email(),
+ username: faker.internet.userName(),
+ password: faker.string.alphanumeric(10),
+ confirm_password: faker.string.alphanumeric(10),
+ }),
+ ).resolves.toEqual(dbUser)
+ expect(spy_tokensService_createHashToken).toBeCalledTimes(1)
+ expect(spy_usersRepository_create).toBeCalledTimes(1)
+ expect(spy_credentialsRepository_create).toBeCalledTimes(1)
expect(spy_userRolesService_addRoleToUser).toBeCalledTimes(1)
- })
- it('should create a new wishlist', async () => {
expect(spy_wishlistsService_createEmptyNoName).toBeCalledTimes(1)
- })
- it('should create a new collection', async () => {
expect(spy_collectionsService_createEmptyNoName).toBeCalledTimes(1)
})
- })
-});
+ })
+ describe('Update User', () => {
+ it('should resolve Password Exiting Credentials', async () => {
+ const hashedPassword = new Argon2id().hash('111')
+ tokensService.createHashedToken = vi.fn().mockResolvedValue(hashedPassword)
+ credentialsRepository.update = vi.fn().mockResolvedValue(dbCredentials satisfies Awaited>)
+ credentialsRepository.findPasswordCredentialsByUserId = vi
+ .fn()
+ .mockResolvedValue(dbCredentials satisfies Awaited>)
+
+ const spy_tokensService_createHashToken = vi.spyOn(tokensService, 'createHashedToken')
+ const spy_credentialsRepository_findPasswordCredentialsByUserId = vi.spyOn(credentialsRepository, 'findPasswordCredentialsByUserId')
+ const spy_credentialsRepository_update = vi.spyOn(credentialsRepository, 'update')
+ await expect(service.updatePassword(dbUser.id, faker.string.alphanumeric(10))).resolves.toBeUndefined()
+ expect(spy_tokensService_createHashToken).toBeCalledTimes(1)
+ expect(spy_credentialsRepository_findPasswordCredentialsByUserId).toBeCalledTimes(1)
+ expect(spy_credentialsRepository_update).toBeCalledTimes(1)
+ })
+ it('Should Create User Password No Existing Credentials', async () => {
+ const hashedPassword = new Argon2id().hash('111')
+ tokensService.createHashedToken = vi.fn().mockResolvedValue(hashedPassword)
+ credentialsRepository.findPasswordCredentialsByUserId = vi.fn().mockResolvedValue(null)
+ credentialsRepository.create = vi.fn().mockResolvedValue(dbCredentials satisfies Awaited>)
+
+ const spy_tokensService_createHashToken = vi.spyOn(tokensService, 'createHashedToken')
+ const spy_credentialsRepository_create = vi.spyOn(credentialsRepository, 'create')
+ const spy_credentialsRepository_findPasswordCredentialsByUserId = vi.spyOn(credentialsRepository, 'findPasswordCredentialsByUserId')
+
+ await expect(service.updatePassword(dbUser.id, faker.string.alphanumeric(10))).resolves.not.toThrow()
+ expect(spy_tokensService_createHashToken).toBeCalledTimes(1)
+ expect(spy_credentialsRepository_findPasswordCredentialsByUserId).toBeCalledTimes(1)
+ expect(spy_credentialsRepository_create).toHaveBeenCalledTimes(1)
+ })
+ })
+})
diff --git a/src/lib/server/auth.ts b/src/lib/server/auth.ts
new file mode 100644
index 0000000..e06aa3e
--- /dev/null
+++ b/src/lib/server/auth.ts
@@ -0,0 +1,6 @@
+import env from "$lib/server/api/common/env";
+import { GitHub, Google } from "arctic";
+
+export const github = new GitHub(env.GITHUB_CLIENT_ID, env.GITHUB_CLIENT_SECRET);
+
+export const google = new Google(env.GOOGLE_CLIENT_ID, env.GOOGLE_CLIENT_SECRET, `${env.ORIGIN}/auth/callback/google`);
\ No newline at end of file
diff --git a/src/routes/(app)/(protected)/collections/+page.server.ts b/src/routes/(app)/(protected)/collections/+page.server.ts
index 7dc3e2e..881f050 100644
--- a/src/routes/(app)/(protected)/collections/+page.server.ts
+++ b/src/routes/(app)/(protected)/collections/+page.server.ts
@@ -1,13 +1,12 @@
import { notSignedInMessage } from '$lib/flashMessages'
+import { collection_items, collections, gamesTable } from '$lib/server/api/databases/tables'
import { db } from '$lib/server/api/packages/drizzle'
-import { userNotAuthenticated } from '$lib/server/auth-utils'
import { modifyListGameSchema } from '$lib/validations/zod-schemas'
import { type Actions, error, fail } from '@sveltejs/kit'
import { and, eq } from 'drizzle-orm'
import { redirect } from 'sveltekit-flash-message/server'
import { zod } from 'sveltekit-superforms/adapters'
import { superValidate } from 'sveltekit-superforms/server'
-import { collection_items, collections, gamesTable } from '../../../../lib/server/api/databases/tables'
export async function load(event) {
const { locals } = event
@@ -18,23 +17,10 @@ export async function load(event) {
}
try {
- const userCollections = await db.query.collections.findMany({
- columns: {
- cuid: true,
- name: true,
- created_at: true,
- },
- where: eq(collections.user_id, authedUser.id),
- })
- console.log('collections', userCollections)
-
- if (userCollections?.length === 0) {
- console.log('Collection was not found')
- return fail(404, {})
- }
+ const { data, error } = await locals.api.collections.$get().then(locals.parseApiResponse)
return {
- collections: userCollections,
+ collections: data?.collections || [],
}
} catch (e) {
console.error(e)
diff --git a/src/routes/(app)/(protected)/collections/+page.svelte b/src/routes/(app)/(protected)/collections/+page.svelte
index 81f993f..6d600b9 100644
--- a/src/routes/(app)/(protected)/collections/+page.svelte
+++ b/src/routes/(app)/(protected)/collections/+page.svelte
@@ -1,24 +1,34 @@
Your Collections | Bored Game
+
Your Collections
-
{#if collections.length === 0}
You have no collections
{:else}
{#each collections as collection}
-
+
+
+ {collection.name}
+
+
+ Number of items:
+ Created at: {new Date(collection.createdAt).toLocaleString()}
+
+
+
{/each}
{/if}
@@ -30,10 +40,6 @@
width: 100%;
}
- .collections {
- margin: 2rem 0;
- }
-
.collection-list {
display: grid;
grid-template-columns: repeat(3, minmax(200px, 1fr));
diff --git a/src/routes/(app)/(protected)/collections/[cuid]/+page.server.ts b/src/routes/(app)/(protected)/collections/[cuid]/+page.server.ts
index c394fa6..488fbb1 100644
--- a/src/routes/(app)/(protected)/collections/[cuid]/+page.server.ts
+++ b/src/routes/(app)/(protected)/collections/[cuid]/+page.server.ts
@@ -1,13 +1,12 @@
import { notSignedInMessage } from '$lib/flashMessages.js'
+import { collection_items, collections, gamesTable } from '$lib/server/api/databases/tables'
import { db } from '$lib/server/api/packages/drizzle'
-import { userNotAuthenticated } from '$lib/server/auth-utils'
import { modifyListGameSchema } from '$lib/validations/zod-schemas'
-import { type Actions, error, fail } from '@sveltejs/kit'
+import { type Actions, error } from '@sveltejs/kit'
import { and, eq } from 'drizzle-orm'
import { redirect } from 'sveltekit-flash-message/server'
import { zod } from 'sveltekit-superforms/adapters'
import { superValidate } from 'sveltekit-superforms/server'
-import { collection_items, collections, gamesTable } from '../../../../../lib/server/api/databases/tables'
export async function load(event) {
const { params, locals } = event
diff --git a/src/routes/(app)/(protected)/collections/[cuid]/+page.svelte b/src/routes/(app)/(protected)/collections/[cuid]/+page.svelte
index b840239..70a1054 100644
--- a/src/routes/(app)/(protected)/collections/[cuid]/+page.svelte
+++ b/src/routes/(app)/(protected)/collections/[cuid]/+page.svelte
@@ -3,10 +3,10 @@
import Game from '$components/Game.svelte'
import type { UICollection } from '$lib/types'
-export let data
+const { data } = $props()
+const { items = [] } = data
console.log(`Page data: ${JSON.stringify(data)}`)
let collection: UICollection = data?.collection ?? {}
-let items = data?.items || []
console.log('items', items)
// async function handleNextPageEvent(event: CustomEvent) {
@@ -40,7 +40,7 @@ console.log('items', items)
{#if items.length === 0}
-
No gamesTable in your collection
+
No games in your collection
{:else}
{#each items as game (game.game_id)}
diff --git a/src/routes/(app)/(protected)/settings/+layout.svelte b/src/routes/(app)/(protected)/settings/+layout.svelte
index c4620d3..81483b4 100644
--- a/src/routes/(app)/(protected)/settings/+layout.svelte
+++ b/src/routes/(app)/(protected)/settings/+layout.svelte
@@ -1,5 +1,5 @@
-
- {@render children()}
-
\ No newline at end of file
+
+
+
+
Settings
+
+
+ {#each routes as { href, label }}
+
+
+ {label}
+
+
+ {/each}
+
+
+
+ {@render children()}
+
+
+
+
diff --git a/src/routes/(app)/(protected)/settings/profile/+page.server.ts b/src/routes/(app)/(protected)/settings/profile/+page.server.ts
index 77cab00..1841c32 100644
--- a/src/routes/(app)/(protected)/settings/profile/+page.server.ts
+++ b/src/routes/(app)/(protected)/settings/profile/+page.server.ts
@@ -18,14 +18,6 @@ export const load: PageServerLoad = async (event) => {
throw redirect(302, '/login', notSignedInMessage, event)
}
- console.log('authedUser', authedUser)
- // if (userNotAuthenticated(user, session)) {
- // redirect(302, '/login', notSignedInMessage, event);
- // }
- // const dbUser = await db.query.usersTable.findFirst({
- // where: eq(usersTable.id, user!.id!),
- // });
-
const profileForm = await superValidate(zod(updateProfileSchema), {
defaults: {
firstName: authedUser?.firstName ?? '',
diff --git a/src/routes/(app)/(protected)/settings/security/change/password/+page.server.ts b/src/routes/(app)/(protected)/settings/security/change/password/+page.server.ts
index e708aa5..300b45d 100644
--- a/src/routes/(app)/(protected)/settings/security/change/password/+page.server.ts
+++ b/src/routes/(app)/(protected)/settings/security/change/password/+page.server.ts
@@ -48,53 +48,26 @@ export const actions: Actions = {
})
}
- console.log('updating profile')
- if (!event.locals.user) {
- redirect(302, '/login', notSignedInMessage, event)
- }
+ const { error: verifyPasswordError } = await locals.api.me.verify.password
+ .$post({
+ json: { password: form.data.current_password },
+ })
+ .then(locals.parseApiResponse)
- if (!event.locals.session) {
- return fail(401)
- }
+ console.log('verifyPasswordError', verifyPasswordError)
- const dbUser = await db.query.usersTable.findFirst({
- where: eq(usersTable.id, authedUser.id),
- })
-
- // if (!dbUser?.hashed_password) {
- // form.data.password = '';
- // form.data.confirm_password = '';
- // form.data.current_password = '';
- // return setError(
- // form,
- // 'Error occurred. Please try again or contact support if you need further help.',
- // );
- // }
-
- const currentPasswordVerified = await new Argon2id().verify(
- // dbUser.hashed_password,
- form.data.current_password,
- )
-
- if (!currentPasswordVerified) {
+ if (verifyPasswordError) {
+ console.error(verifyPasswordError)
return setError(form, 'current_password', 'Your password is incorrect')
}
if (authedUser?.username) {
- let sessionCookie: Cookie
try {
if (form.data.password !== form.data.confirm_password) {
return setError(form, 'Password and confirm password do not match')
}
- const hashedPassword = await new Argon2id().hash(form.data.password)
- await lucia.invalidateUserSessions(authedUser.id)
- // await db
- // .update(usersTable)
- // .set({ hashed_password: hashedPassword })
- // .where(eq(usersTable.id, user.id));
- await lucia.createSession(user.id, {
- country: event.locals.session?.ipCountry ?? 'unknown',
+ await locals.api.me.update.password.$put({
+ json: { password: form.data.password, confirm_password: form.data.confirm_password },
})
- sessionCookie = lucia.createBlankSessionCookie()
} catch (e) {
console.error(e)
form.data.password = ''
@@ -102,11 +75,6 @@ export const actions: Actions = {
form.data.current_password = ''
return setError(form, 'current_password', 'Your password is incorrect.')
}
- event.cookies.set(sessionCookie.name, sessionCookie.value, {
- path: '.',
- ...sessionCookie.attributes,
- })
-
const message = {
type: 'success',
message: 'Password Updated. Please sign in.',
@@ -114,10 +82,5 @@ export const actions: Actions = {
redirect(302, '/login', message, event)
}
return setError(form, 'Error occurred. Please try again or contact support if you need further help.')
- // TODO: Add toast instead?
- // form.data.password = '';
- // form.data.confirm_password = '';
- // form.data.current_password = '';
- // return message(form, 'Profile updated successfully.');
},
}
diff --git a/src/routes/(app)/(protected)/settings/security/change/password/+page.svelte b/src/routes/(app)/(protected)/settings/security/change/password/+page.svelte
index 302379a..e2f8c0f 100644
--- a/src/routes/(app)/(protected)/settings/security/change/password/+page.svelte
+++ b/src/routes/(app)/(protected)/settings/security/change/password/+page.svelte
@@ -2,7 +2,8 @@
import * as Alert from '$components/ui/alert'
import * as Form from '$components/ui/form'
import { Input } from '$components/ui/input'
-import { AlertTriangle } from 'lucide-svelte'
+import { Toggle } from '$components/ui/toggle'
+import { AlertTriangle, EyeIcon, EyeOff } from 'lucide-svelte'
import { zodClient } from 'sveltekit-superforms/adapters'
import { superForm } from 'sveltekit-superforms/client'
import { changeUserPasswordSchema } from './schemas'
@@ -16,37 +17,85 @@ const form = superForm(data.form, {
multipleSubmits: 'prevent',
})
+let hiddenCurrentPassword = $state(true)
+let hiddenPassword = $state(true)
+let hiddenConfirmPassword = $state(true)
+let currentPasswordInput = $derived(hiddenCurrentPassword ? 'password' : 'text')
+let passwordInput = $derived(hiddenPassword ? 'password' : 'text')
+let confirmPasswordInput = $derived(hiddenConfirmPassword ? 'password' : 'text')
+
+// $inspect(hiddenCurrentPassword, hiddenPassword, hiddenConfirmPassword)
+
const { form: formData, enhance } = form