bd25cba89c
* refactor: combine exchange and refresh into token endpoint * refactor: controller error handling * refactor: use snake_case * refactor: use snake_case * refactor: use snake case * refactor: token endpoint accepts application/x-www-form-urlencoded * refactor: token endpoint accepts application/x-www-form-urlencoded * refactor: flat token response data * refactor: error structure * refactor: client_id in the body * fix: address Cubic AI review feedback on OAuth2 endpoints - Fix getClient endpoint to use proper REST API error format instead of OAuth token error format (confidence 9/10) - Add missing space after comma in error format string in token.input.pipe.ts (confidence 9/10) - Support both camelCase and snake_case inputs in authorize endpoint for backward compatibility (confidence 10/10) - Restore legacy /exchange and /refresh endpoints alongside new /token endpoint for backward compatibility (confidence 10/10) - Add OAuth2TokensResponseDto for legacy endpoint wrapped responses - Add OAuth2LegacyExchangeInput and OAuth2LegacyRefreshInput for legacy endpoints Co-Authored-By: unknown <> * fix: address additional Cubic AI feedback on OAuth2 endpoints - Log errors when status code >= 500 in handleClientError (confidence 9/10) - Add Cache-Control: no-store and Pragma: no-cache headers to legacy /exchange and /refresh endpoints (confidence 9/10) Co-Authored-By: unknown <> * docs * Revert "fix: address additional Cubic AI feedback on OAuth2 endpoints" This reverts commit 39cc4aa3ebb9e59a171541d7010398425995ed89. * Revert "fix: address Cubic AI review feedback on OAuth2 endpoints" This reverts commit 97bf593186db04c0859f9ca30950c9e3e524019d. * docs * fix: address Cubic AI review feedback on OAuth2 endpoints - Fix getClient to use handleClientError instead of handleTokenError (confidence 10) - Restore legacy /exchange and /refresh endpoints for backward compatibility (confidence 9) - Fix RFC 6749 error format: use human-readable messages in error_description (confidence 9) - Fix errorDescription in OAuthService to use OAUTH_ERROR_REASONS mapping (confidence 9) Co-Authored-By: unknown <> * fix: address additional Cubic AI feedback on OAuth2 endpoints - Fix security issue: Replace 'CALENDSO_ENCRYPTION_KEY is not set' with generic 'Internal server configuration error' message (confidence 10/10) - Fix backward compatibility: Create OAuth2LegacyTokensDto with camelCase properties for legacy /exchange and /refresh endpoints (confidence 9/10) - Skipped: RFC 6749 error field issue (confidence 8/10, below threshold) Co-Authored-By: unknown <> * e2e * Revert "fix: address additional Cubic AI feedback on OAuth2 endpoints" This reverts commit a080e93f07aaf5a7dcf81fe605012cb7ebcdc192. * Revert "fix: address Cubic AI review feedback on OAuth2 endpoints" This reverts commit 04986a16c981521ca97069152457bf521a9ee45f. * fix: re-apply Cubic AI review feedback on OAuth2 endpoints - Restore OAuth2LegacyExchangeInput and OAuth2LegacyRefreshInput classes - Restore legacy /exchange and /refresh endpoints in OAuth2Controller - Restore OAuth2LegacyTokensDto and OAuth2TokensResponseDto classes - Restore OAUTH_ERROR_DESCRIPTIONS mapping in oauth2-error.service.ts - Restore OAUTH_ERROR_REASONS lookup in OAuthService.ts mapErrorToOAuthError - Fix encryption_key_missing error to not expose internal env var name Addresses Cubic AI feedback with confidence >= 9/10: - Comment 32 (9/10): Legacy endpoints and input classes - Comment 34 (9/10): Error description mapping in OAuthService - Comment 35 (10/10): OAUTH_ERROR_DESCRIPTIONS in error service Skipped (confidence < 9/10): - Comment 33 (8/10): getClient handleTokenError vs handleClientError Co-Authored-By: unknown <> * Revert "fix: re-apply Cubic AI review feedback on OAuth2 endpoints" This reverts commit 416bef9c931d9a7ed78c65a70a3425550d61b151. * delete unused file * fix: e2e tests * address cubic review * fix: address Cubic AI review feedback on OAuth2 exception filter - Fix header case sensitivity: use lowercase 'x-request-id' instead of 'X-Request-Id' since Express lowercases all request headers - Redact request body in error logs to prevent exposing sensitive OAuth2 credentials like client_secret, password, and refresh_token Co-Authored-By: unknown <> * docs: api v2 oauth controller docs * chore: remove authorize endpoint * refactor: remove scope from docs --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
127 lines
4.4 KiB
TypeScript
127 lines
4.4 KiB
TypeScript
import { ThrottlerStorageRedisService } from "@nest-lab/throttler-storage-redis";
|
|
import { BullModule } from "@nestjs/bull";
|
|
import { MiddlewareConsumer, Module, NestModule, RequestMethod } from "@nestjs/common";
|
|
import { ConfigModule } from "@nestjs/config";
|
|
import { APP_FILTER, APP_GUARD, APP_INTERCEPTOR } from "@nestjs/core";
|
|
import { seconds, ThrottlerModule } from "@nestjs/throttler";
|
|
import { SentryGlobalFilter, SentryModule } from "@sentry/nestjs/setup";
|
|
import { AppController } from "./app.controller";
|
|
import appConfig from "@/config/app";
|
|
import { CustomThrottlerGuard } from "@/lib/throttler-guard";
|
|
import { AppLoggerMiddleware } from "@/middleware/app.logger.middleware";
|
|
import { RedirectsMiddleware } from "@/middleware/app.redirects.middleware";
|
|
import { RewriterMiddleware } from "@/middleware/app.rewrites.middleware";
|
|
import { JsonBodyMiddleware } from "@/middleware/body/json.body.middleware";
|
|
import { RawBodyMiddleware } from "@/middleware/body/raw.body.middleware";
|
|
import { UrlencodedBodyMiddleware } from "@/middleware/body/urlencoded.body.middleware";
|
|
import { ResponseInterceptor } from "@/middleware/request-ids/request-id.interceptor";
|
|
import { RequestIdMiddleware } from "@/middleware/request-ids/request-id.middleware";
|
|
import { AuthModule } from "@/modules/auth/auth.module";
|
|
import { EndpointsModule } from "@/modules/endpoints.module";
|
|
import { JwtModule } from "@/modules/jwt/jwt.module";
|
|
import { PrismaModule } from "@/modules/prisma/prisma.module";
|
|
import { RedisModule } from "@/modules/redis/redis.module";
|
|
import { RedisService } from "@/modules/redis/redis.service";
|
|
import { VercelWebhookController } from "@/vercel-webhook.controller";
|
|
|
|
@Module({
|
|
imports: [
|
|
SentryModule.forRoot(),
|
|
ConfigModule.forRoot({
|
|
ignoreEnvFile: true,
|
|
isGlobal: true,
|
|
load: [appConfig],
|
|
}),
|
|
|
|
RedisModule,
|
|
BullModule.forRoot({
|
|
redis: `${process.env.REDIS_URL}${process.env.NODE_ENV === "production" ? "?tls=true" : ""}`,
|
|
}),
|
|
ThrottlerModule.forRootAsync({
|
|
imports: [RedisModule],
|
|
inject: [RedisService],
|
|
useFactory: (redisService: RedisService) => ({
|
|
// note(Lauris): IMPORTANT: rate limiting is enforced by CustomThrottlerGuard, but we need to have at least one
|
|
// entry in the throttlers array otherwise CustomThrottlerGuard is not invoked at all. If we specify only ThrottlerModule
|
|
// without .forRootAsync then throttler options are not passed to CustomThrottlerGuard containing redis connection etc.
|
|
// So we need to specify at least one dummy throttler here and CustomThrottlerGuard is actually handling the default and custom rate limits.
|
|
throttlers: [
|
|
{
|
|
name: "dummy",
|
|
ttl: seconds(60),
|
|
limit: 120,
|
|
},
|
|
],
|
|
storage: new ThrottlerStorageRedisService(redisService.redis),
|
|
}),
|
|
}),
|
|
PrismaModule,
|
|
EndpointsModule,
|
|
AuthModule,
|
|
JwtModule,
|
|
],
|
|
controllers: [AppController, VercelWebhookController],
|
|
providers: [
|
|
{
|
|
provide: APP_FILTER,
|
|
useClass: SentryGlobalFilter,
|
|
},
|
|
{
|
|
provide: ThrottlerStorageRedisService,
|
|
useFactory: (redisService: RedisService) => {
|
|
return new ThrottlerStorageRedisService(redisService.redis);
|
|
},
|
|
inject: [RedisService],
|
|
},
|
|
{
|
|
provide: APP_INTERCEPTOR,
|
|
useClass: ResponseInterceptor,
|
|
},
|
|
{
|
|
provide: APP_GUARD,
|
|
useClass: CustomThrottlerGuard,
|
|
},
|
|
],
|
|
})
|
|
export class AppModule implements NestModule {
|
|
configure(consumer: MiddlewareConsumer): void {
|
|
consumer
|
|
.apply(RawBodyMiddleware)
|
|
.forRoutes(
|
|
{
|
|
path: "/api/v2/billing/webhook",
|
|
method: RequestMethod.POST,
|
|
},
|
|
{
|
|
path: "/v2/billing/webhook",
|
|
method: RequestMethod.POST,
|
|
},
|
|
{
|
|
path: "/v2/webhooks/vercel/deployment-promoted",
|
|
method: RequestMethod.POST,
|
|
}
|
|
)
|
|
.apply(UrlencodedBodyMiddleware)
|
|
.forRoutes(
|
|
{
|
|
path: "/v2/auth/oauth2/token",
|
|
method: RequestMethod.POST,
|
|
},
|
|
{
|
|
path: "/api/v2/auth/oauth2/token",
|
|
method: RequestMethod.POST,
|
|
}
|
|
)
|
|
.apply(JsonBodyMiddleware)
|
|
.forRoutes("*")
|
|
.apply(RequestIdMiddleware)
|
|
.forRoutes("*")
|
|
.apply(AppLoggerMiddleware)
|
|
.forRoutes("*")
|
|
.apply(RedirectsMiddleware)
|
|
.forRoutes("/")
|
|
.apply(RewriterMiddleware)
|
|
.forRoutes("/");
|
|
}
|
|
}
|