Commit 5e20fdd

authored

2.0.6 uses different token to 2.0.5 (#626)

* Prefer the key order from the lookup, not the hash keys * Fix subject cop * Fix hash style cop

1 parent 86a686e commit 5e20fddCopy full SHA for 5e20fdd

File tree

+23

-1

lines changed

+23

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class << self`
`18`	`18`	`# @return [AccessToken] the initialized AccessToken`
`19`	`19`	`def from_hash(client, hash)`
`20`	`20`	`fresh = hash.dup`
`21`		`- supported_keys = fresh.keys & TOKEN_KEY_LOOKUP`
	`21`	`+ supported_keys = TOKEN_KEY_LOOKUP & fresh.keys`
`22`	`22`	`key = supported_keys[0]`
`23`	`23`	`# Having too many is sus, and may lead to bugs. Having none is fine (e.g. refresh flow doesn't need a token).`
`24`	`24`	warn("OAuth2::AccessToken.from_hash: `hash` contained more than one 'token' key (#{supported_keys}); using #{key.inspect}.") if supported_keys.length > 1

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,28 @@`
`53`	`53`	`expect(printed).to eq(msg)`
`54`	`54`	`end`
`55`	`55`	`end`
	`56`	`+`
	`57`	`+ context 'with keys in a different order to the lookup' do`
	`58`	`+ subject(:printed) do`
	`59`	`+ capture(:stderr) do`
	`60`	`+ target`
	`61`	`+ end`
	`62`	`+ end`
	`63`	`+`
	`64`	`+ let(:hash) do`
	`65`	`+ {`
	`66`	`+ id_token: 'confusing bug here',`
	`67`	`+ access_token: token,`
	`68`	`+ }`
	`69`	`+ end`
	`70`	`+`
	`71`	`+ it 'warns on STDERR and selects the correct key' do`
	`72`	`+ msg = <<-MSG.lstrip`
	`73`	+ OAuth2::AccessToken.from_hash: `hash` contained more than one 'token' key ([:access_token, :id_token]); using :access_token.
	`74`	`+ MSG`
	`75`	`+ expect(printed).to eq(msg)`
	`76`	`+ end`
	`77`	`+ end`
`56`	`78`	`end`
`57`	`79`
`58`	`80`	`describe '#initialize' do`

Comments

(0)