Commitf11229a

authored

FIX: Appropriately assign values when fetching user details (#100)

FIX: Appropriately assign values when fetching user details

1 parent5cd7a79 commitf11229aCopy full SHA for f11229a

File tree

+19

-3

lines changed

+19

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ def walk_path(fragment, segments, seg_index = 0)`
`84`	`84`	`returnnilunlessfragment.is_a?(Hash) \|\|fragment.is_a?(Array)`
`85`	`85`	`first_seg=segments[seg_index].scan(/([\d+])/).length >0 ?first_seg.split("[")[0] :first_seg`
`86`	`86`	`iffragment.is_a?(Hash)`
`87`		`-deref=fragment[first_seg] \|\|fragment[first_seg.to_sym]`
	`87`	`+deref=fragment[first_seg]`
`88`	`88`	`else`
`89`	`89`	`array_index=0`
`90`	`90`	`if(seg_index >0)`
`@@ -98,7 +98,7 @@ def walk_path(fragment, segments, seg_index = 0)`
`98`	`98`	`end`
`99`	`99`	`end`
`100`	`100`
`101`		`-if(deref.blank? \|\|seg_index ==segments.size -1)`
	`101`	`+ifderef.blank? \|\|seg_index ==segments.size -1`
`102`	`102`	`deref`
`103`	`103`	`else`
`104`	`104`	`seg_index +=1`
`@@ -113,7 +113,8 @@ def json_walk(result, user_json, prop, custom_path: nil)`
`113`	`113`	`path=path.gsub(".[].",".").gsub(".[","[")`
`114`	`114`	`segments=parse_segments(path)`
`115`	`115`	`val=walk_path(user_json,segments)`
`116`		`-result[prop]=valifval.present?`
	`116`	`+# [] should be nil, false should be false`
	`117`	`+result[prop]=val.presence \|\|(val ==[] ?nil :val)`
`117`	`118`	`end`
`118`	`119`	`end`
`119`	`120`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,21 @@`
`312`	`312`	`expect(result).toeq"http://example.com/1.png"`
`313`	`313`	`end`
`314`	`314`
	`315`	+it"can walk json and appropriately assign a `false`"do
	`316`	`+authenticator=OAuth2BasicAuthenticator.new`
	`317`	`+json_string='{"user":{"id":1234, "data": {"address":"test@example.com", "is_cat": false}}}'`
	`318`	`+SiteSetting.oauth2_json_email_verified_path="user.data.is_cat"`
	`319`	`+result=`
	`320`	`+authenticator.json_walk(`
	`321`	`+{},`
	`322`	`+JSON.parse(json_string),`
	`323`	`+"extra:user.data.is_cat",`
	`324`	`+custom_path:"user.data.is_cat",`
	`325`	`+)`
	`326`	`+`
	`327`	`+expect(result).toeqfalse`
	`328`	`+end`
	`329`	`+`
`315`	`330`	`describe"token_callback"do`
`316`	`331`	`let(:user){Fabricate(:user)}`
`317`	`332`	`let(:strategy){OmniAuth::Strategies::Oauth2Basic.new({})}`

Comments

(0)