Skip to content

Commit

Permalink
fix(authentication-oauth): Allow POST oauth callbacks (#3497)
Browse files Browse the repository at this point in the history
  • Loading branch information
daffl authored Jun 18, 2024
1 parent 4214d3b commit ffcc90b
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 11 deletions.
21 changes: 14 additions & 7 deletions packages/authentication-oauth/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { createDebug } from '@feathersjs/commons'
import { resolveDispatch } from '@feathersjs/schema'

import { OAuthStrategy, OAuthProfile } from './strategy'
import { redirectHook, OAuthService } from './service'
import { redirectHook, OAuthService, OAuthCallbackService } from './service'
import { getGrantConfig, authenticationServiceOptions, OauthSetupSettings } from './utils'

const debug = createDebug('@feathersjs/authentication-oauth')
Expand Down Expand Up @@ -34,16 +34,23 @@ export const oauth =
const grantConfig = getGrantConfig(authService)
const serviceOptions = authenticationServiceOptions(authService, oauthOptions)
const servicePath = `${grantConfig.defaults.prefix || 'oauth'}/:provider`
const callbackServicePath = `${servicePath}/callback`
const oauthService = new OAuthService(authService, oauthOptions)

app.use(servicePath, new OAuthService(authService, oauthOptions), serviceOptions)

const oauthService = app.service(servicePath)

oauthService.hooks({
app.use(servicePath, oauthService, serviceOptions)
app.use(callbackServicePath, new OAuthCallbackService(oauthService), serviceOptions)
app.service(servicePath).hooks({
around: { all: [resolveDispatch(), redirectHook()] }
})
app.service(callbackServicePath).hooks({
around: { all: [resolveDispatch(), redirectHook()] }
})

if (typeof oauthService.publish === 'function') {
if (typeof app.service(servicePath).publish === 'function') {
app.service(servicePath).publish(() => null)
}

if (typeof app.service(callbackServicePath).publish === 'function') {
app.service(callbackServicePath).publish(() => null)
}
}
20 changes: 16 additions & 4 deletions packages/authentication-oauth/src/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,26 @@ export class OAuthService {
async get(override: string, params: OAuthParams) {
const result = await this.handler('GET', params, {}, override)

if (override === 'callback') {
return this.authenticate(params, result)
}

return result
}

async create(data: any, params: OAuthParams) {
return this.handler('POST', params, data)
}
}

export class OAuthCallbackService {
constructor(public service: OAuthService) {}

async find(params: OAuthParams) {
const result = await this.service.handler('GET', params, {}, 'callback')

return this.service.authenticate(params, result)
}

async create(data: any, params: OAuthParams) {
const result = await this.service.handler('POST', params, data, 'callback')

return this.service.authenticate(params, result)
}
}

0 comments on commit ffcc90b

Please sign in to comment.