mirror of
https://github.com/hanzoai/calendar.git
synced 2026-10-30 14:46:43 +00:00
c321a6c07a
* 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 commit39cc4aa3eb. * Revert "fix: address Cubic AI review feedback on OAuth2 endpoints" This reverts commit97bf593186. * 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 commita080e93f07. * Revert "fix: address Cubic AI review feedback on OAuth2 endpoints" This reverts commit04986a16c9. * 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 commit416bef9c93. * 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>
88 lines
2.8 KiB
TypeScript
88 lines
2.8 KiB
TypeScript
import authedProcedure, { authedAdminProcedure } from "@calcom/trpc/server/procedures/authedProcedure";
|
|
import { router } from "../../../trpc";
|
|
import { ZCreateClientInputSchema } from "./createClient.schema";
|
|
import { ZDeleteClientInputSchema } from "./deleteClient.schema";
|
|
import { ZGenerateAuthCodeInputSchema } from "./generateAuthCode.schema";
|
|
import { ZGetClientForAuthorizationInputSchema } from "./getClientForAuthorization.schema";
|
|
import { ZListClientsInputSchema } from "./listClients.schema";
|
|
import { ZSubmitClientInputSchema, ZSubmitClientOutputSchema } from "./submitClientForReview.schema";
|
|
import { ZUpdateClientInputSchema } from "./updateClient.schema";
|
|
|
|
export const oAuthRouter = router({
|
|
getClientForAuthorization: authedProcedure
|
|
.input(ZGetClientForAuthorizationInputSchema)
|
|
.query(async ({ ctx, input }) => {
|
|
const { getClientForAuthorizationHandler } = await import("./getClientForAuthorization.handler");
|
|
|
|
return getClientForAuthorizationHandler({
|
|
ctx,
|
|
input,
|
|
});
|
|
}),
|
|
|
|
createClient: authedAdminProcedure.input(ZCreateClientInputSchema).mutation(async ({ ctx, input }) => {
|
|
const { createClientHandler } = await import("./createClient.handler");
|
|
|
|
return createClientHandler({
|
|
ctx,
|
|
input,
|
|
});
|
|
}),
|
|
|
|
generateAuthCode: authedProcedure.input(ZGenerateAuthCodeInputSchema).mutation(async ({ ctx, input }) => {
|
|
const { generateAuthCodeHandler } = await import("./generateAuthCode.handler");
|
|
|
|
return generateAuthCodeHandler({
|
|
ctx,
|
|
input,
|
|
});
|
|
}),
|
|
|
|
submitClientForReview: authedProcedure
|
|
.input(ZSubmitClientInputSchema)
|
|
.output(ZSubmitClientOutputSchema)
|
|
.mutation(async ({ ctx, input }) => {
|
|
const { submitClientForReviewHandler } = await import("./submitClientForReview.handler");
|
|
|
|
return submitClientForReviewHandler({
|
|
ctx,
|
|
input,
|
|
});
|
|
}),
|
|
|
|
listClients: authedAdminProcedure.input(ZListClientsInputSchema).query(async ({ ctx, input }) => {
|
|
const { listClientsHandler } = await import("./listClients.handler");
|
|
|
|
return listClientsHandler({
|
|
ctx,
|
|
input,
|
|
});
|
|
}),
|
|
|
|
listUserClients: authedProcedure.query(async ({ ctx }) => {
|
|
const { listUserClientsHandler } = await import("./listUserClients.handler");
|
|
|
|
return listUserClientsHandler({
|
|
ctx,
|
|
});
|
|
}),
|
|
|
|
updateClient: authedProcedure.input(ZUpdateClientInputSchema).mutation(async ({ ctx, input }) => {
|
|
const { updateClientHandler } = await import("./updateClient.handler");
|
|
|
|
return updateClientHandler({
|
|
ctx,
|
|
input,
|
|
});
|
|
}),
|
|
|
|
deleteClient: authedProcedure.input(ZDeleteClientInputSchema).mutation(async ({ ctx, input }) => {
|
|
const { deleteClientHandler } = await import("./deleteClient.handler");
|
|
|
|
return deleteClientHandler({
|
|
ctx,
|
|
input,
|
|
});
|
|
}),
|
|
});
|