@@ -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