Commitb9567df

committed

Preserve query string params in authorizationUri

1 parentb2f7174 commitb9567dfCopy full SHA for b9567df

File tree

+39

-3

lines changed

+39

-3

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,9 @@ function createUri (options, tokenType) {`
`161`	`161`	`// Check the required parameters are set.`
`162`	`162`	`expects(options,'clientId','authorizationUri')`
`163`	`163`
`164`		`-returnoptions.authorizationUri+'?'+Querystring.stringify(Object.assign({`
	`164`	`+constsep=options.authorizationUri.includes('?') ?'&' :'?'`
	`165`	`+`
	`166`	`+returnoptions.authorizationUri+sep+Querystring.stringify(Object.assign({`
`165`	`167`	`client_id:options.clientId,`
`166`	`168`	`redirect_uri:options.redirectUri,`
`167`	`169`	`scope:sanitizeScope(options.scopes),`

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* global describe, it */`
	`1`	`+/* global describe, it, context */`
`2`	`2`	`varexpect=require('chai').expect`
`3`	`3`	`varconfig=require('./support/config')`
`4`	`4`	`varClientOAuth2=require('../')`
`@@ -24,6 +24,24 @@ describe('code', function () {`
`24`	`24`	`'scope=notifications&response_type=code&state='`
`25`	`25`	`)`
`26`	`26`	`})`
	`27`	`+context('when authorizationUri contains query parameters',function(){`
	`28`	`+it('should preserve query string parameters',function(){`
	`29`	`+constauthWithParams=newClientOAuth2({`
	`30`	`+clientId:config.clientId,`
	`31`	`+clientSecret:config.clientSecret,`
	`32`	`+accessTokenUri:config.accessTokenUri,`
	`33`	`+authorizationUri:config.authorizationUri+'?bar=qux',`
	`34`	`+authorizationGrants:['code'],`
	`35`	`+redirectUri:config.redirectUri,`
	`36`	`+scopes:'notifications'`
	`37`	`+})`
	`38`	`+expect(authWithParams.code.getUri()).to.equal(`
	`39`	`+config.authorizationUri+'?bar=qux&client_id=abc&'+`
	`40`	`+'redirect_uri=http%3A%2F%2Fexample.com%2Fauth%2Fcallback&'+`
	`41`	`+'scope=notifications&response_type=code&state='`
	`42`	`+)`
	`43`	`+})`
	`44`	`+})`
`27`	`45`	`})`
`28`	`46`
`29`	`47`	`describe('#getToken',function(){`

Lines changed: 17 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* global describe, it */`
	`1`	`+/* global describe, it, context */`
`2`	`2`	`varexpect=require('chai').expect`
`3`	`3`	`varconfig=require('./support/config')`
`4`	`4`	`varClientOAuth2=require('../')`
`@@ -22,6 +22,22 @@ describe('token', function () {`
`22`	`22`	`'scope=notifications&response_type=token&state='`
`23`	`23`	`)`
`24`	`24`	`})`
	`25`	`+context('when authorizationUri contains query parameters',function(){`
	`26`	`+it('should preserve query string parameters',function(){`
	`27`	`+constauthWithParams=newClientOAuth2({`
	`28`	`+clientId:config.clientId,`
	`29`	`+authorizationUri:config.authorizationUri+'?bar=qux',`
	`30`	`+authorizationGrants:['token'],`
	`31`	`+redirectUri:config.redirectUri,`
	`32`	`+scopes:['notifications']`
	`33`	`+})`
	`34`	`+expect(authWithParams.token.getUri()).to.equal(`
	`35`	`+config.authorizationUri+'?bar=qux&client_id=abc&'+`
	`36`	`+'redirect_uri=http%3A%2F%2Fexample.com%2Fauth%2Fcallback&'+`
	`37`	`+'scope=notifications&response_type=token&state='`
	`38`	`+)`
	`39`	`+})`
	`40`	`+})`
`25`	`41`	`})`
`26`	`42`
`27`	`43`	`describe('#getToken',function(){`

Comments

(0)