huanld/speckle-server
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Add tests, fix tests, and revert behaviour

Browse Source
This commit is contained in:
Iain Sproat
2025-05-13 15:53:03 +01:00
parent 0f4bb6603b
commit 91e9e9fcc9
2 changed files with 112 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/modules/auth/services/passportService.ts
+1 -1
View File
@@ -52,7 +52,7 @@ export const passportAuthenticationCallbackFactory =
}
const infoMsg = resolveInfoMessage(info)
if (!user) {
if (!user && !e) {
// no user despite there being no error, so authentication failed
const message = infoMsg || 'Failed to authenticate, contact server admins'
res.redirect(new URL(defaultErrorPath(message), getFrontendOrigin()).toString())
packages/server/modules/auth/tests/auth.spec.ts
+111 -38
View File
@@ -71,6 +71,9 @@ import {
validateStreamAccessFactory
} from '@/modules/core/services/streams/access'
import { authorizeResolver } from '@/modules/shared'
import { UserInputError } from '@/modules/core/errors/userinput'
import { createRandomEmail } from '@/modules/core/helpers/testHelpers'
import cryptoRandomString from 'crypto-random-string'
const getServerInfo = getServerInfoFactory({ db })
const getUser = getUserFactory({ db })
@@ -685,10 +688,12 @@ describe('Auth @auth', () => {
next
})
SUT(null, { id: '123', email: 'weLoveAuth@example.org' }, undefined)
const userId = cryptoRandomString({ length: 4 })
SUT(null, { id: userId, email: createRandomEmail() }, undefined)
expect(req).to.have.property('user')
expect(req.user?.id).to.equal('123')
expect(req.user?.id).to.equal(userId)
expect(
errorCalledCounter,
'error request handler "next(err)" should not have been called'
@@ -698,41 +703,7 @@ describe('Auth @auth', () => {
'next request handler should have been called'
).to.equal(1)
})
it('Should handle case where there is an error but no user', async () => {
const req = httpMocks.createRequest()
req.log = logger
const res = httpMocks.createResponse()
let errorCalledCounter = 0
let nextCalledCounter = 0
const next = (err: unknown) => {
if (err) {
errorCalledCounter++
}
nextCalledCounter++
}
const SUT = passportAuthenticationCallbackFactory({
strategy: 'wotStrategy',
req,
res,
next
})
SUT(new Error('I brrrrroke'), undefined, undefined)
expect(
res._getRedirectUrl().includes('/error'),
`Redirect url was '${res._getRedirectUrl()}'`
).to.be.true
expect(req).not.to.have.property('user')
expect(
errorCalledCounter,
'error request handler "next(err)" should not have been called'
).to.equal(0)
expect(
nextCalledCounter,
'next request handler should not have been called'
).to.equal(0)
})
it('Should handle case where there is an error and a user', async () => {
it('Should handle case where there is an unexpected error and a user', async () => {
const req = httpMocks.createRequest()
req.log = logger
const res = httpMocks.createResponse()
@@ -753,7 +724,7 @@ describe('Auth @auth', () => {
SUT(
new Error('I brrrrrooooken'),
{ id: '1234', email: 'allFizzy@example.org' },
{ id: cryptoRandomString({ length: 4 }), email: createRandomEmail() },
undefined
)
@@ -768,6 +739,44 @@ describe('Auth @auth', () => {
'next request handler should have been called'
).to.equal(1)
})
it('Should handle case where there is a user-derived error and a user', async () => {
const req = httpMocks.createRequest()
req.log = logger
const res = httpMocks.createResponse()
let errorCalledCounter = 0
let nextCalledCounter = 0
const next = (err: unknown) => {
if (err) {
errorCalledCounter++
}
nextCalledCounter++
}
const SUT = passportAuthenticationCallbackFactory({
strategy: 'wotStrategy',
req,
res,
next
})
SUT(
new UserInputError('I brrrrroke'),
{ id: cryptoRandomString({ length: 4 }), email: createRandomEmail() },
undefined
)
expect(
res._getRedirectUrl().includes('/error'),
`Redirect url was '${res._getRedirectUrl()}'`
).to.be.true
expect(req).not.to.have.property('user')
expect(
errorCalledCounter,
'error request handler "next(err)" should not have been called'
).to.equal(0)
expect(
nextCalledCounter,
'next request handler should not have been called'
).to.equal(0)
})
it('Should handle the case where there is no user and no error', async () => {
const req = httpMocks.createRequest()
req.log = logger
@@ -802,5 +811,69 @@ describe('Auth @auth', () => {
'next request handler should not have been called'
).to.equal(0)
})
it('Should handle case where there is a user-derived error but no user', async () => {
const req = httpMocks.createRequest()
req.log = logger
const res = httpMocks.createResponse()
let errorCalledCounter = 0
let nextCalledCounter = 0
const next = (err: unknown) => {
if (err) {
errorCalledCounter++
}
nextCalledCounter++
}
const SUT = passportAuthenticationCallbackFactory({
strategy: 'wotStrategy',
req,
res,
next
})
SUT(new UserInputError('I brrrrroke'), undefined, undefined)
expect(
res._getRedirectUrl().includes('/error'),
`Redirect url was '${res._getRedirectUrl()}'`
).to.be.true
expect(req).not.to.have.property('user')
expect(
errorCalledCounter,
'error request handler "next(err)" should not have been called'
).to.equal(0)
expect(
nextCalledCounter,
'next request handler should not have been called'
).to.equal(0)
})
it('Should handle case where there is an unexpected error and no user', async () => {
const req = httpMocks.createRequest()
req.log = logger
const res = httpMocks.createResponse()
let errorCalledCounter = 0
let nextCalledCounter = 0
const next = (err: unknown) => {
if (err) {
errorCalledCounter++
}
nextCalledCounter++
}
const SUT = passportAuthenticationCallbackFactory({
strategy: 'wotStrategy',
req,
res,
next
})
SUT(new Error('surprise!!!'), undefined, undefined)
expect(req).not.to.have.property('user')
expect(
nextCalledCounter,
'next request handler should have been called'
).to.equal(1)
expect(
errorCalledCounter,
'next request handler should have been called with an error "next(err)"'
).to.equal(1)
})
})
})