Compare commits
3 Commits
feat/auth
...
6530e81402
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6530e81402 | ||
|
|
b7573acbed | ||
|
|
bf544b3e5b |
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
[submodule "samreshu_docs"]
|
||||||
|
path = samreshu_docs
|
||||||
|
url = https://git.vakanaut.ru/admin/samreshu_docs.git
|
||||||
1
samreshu_docs
Submodule
1
samreshu_docs
Submodule
Submodule samreshu_docs added at 99cd8ae727
@@ -5,6 +5,7 @@ import redisPlugin from './plugins/redis.js';
|
|||||||
import securityPlugin from './plugins/security.js';
|
import securityPlugin from './plugins/security.js';
|
||||||
import rateLimitPlugin from './plugins/rateLimit.js';
|
import rateLimitPlugin from './plugins/rateLimit.js';
|
||||||
import authPlugin from './plugins/auth.js';
|
import authPlugin from './plugins/auth.js';
|
||||||
|
import subscriptionPlugin from './plugins/subscription.js';
|
||||||
import { authRoutes } from './routes/auth.js';
|
import { authRoutes } from './routes/auth.js';
|
||||||
import { env } from './config/env.js';
|
import { env } from './config/env.js';
|
||||||
import { randomUUID } from 'node:crypto';
|
import { randomUUID } from 'node:crypto';
|
||||||
@@ -72,6 +73,7 @@ export async function buildApp(): Promise<FastifyInstance> {
|
|||||||
await app.register(securityPlugin);
|
await app.register(securityPlugin);
|
||||||
await app.register(rateLimitPlugin);
|
await app.register(rateLimitPlugin);
|
||||||
await app.register(authPlugin);
|
await app.register(authPlugin);
|
||||||
|
await app.register(subscriptionPlugin);
|
||||||
await app.register(authRoutes, { prefix: '/auth' });
|
await app.register(authRoutes, { prefix: '/auth' });
|
||||||
|
|
||||||
app.get('/health', async () => ({ status: 'ok', timestamp: new Date().toISOString() }));
|
app.get('/health', async () => ({ status: 'ok', timestamp: new Date().toISOString() }));
|
||||||
|
|||||||
71
src/plugins/subscription.ts
Normal file
71
src/plugins/subscription.ts
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify';
|
||||||
|
import fp from 'fastify-plugin';
|
||||||
|
import { eq } from 'drizzle-orm';
|
||||||
|
import { subscriptions } from '../db/schema/subscriptions.js';
|
||||||
|
import { forbidden } from '../utils/errors.js';
|
||||||
|
|
||||||
|
export type SubscriptionInfo = {
|
||||||
|
plan: 'free' | 'pro';
|
||||||
|
status: 'active' | 'trialing' | 'cancelled' | 'expired';
|
||||||
|
isPro: boolean;
|
||||||
|
expiresAt: Date | null;
|
||||||
|
};
|
||||||
|
|
||||||
|
declare module 'fastify' {
|
||||||
|
interface FastifyRequest {
|
||||||
|
subscription?: SubscriptionInfo | null;
|
||||||
|
}
|
||||||
|
interface FastifyInstance {
|
||||||
|
withSubscription: (req: FastifyRequest, reply: FastifyReply) => Promise<void>;
|
||||||
|
requirePro: (req: FastifyRequest, reply: FastifyReply) => Promise<void>;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadSubscription(db: FastifyInstance['db'], userId: string): Promise<SubscriptionInfo | null> {
|
||||||
|
const [sub] = await db
|
||||||
|
.select()
|
||||||
|
.from(subscriptions)
|
||||||
|
.where(eq(subscriptions.userId, userId))
|
||||||
|
.limit(1);
|
||||||
|
|
||||||
|
if (!sub) return null;
|
||||||
|
|
||||||
|
const now = new Date();
|
||||||
|
const isExpired = sub.expiresAt && sub.expiresAt < now;
|
||||||
|
const isPro =
|
||||||
|
sub.plan === 'pro' &&
|
||||||
|
(sub.status === 'active' || sub.status === 'trialing') &&
|
||||||
|
!isExpired;
|
||||||
|
|
||||||
|
return {
|
||||||
|
plan: sub.plan as 'free' | 'pro',
|
||||||
|
status: sub.status as SubscriptionInfo['status'],
|
||||||
|
isPro,
|
||||||
|
expiresAt: sub.expiresAt,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function requirePro(req: FastifyRequest, _reply: FastifyReply): Promise<void> {
|
||||||
|
const sub = req.subscription;
|
||||||
|
|
||||||
|
if (!sub?.isPro) {
|
||||||
|
throw forbidden('Pro subscription required');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const subscriptionPlugin = async (app: FastifyInstance) => {
|
||||||
|
app.decorateRequest('subscription', undefined);
|
||||||
|
|
||||||
|
app.decorate('withSubscription', async (req: FastifyRequest, _reply: FastifyReply) => {
|
||||||
|
if (!req.user?.id) return;
|
||||||
|
const sub = await loadSubscription(app.db, req.user.id);
|
||||||
|
req.subscription = sub;
|
||||||
|
});
|
||||||
|
|
||||||
|
app.decorate('requirePro', requirePro);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default fp(subscriptionPlugin, {
|
||||||
|
name: 'subscription',
|
||||||
|
dependencies: ['database', 'auth'],
|
||||||
|
});
|
||||||
73
src/routes/profile.ts
Normal file
73
src/routes/profile.ts
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
import type { FastifyInstance } from 'fastify';
|
||||||
|
import { UserService } from '../services/user/user.service.js';
|
||||||
|
|
||||||
|
const patchProfileSchema = {
|
||||||
|
body: {
|
||||||
|
type: 'object',
|
||||||
|
properties: {
|
||||||
|
nickname: { type: 'string', minLength: 2, maxLength: 30 },
|
||||||
|
avatarUrl: { type: ['string', 'null'], maxLength: 500 },
|
||||||
|
country: { type: ['string', 'null'], maxLength: 100 },
|
||||||
|
city: { type: ['string', 'null'], maxLength: 100 },
|
||||||
|
selfLevel: { type: ['string', 'null'], enum: ['jun', 'mid', 'sen'] },
|
||||||
|
isPublic: { type: 'boolean' },
|
||||||
|
},
|
||||||
|
additionalProperties: false,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const usernameParamsSchema = {
|
||||||
|
params: {
|
||||||
|
type: 'object',
|
||||||
|
required: ['username'],
|
||||||
|
properties: {
|
||||||
|
username: { type: 'string', minLength: 2, maxLength: 30 },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
export async function profileRoutes(app: FastifyInstance) {
|
||||||
|
const userService = new UserService(app.db);
|
||||||
|
const { rateLimitOptions } = app;
|
||||||
|
|
||||||
|
app.get(
|
||||||
|
'/',
|
||||||
|
{
|
||||||
|
config: { rateLimit: rateLimitOptions.apiAuthed },
|
||||||
|
preHandler: [app.authenticate, app.withSubscription],
|
||||||
|
},
|
||||||
|
async (req, reply) => {
|
||||||
|
const userId = req.user!.id;
|
||||||
|
const profile = await userService.getPrivateProfile(userId);
|
||||||
|
return reply.send(profile);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
app.patch(
|
||||||
|
'/',
|
||||||
|
{
|
||||||
|
schema: patchProfileSchema,
|
||||||
|
config: { rateLimit: rateLimitOptions.apiAuthed },
|
||||||
|
preHandler: [app.authenticate],
|
||||||
|
},
|
||||||
|
async (req, reply) => {
|
||||||
|
const userId = req.user!.id;
|
||||||
|
const body = req.body as Parameters<UserService['updateProfile']>[1];
|
||||||
|
const profile = await userService.updateProfile(userId, body);
|
||||||
|
return reply.send(profile);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
app.get(
|
||||||
|
'/:username',
|
||||||
|
{
|
||||||
|
schema: usernameParamsSchema,
|
||||||
|
config: { rateLimit: rateLimitOptions.apiGuest },
|
||||||
|
},
|
||||||
|
async (req, reply) => {
|
||||||
|
const { username } = req.params as { username: string };
|
||||||
|
const profile = await userService.getPublicProfile(username);
|
||||||
|
return reply.send(profile);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
131
src/services/user/user.service.ts
Normal file
131
src/services/user/user.service.ts
Normal file
@@ -0,0 +1,131 @@
|
|||||||
|
import { eq } from 'drizzle-orm';
|
||||||
|
import type { NodePgDatabase } from 'drizzle-orm/node-postgres';
|
||||||
|
import type * as schema from '../../db/schema/index.js';
|
||||||
|
import { users } from '../../db/schema/index.js';
|
||||||
|
import { notFound, conflict, ERROR_CODES } from '../../utils/errors.js';
|
||||||
|
import type { User } from '../../db/schema/users.js';
|
||||||
|
import type { SelfLevel } from '../../db/schema/index.js';
|
||||||
|
|
||||||
|
type Db = NodePgDatabase<typeof schema>;
|
||||||
|
|
||||||
|
export type ProfileUpdateInput = {
|
||||||
|
nickname?: string;
|
||||||
|
avatarUrl?: string | null;
|
||||||
|
country?: string | null;
|
||||||
|
city?: string | null;
|
||||||
|
selfLevel?: SelfLevel | null;
|
||||||
|
isPublic?: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type PublicProfile = {
|
||||||
|
id: string;
|
||||||
|
nickname: string;
|
||||||
|
avatarUrl: string | null;
|
||||||
|
country: string | null;
|
||||||
|
city: string | null;
|
||||||
|
selfLevel: string | null;
|
||||||
|
isPublic: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type PrivateProfile = PublicProfile & {
|
||||||
|
email: string;
|
||||||
|
emailVerifiedAt: string | null;
|
||||||
|
createdAt: string;
|
||||||
|
updatedAt: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
function toPublicProfile(user: User): PublicProfile {
|
||||||
|
return {
|
||||||
|
id: user.id,
|
||||||
|
nickname: user.nickname,
|
||||||
|
avatarUrl: user.avatarUrl,
|
||||||
|
country: user.country,
|
||||||
|
city: user.city,
|
||||||
|
selfLevel: user.selfLevel,
|
||||||
|
isPublic: user.isPublic,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function toPrivateProfile(user: User): PrivateProfile {
|
||||||
|
return {
|
||||||
|
...toPublicProfile(user),
|
||||||
|
email: user.email,
|
||||||
|
emailVerifiedAt: user.emailVerifiedAt?.toISOString() ?? null,
|
||||||
|
createdAt: user.createdAt.toISOString(),
|
||||||
|
updatedAt: user.updatedAt.toISOString(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export class UserService {
|
||||||
|
constructor(private readonly db: Db) {}
|
||||||
|
|
||||||
|
async getById(userId: string): Promise<User | null> {
|
||||||
|
const [user] = await this.db.select().from(users).where(eq(users.id, userId)).limit(1);
|
||||||
|
return user ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getByNickname(nickname: string): Promise<User | null> {
|
||||||
|
const [user] = await this.db
|
||||||
|
.select()
|
||||||
|
.from(users)
|
||||||
|
.where(eq(users.nickname, nickname.trim()))
|
||||||
|
.limit(1);
|
||||||
|
return user ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
async getPrivateProfile(userId: string): Promise<PrivateProfile> {
|
||||||
|
const user = await this.getById(userId);
|
||||||
|
if (!user) {
|
||||||
|
throw notFound('User not found');
|
||||||
|
}
|
||||||
|
return toPrivateProfile(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
async getPublicProfile(username: string): Promise<PublicProfile> {
|
||||||
|
const user = await this.getByNickname(username);
|
||||||
|
if (!user) {
|
||||||
|
throw notFound('User not found');
|
||||||
|
}
|
||||||
|
if (!user.isPublic) {
|
||||||
|
throw notFound('User not found');
|
||||||
|
}
|
||||||
|
return toPublicProfile(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateProfile(userId: string, input: ProfileUpdateInput): Promise<PrivateProfile> {
|
||||||
|
const updateData: Partial<typeof users.$inferInsert> = {
|
||||||
|
updatedAt: new Date(),
|
||||||
|
};
|
||||||
|
|
||||||
|
if (input.nickname !== undefined) {
|
||||||
|
const trimmed = input.nickname.trim();
|
||||||
|
const [existing] = await this.db
|
||||||
|
.select({ id: users.id })
|
||||||
|
.from(users)
|
||||||
|
.where(eq(users.nickname, trimmed))
|
||||||
|
.limit(1);
|
||||||
|
|
||||||
|
if (existing && existing.id !== userId) {
|
||||||
|
throw conflict(ERROR_CODES.NICKNAME_TAKEN, 'Nickname already taken');
|
||||||
|
}
|
||||||
|
updateData.nickname = trimmed;
|
||||||
|
}
|
||||||
|
if (input.avatarUrl !== undefined) updateData.avatarUrl = input.avatarUrl;
|
||||||
|
if (input.country !== undefined) updateData.country = input.country;
|
||||||
|
if (input.city !== undefined) updateData.city = input.city;
|
||||||
|
if (input.selfLevel !== undefined) updateData.selfLevel = input.selfLevel;
|
||||||
|
if (input.isPublic !== undefined) updateData.isPublic = input.isPublic;
|
||||||
|
|
||||||
|
const [updated] = await this.db
|
||||||
|
.update(users)
|
||||||
|
.set(updateData)
|
||||||
|
.where(eq(users.id, userId))
|
||||||
|
.returning();
|
||||||
|
|
||||||
|
if (!updated) {
|
||||||
|
throw notFound('User not found');
|
||||||
|
}
|
||||||
|
|
||||||
|
return toPrivateProfile(updated);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user