* 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 * feat: owner can test non accepted OAuth client * fix: remove sensitive data from OAuth2 exception logs Remove Authorization header and userEmail from error logs in OAuth2HttpExceptionFilter to avoid logging sensitive information. Addresses Cubic AI review feedback (confidence 9/10). Co-Authored-By: unknown <> * fix: e2e --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
228 lines
5.0 KiB
TypeScript
228 lines
5.0 KiB
TypeScript
import { randomBytes } from "node:crypto";
|
|
|
|
import type { PrismaClient } from "@calcom/prisma";
|
|
import type { OAuthClientStatus } from "@calcom/prisma/enums";
|
|
|
|
export class OAuthClientRepository {
|
|
constructor(private readonly prisma: PrismaClient) {}
|
|
|
|
async findByClientId(clientId: string) {
|
|
return await this.prisma.oAuthClient.findFirst({
|
|
where: {
|
|
clientId: clientId,
|
|
},
|
|
select: {
|
|
redirectUri: true,
|
|
clientType: true,
|
|
name: true,
|
|
purpose: true,
|
|
logo: true,
|
|
clientId: true,
|
|
isTrusted: true,
|
|
websiteUrl: true,
|
|
rejectionReason: true,
|
|
status: true,
|
|
userId: true,
|
|
createdAt: true,
|
|
},
|
|
});
|
|
}
|
|
|
|
async findByClientIdWithSecret(clientId: string) {
|
|
return this.prisma.oAuthClient.findUnique({
|
|
where: { clientId },
|
|
select: {
|
|
clientId: true,
|
|
redirectUri: true,
|
|
clientSecret: true,
|
|
clientType: true,
|
|
status: true,
|
|
userId: true,
|
|
},
|
|
});
|
|
}
|
|
|
|
async findByClientIdIncludeUser(clientId: string) {
|
|
return this.prisma.oAuthClient.findUnique({
|
|
where: { clientId },
|
|
select: {
|
|
clientId: true,
|
|
redirectUri: true,
|
|
clientType: true,
|
|
name: true,
|
|
purpose: true,
|
|
logo: true,
|
|
websiteUrl: true,
|
|
rejectionReason: true,
|
|
isTrusted: true,
|
|
status: true,
|
|
userId: true,
|
|
createdAt: true,
|
|
user: {
|
|
select: {
|
|
id: true,
|
|
email: true,
|
|
name: true,
|
|
},
|
|
},
|
|
},
|
|
});
|
|
}
|
|
|
|
async findByUserId(userId: number) {
|
|
return this.prisma.oAuthClient.findMany({
|
|
where: { userId },
|
|
select: {
|
|
clientId: true,
|
|
redirectUri: true,
|
|
name: true,
|
|
purpose: true,
|
|
logo: true,
|
|
websiteUrl: true,
|
|
rejectionReason: true,
|
|
clientType: true,
|
|
status: true,
|
|
userId: true,
|
|
createdAt: true,
|
|
},
|
|
orderBy: { createdAt: "desc" },
|
|
});
|
|
}
|
|
|
|
async findByUserIdAndStatus(userId: number, status: OAuthClientStatus) {
|
|
return this.prisma.oAuthClient.findMany({
|
|
where: { userId, status },
|
|
orderBy: { createdAt: "desc" },
|
|
});
|
|
}
|
|
|
|
async findAll() {
|
|
return this.prisma.oAuthClient.findMany({
|
|
select: {
|
|
clientId: true,
|
|
redirectUri: true,
|
|
name: true,
|
|
purpose: true,
|
|
logo: true,
|
|
websiteUrl: true,
|
|
rejectionReason: true,
|
|
clientType: true,
|
|
status: true,
|
|
userId: true,
|
|
createdAt: true,
|
|
user: {
|
|
select: {
|
|
id: true,
|
|
email: true,
|
|
name: true,
|
|
},
|
|
},
|
|
},
|
|
orderBy: { createdAt: "desc" },
|
|
});
|
|
}
|
|
|
|
async findByStatus(status: OAuthClientStatus) {
|
|
return this.prisma.oAuthClient.findMany({
|
|
where: { status },
|
|
select: {
|
|
clientId: true,
|
|
redirectUri: true,
|
|
name: true,
|
|
purpose: true,
|
|
logo: true,
|
|
websiteUrl: true,
|
|
rejectionReason: true,
|
|
clientType: true,
|
|
status: true,
|
|
userId: true,
|
|
createdAt: true,
|
|
user: {
|
|
select: {
|
|
id: true,
|
|
email: true,
|
|
name: true,
|
|
},
|
|
},
|
|
},
|
|
orderBy: { createdAt: "desc" },
|
|
});
|
|
}
|
|
|
|
async create(data: {
|
|
name: string;
|
|
purpose: string;
|
|
redirectUri: string;
|
|
clientSecret?: string;
|
|
logo?: string;
|
|
websiteUrl?: string;
|
|
enablePkce?: boolean;
|
|
userId?: number;
|
|
status: OAuthClientStatus;
|
|
}) {
|
|
const { name, purpose, redirectUri, clientSecret, logo, websiteUrl, enablePkce, userId, status } = data;
|
|
|
|
const clientId = randomBytes(32).toString("hex");
|
|
|
|
const client = await this.prisma.oAuthClient.create({
|
|
data: {
|
|
name,
|
|
purpose,
|
|
redirectUri,
|
|
clientId,
|
|
clientType: enablePkce ? "PUBLIC" : "CONFIDENTIAL",
|
|
logo,
|
|
websiteUrl,
|
|
status,
|
|
clientSecret,
|
|
...(userId && {
|
|
user: {
|
|
connect: { id: userId },
|
|
},
|
|
}),
|
|
},
|
|
});
|
|
|
|
return {
|
|
clientId: client.clientId,
|
|
name: client.name,
|
|
purpose: client.purpose,
|
|
redirectUri: client.redirectUri,
|
|
logo: client.logo,
|
|
clientType: client.clientType,
|
|
clientSecret: client.clientSecret,
|
|
isPkceEnabled: enablePkce,
|
|
status: client.status,
|
|
};
|
|
}
|
|
|
|
async updateStatus(clientId: string, status: OAuthClientStatus) {
|
|
return this.prisma.oAuthClient.update({
|
|
where: { clientId },
|
|
data: { status },
|
|
});
|
|
}
|
|
|
|
async update(
|
|
clientId: string,
|
|
data: {
|
|
name?: string;
|
|
purpose?: string;
|
|
redirectUri?: string;
|
|
logo?: string;
|
|
websiteUrl?: string;
|
|
}
|
|
) {
|
|
return this.prisma.oAuthClient.update({
|
|
where: { clientId },
|
|
data,
|
|
});
|
|
}
|
|
|
|
async delete(clientId: string) {
|
|
return this.prisma.oAuthClient.delete({
|
|
where: { clientId },
|
|
});
|
|
}
|
|
}
|