Skip to content
Merged

Dev #19

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 32 additions & 13 deletions backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "commitflow-api",
"version": "1.1.7",
"version": "1.1.8",
"description": "Backend CommitFlow",
"author": "asepindrak",
"private": false,
Expand Down Expand Up @@ -34,10 +34,12 @@
"@nestjs/swagger": "^11.2.1",
"@nestjs/websockets": "^11.1.6",
"@prisma/client": "^6.18.0",
"@types/cookie-parser": "^1.4.10",
"axios": "^1.12.2",
"bcrypt": "^6.0.0",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.2",
"cookie-parser": "^1.4.7",
"dayjs": "^1.11.19",
"dotenv": "^17.2.3",
"exceljs": "^4.4.0",
Expand Down
46 changes: 26 additions & 20 deletions backend/src/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,36 +1,33 @@
// src/app.module.ts
import { Module } from '@nestjs/common';
import { ConfigModule } from '@nestjs/config';
import { AskModule } from './ai-agent/ask.module';
import { AppController } from './app.controller';
import { AppService } from './app.service';
import { UsersModule } from './users/users.module';
import { Module } from "@nestjs/common";
import { ConfigModule } from "@nestjs/config";
import { AskModule } from "./ai-agent/ask.module";
import { AppController } from "./app.controller";
import { AppService } from "./app.service";
import { UsersModule } from "./users/users.module";
import { AskController } from "./ai-agent/ask.controller";
import { AskService } from "./ai-agent/ask.service";
import { AskGateway } from "./ai-agent/ask.gateway";
import { ServeStaticModule } from '@nestjs/serve-static';
import { join } from 'path';
import { ServeStaticModule } from "@nestjs/serve-static";
import { join } from "path";
import { AuthModule } from "./auth/auth.module";
import { JwtGuard } from "./common/guards/jwt.guard";
import { SharedModule } from "./common/shared.module";
import { UploadModule } from './upload/upload.module';
import { ProjectManagementModule } from './project-management/project-management.module';
import { EmailModule } from './email/email.module';
import { UploadModule } from "./upload/upload.module";
import { ProjectManagementModule } from "./project-management/project-management.module";
import { EmailModule } from "./email/email.module";
import { APP_GUARD } from "@nestjs/core";

@Module({
imports: [
// config global (baca .env)
ConfigModule.forRoot({
isGlobal: true,
envFilePath: '.env',
envFilePath: ".env",
}),

// Serve folder public sebagai static files
ServeStaticModule.forRoot({
rootPath: join(__dirname, '..', 'public'),
serveRoot: '/',
rootPath: join(__dirname, "..", "public"),
serveRoot: "/",
}),

AuthModule,
UsersModule,
AskModule,
Expand All @@ -40,6 +37,15 @@ import { EmailModule } from './email/email.module';
EmailModule,
],
controllers: [AppController, AskController],
providers: [AppService, AskService, AskGateway, JwtGuard],
providers: [
AppService,
AskService,
AskGateway,
// Register JwtGuard as a global guard via APP_GUARD so Reflector and DI work properly
{
provide: APP_GUARD,
useClass: JwtGuard,
},
],
})
export class AppModule { }
export class AppModule {}
2 changes: 1 addition & 1 deletion backend/src/app.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ import { Injectable } from "@nestjs/common";
@Injectable()
export class AppService {
getHello(): string {
return `CommitFlow API (1.1.7) is running!`;
return `CommitFlow API (1.1.8) is running!`;
}
}
18 changes: 14 additions & 4 deletions backend/src/auth/auth.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { AuthService } from "./auth.service";
import { RegisterDto } from "./dto/register.dto";
import { LoginDto } from "./dto/login.dto";
import type { Request, Response } from "express";
import { Public } from "./public.decorator";

const REFRESH_COOKIE_NAME = "refresh_token";
const COOKIE_MAX_AGE = 7 * 24 * 60 * 60 * 1000; // 7 days in ms
Expand All @@ -37,6 +38,7 @@ const COOKIE_OPTIONS = {
export class AuthController {
constructor(private authService: AuthService) {}

@Public()
@Post("anon")
async anonLogin(
@Body("userId") userId?: string,
Expand All @@ -56,6 +58,7 @@ export class AuthController {
return { token: result.token, userId: result.user.id };
}

@Public()
@Post("register")
async register(
@Body() dto: RegisterDto,
Expand All @@ -77,11 +80,11 @@ export class AuthController {
userId: result.user.id,
user: result.user,
workspaceId: result.workspace.id,
teamMemberId: result.teamMember.id,
clientTempId: result.clientTempId ?? null,
};
}

@Public()
@Post("login")
async login(
@Body() dto: LoginDto,
Expand All @@ -104,19 +107,21 @@ export class AuthController {
token: result.token,
userId: result?.user?.id ?? "",
user: result.user,
teamMemberId: result?.teamMemberId,
};
}

// refresh endpoint: reads refresh_token cookie, verifies, rotates
@Public()
@HttpCode(200)
@Post("refresh")
async refresh(
@Req() req: Request,
@Res({ passthrough: true }) res: Response
) {
const token = req.cookies?.[REFRESH_COOKIE_NAME];
if (!token) throw new UnauthorizedException("No refresh token");
if (!token) {
throw new UnauthorizedException("No refresh token");
}

// attempt to verify and refresh via AuthService
let payload: any;
Expand All @@ -137,9 +142,14 @@ export class AuthController {
});

// return access token
return { token: newTokens.accessToken };
return {
token: newTokens.token,
userId: newTokens?.user?.id ?? "",
user: newTokens.user,
};
}

@Public()
@Post("logout")
async logout(@Req() req: Request, @Res({ passthrough: true }) res: Response) {
const token = req.cookies?.[REFRESH_COOKIE_NAME];
Expand Down
Loading