Merge pull request #102 from teacoder-team/dev

Dev

Author: TeaCoder52

.dockerignore

@@ -1,17 +1,2 @@
-# Версии и метаданные
-.git
-.gitignore
-.dockerignore
-
-# Зависимости при сборке
 dist
 node_modules
-coverage
-
-# Окружающая среда (содержит конфиденциальные данные)
-.env
-
-# Файлы, не требующиеся в сборке
-Dockerfile
-README.md
-.eslintrc.js

package.json

@@ -23,8 +23,8 @@
 		"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
 		"test:e2e": "jest --config ./test/jest-e2e.json",
 		"db:push": "prisma db push",
-		"db:studio": "prisma studio",
-		"release": "release-it"
+		"db:generate": "prisma db generate",
+		"db:studio": "prisma studio"
 	},
 	"dependencies": {
 		"@aws-sdk/client-s3": "^3.1031.0",
@@ -41,8 +41,8 @@
 		"@nestjs/schedule": "^6.0.0",
 		"@nestjs/swagger": "^8.0.7",
 		"@nestjs/throttler": "^6.4.0",
-		"@prisma/adapter-pg": "^7.2.0",
-		"@prisma/client": "^7.2.0",
+		"@prisma/adapter-pg": "^7.7.0",
+		"@prisma/client": "^7.7.0",
 		"@react-email/components": "0.0.33",
 		"@simplewebauthn/server": "^13.1.2",
 		"@teacoder/sentinel": "^1.0.4",
@@ -55,6 +55,7 @@
 		"class-transformer": "^0.5.1",
 		"class-validator": "^0.15.1",
 		"date-fns": "^4.1.0",
+		"dotenv": "^17.4.2",
 		"ejs": "^5.0.2",
 		"form-data": "4.0.5",
 		"geoip-country": "^5.0.202604142355",
@@ -75,7 +76,7 @@
 		"nodemailer": "^8.0.5",
 		"otpauth": "^9.5.0",
 		"preview-email": "^3.1.3",
-		"prisma": "^7.2.0",
+		"prisma": "^7.7.0",
 		"pug": "^3.0.3",
 		"qrcode": "^1.5.4",
 		"react": "19.2.5",

prisma.config.ts

@@ -1,8 +1,14 @@
-import 'dotenv/config'
+import { config } from 'dotenv'
 import { defineConfig, env } from 'prisma/config'
 
+config()
+
 export default defineConfig({
+	schema: 'prisma/schema.prisma',
+	migrations: {
+		path: 'prisma/migrations'
+	},
 	datasource: {
-		url: env('DATABASE_URI')
+		url: env('DATABASE_URL')
 	}
 })

src/api/auth/passkey/passkey.service.ts

@@ -146,14 +146,20 @@ export class PasskeyService {
 			throw new BadRequestException('Verification failed')
 
 		const {
-			credential: { id, publicKey }
+			credential: { id: credentialID, publicKey: credentialPublicKey }
 		} = verification.registrationInfo
 
+		const credentialIdBuf = this.toBuffer(credentialID as any)
+		const publicKeyBuf = this.toBuffer(credentialPublicKey as any)
+
+		const credentialIdB64 = base64url.encode(credentialIdBuf)
+		const publicKeyB64 = base64url.encode(publicKeyBuf)
+
 		await this.prismaService.passkey.create({
 			data: {
 				deviceName,
-				credentialId: id,
-				publicKey: publicKey.toString(),
+				credentialId: credentialIdB64,
+				publicKey: publicKeyB64,
 				userAgent,
 				ip,
 				lastUsedAt: new Date(),
@@ -244,7 +250,9 @@ export class PasskeyService {
 			expectedRPID: this.WEBAUTHN_RP_ID,
 			credential: {
 				id: passkey.credentialId,
-				publicKey: base64url.toBuffer(passkey.publicKey),
+				publicKey: this.toUint8Array(
+					base64url.toBuffer(passkey.publicKey)
+				),
 				counter: passkey.counter ?? 0
 			}
 		})
@@ -325,4 +333,20 @@ export class PasskeyService {
 
 		return recoveryCodes
 	}
+
+	private toBuffer(data: ArrayBuffer | Uint8Array | string): Buffer {
+		if (typeof data === 'string') return Buffer.from(data)
+
+		if (data instanceof ArrayBuffer)
+			return Buffer.from(new Uint8Array(data))
+		if (data instanceof Uint8Array) return Buffer.from(data)
+
+		return Buffer.from(data as any)
+	}
+
+	private toUint8Array(data: string | Buffer): Uint8Array<ArrayBuffer> {
+		const buf = typeof data === 'string' ? base64url.toBuffer(data) : data
+
+		return new Uint8Array(new ArrayBuffer(buf.length)).map((_, i) => buf[i])
+	}
 }

src/config/env/app.env.ts

@@ -1,7 +1,8 @@
 import { registerAs } from '@nestjs/config'
 
+import { validateEnv } from '@/shared/utils/env'
+
 import type { AppConfig } from '../definitions'
-import { validateEnv } from '../utils/validate-env'
 import { AppValidator } from '../validators'
 
 export const appEnv = registerAs<AppConfig>('app', () => {

src/config/env/fingerprint.env.ts

@@ -1,7 +1,8 @@
 import { registerAs } from '@nestjs/config'
 
+import { validateEnv } from '@/shared/utils/env'
+
 import type { FingerprintConfig } from '../definitions'
-import { validateEnv } from '../utils/validate-env'
 import { FingerprintValidator } from '../validators'
 
 export const fingerprintEnv = registerAs<FingerprintConfig>(

src/config/env/heleket.env.ts

@@ -1,7 +1,8 @@
 import { registerAs } from '@nestjs/config'
 
+import { validateEnv } from '@/shared/utils/env'
+
 import type { HeleketConfig } from '../definitions'
-import { validateEnv } from '../utils/validate-env'
 import { HeleketValidator } from '../validators'
 
 export const heleketEnv = registerAs<HeleketConfig>('heleket', () => {

src/config/env/hosts.env.ts

@@ -1,7 +1,8 @@
 import { registerAs } from '@nestjs/config'
 
+import { validateEnv } from '@/shared/utils/env'
+
 import type { HostsConfig } from '../definitions'
-import { validateEnv } from '../utils/validate-env'
 import { HostsValidator } from '../validators'
 
 export const hostsEnv = registerAs<HostsConfig>('hosts', () => {

src/config/env/kinescope.env.ts

@@ -1,7 +1,8 @@
 import { registerAs } from '@nestjs/config'
 
+import { validateEnv } from '@/shared/utils/env'
+
 import type { KinescopeConfig } from '../definitions'
-import { validateEnv } from '../utils/validate-env'
 import { KinescopeValidator } from '../validators'
 
 export const kinescopeEnv = registerAs<KinescopeConfig>('kinescope', () => {

src/config/env/mailer.env.ts

@@ -1,7 +1,8 @@
 import { registerAs } from '@nestjs/config'
 
+import { validateEnv } from '@/shared/utils/env'
+
 import type { MailerConfig } from '../definitions'
-import { validateEnv } from '../utils/validate-env'
 import { MailerValidator } from '../validators'
 
 export const mailerEnv = registerAs<MailerConfig>('mailer', () => {