Skip to content

feat(server): support Timing-Allow-Origin in CORSPlugin #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dinwwwh merged 4 commits into from
Feb 6, 2025
Merged

feat(server): support Timing-Allow-Origin in CORSPlugin #124

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f6cfa3
feat(server): support Timing-Allow-Origin in CORSPlugin
dinwwwh Feb 6, 2025
412ba90
Update packages/server/src/plugins/cors.ts
dinwwwh Feb 6, 2025
4a118c3
improve
dinwwwh Feb 6, 2025
1b1ad6f
improve
dinwwwh Feb 6, 2025
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
27 changes: 22 additions & 5 deletions packages/server/src/plugins/cors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import type { Plugin } from './base'
import { value, type Value } from '@orpc/shared'

export interface CORSOptions<TContext extends Context> {
origin: Value<string | string[] | null | undefined, [origin: string, options: StandardHandlerInterceptorOptions<TContext>]>
origin?: Value<string | string[] | null | undefined, [origin: string, options: StandardHandlerInterceptorOptions<TContext>]>
timingOrigin?: Value<string | string[] | null | undefined, [origin: string, options: StandardHandlerInterceptorOptions<TContext>]>
allowMethods?: string[]
allowHeaders?: string[]
maxAge?: number
Expand All @@ -21,6 +22,10 @@ export class CORSPlugin<TContext extends Context> implements Plugin<TContext> {
allowMethods: ['GET', 'HEAD', 'PUT', 'POST', 'DELETE', 'PATCH'],
}

if (options?.credentials) {
defaults.origin = origin => origin
}

this.options = {
...defaults,
...options,
Expand Down Expand Up @@ -76,17 +81,29 @@ export class CORSPlugin<TContext extends Context> implements Plugin<TContext> {
: interceptorOptions.request.headers.origin || ''

const allowedOrigin = await value(this.options.origin, origin, interceptorOptions)

const allowedOriginArr = Array.isArray(allowedOrigin) ? allowedOrigin : [allowedOrigin]

if (allowedOriginArr.includes(origin) || allowedOriginArr.includes('*')) {
result.response.headers['access-control-allow-origin'] = origin
if (allowedOriginArr.includes('*')) {
result.response.headers['access-control-allow-origin'] = '*'
}
else {
if (allowedOriginArr.includes(origin)) {
result.response.headers['access-control-allow-origin'] = origin
}

if (!allowedOriginArr.includes('*')) {
result.response.headers.vary = interceptorOptions.request.headers.vary ?? 'origin'
}

const allowedTimingOrigin = await value(this.options.timingOrigin, origin, interceptorOptions)
const allowedTimingOriginArr = Array.isArray(allowedTimingOrigin) ? allowedTimingOrigin : [allowedTimingOrigin]

if (allowedTimingOriginArr.includes('*')) {
result.response.headers['timing-allow-origin'] = '*'
}
else if (allowedTimingOriginArr.includes(origin)) {
result.response.headers['timing-allow-origin'] = origin
}

if (this.options.credentials) {
result.response.headers['access-control-allow-credentials'] = 'true'
}
Expand Down