Skip to content

Commit 935be63

Browse files
Handle user manually going to /login without app
1 parent 3fb8047 commit 935be63

2 files changed

Lines changed: 70 additions & 13 deletions

File tree

‎lib/requests/login-request.js‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ class LoginByPasswordRequest {
129129
})
130130
.then(validUser => {
131131
request.initUserSession(validUser)
132-
request.redirectToAuthorize()
132+
request.redirectPostLogin(validUser)
133133
})
134134
}
135135

@@ -145,9 +145,12 @@ class LoginByPasswordRequest {
145145
let extracted = {}
146146

147147
let paramKeys = LoginByPasswordRequest.AUTH_QUERY_PARAMS
148+
let value
148149

149150
for (let p of paramKeys) {
150-
extracted[p] = body[p]
151+
value = body[p]
152+
value = value === 'undefined' ? undefined : value
153+
extracted[p] = value
151154
}
152155

153156
return extracted
@@ -257,12 +260,20 @@ class LoginByPasswordRequest {
257260
/**
258261
* Redirects the Login request to continue on the OIDC auth workflow.
259262
*/
260-
redirectToAuthorize () {
261-
let authUrl = this.authorizeUrl()
263+
redirectPostLogin (validUser) {
264+
let uri
262265

263-
debug('Login successful, redirecting to /authorize')
266+
if (this.authQueryParams['redirect_uri']) {
267+
// Login request is part of an app's auth flow
268+
uri = this.authorizeUrl()
269+
} else {
270+
// Login request is a user going to /login in browser
271+
uri = this.accountManager.accountUriFor(validUser.username)
272+
}
273+
274+
debug('Login successful, redirecting to ', uri)
264275

265-
this.response.redirect(authUrl)
276+
this.response.redirect(uri)
266277
}
267278
}
268279

‎test/unit/login-by-password-request.js‎

Lines changed: 53 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,18 +142,18 @@ describe('LoginByPasswordRequest', () => {
142142
})
143143
})
144144

145-
it('should call redirectToAuthorize()', () => {
145+
it('should call redirectPostLogin()', () => {
146146
let validUser = {}
147147
let request = new LoginByPasswordRequest({ userStore, accountManager, response })
148148

149149
request.validate = sinon.stub()
150150
request.findValidUser = sinon.stub().returns(Promise.resolve(validUser))
151151

152-
let redirectToAuthorize = sinon.spy(request, 'redirectToAuthorize')
152+
let redirectPostLogin = sinon.spy(request, 'redirectPostLogin')
153153

154154
return LoginByPasswordRequest.login(request)
155155
.then(() => {
156-
expect(redirectToAuthorize).to.have.been.called
156+
expect(redirectPostLogin).to.have.been.calledWith(validUser)
157157
})
158158
})
159159
})
@@ -391,19 +391,65 @@ describe('LoginByPasswordRequest', () => {
391391
})
392392
})
393393

394-
describe('redirectToAuthorize()', () => {
395-
it('should redirect to the /authorize url', () => {
394+
describe('redirectPostLogin()', () => {
395+
it('should redirect to the /authorize url if redirect_uri is present', () => {
396396
let res = HttpMocks.createResponse()
397397
let authUrl = 'https://localhost/authorize?client_id=123'
398+
let validUser = accountManager.userAccountFrom({ username: 'alice' })
398399

399-
let request = new LoginByPasswordRequest({ accountManager, response: res })
400+
let authQueryParams = {
401+
redirect_uri: 'https://app.example.com/callback'
402+
}
403+
404+
let options = { accountManager, authQueryParams, response: res }
405+
let request = new LoginByPasswordRequest(options)
400406

401407
request.authorizeUrl = sinon.stub().returns(authUrl)
402408

403-
request.redirectToAuthorize()
409+
request.redirectPostLogin(validUser)
404410

405411
expect(res.statusCode).to.equal(302)
406412
expect(res._getRedirectUrl()).to.equal(authUrl)
407413
})
408414
})
415+
416+
it('should redirect to account uri if no redirect_uri present', () => {
417+
let res = HttpMocks.createResponse()
418+
let authUrl = 'https://localhost/authorize?client_id=123'
419+
let validUser = accountManager.userAccountFrom({ username: 'alice' })
420+
421+
let authQueryParams = {}
422+
423+
let options = { accountManager, authQueryParams, response: res }
424+
let request = new LoginByPasswordRequest(options)
425+
426+
request.authorizeUrl = sinon.stub().returns(authUrl)
427+
428+
request.redirectPostLogin(validUser)
429+
430+
let expectedUri = accountManager.accountUriFor('alice')
431+
expect(res.statusCode).to.equal(302)
432+
expect(res._getRedirectUrl()).to.equal(expectedUri)
433+
})
434+
435+
it('should redirect to account uri if redirect_uri is string "undefined', () => {
436+
let res = HttpMocks.createResponse()
437+
let authUrl = 'https://localhost/authorize?client_id=123'
438+
let validUser = accountManager.userAccountFrom({ username: 'alice' })
439+
440+
let body = { redirect_uri: 'undefined' }
441+
442+
let options = { accountManager, response: res }
443+
let request = new LoginByPasswordRequest(options)
444+
request.authQueryParams = LoginByPasswordRequest.extractQueryParams(body)
445+
446+
request.authorizeUrl = sinon.stub().returns(authUrl)
447+
448+
request.redirectPostLogin(validUser)
449+
450+
let expectedUri = accountManager.accountUriFor('alice')
451+
452+
expect(res.statusCode).to.equal(302)
453+
expect(res._getRedirectUrl()).to.equal(expectedUri)
454+
})
409455
})

0 commit comments

Comments
 (0)