Skip to content

Commit 174606d

Browse files
author
Agora@Ubuntu-dev
committed
Refactor because of codeclimate feedback
1 parent 4caf961 commit 174606d

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

lib/oauth/tokens/request_token.rb

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ def authorize_url(params = nil)
88
return nil if self.token.nil?
99

1010
params = (params || {}).merge(:oauth_token => self.token)
11-
build_authorize_url(consumer.authorize_url, params)
11+
build_url(consumer.authorize_url, params)
1212
end
1313

1414
def authenticate_url(params = nil)
1515
return nil if self.token.nil?
1616

1717
params = (params || {}).merge(:oauth_token => self.token)
18-
build_authenticate_url(consumer.authenticate_url, params)
18+
build_url(consumer.authenticate_url, params)
1919
end
2020

2121
def callback_confirmed?
@@ -30,19 +30,8 @@ def get_access_token(options = {}, *arguments)
3030

3131
protected
3232

33-
# construct an authorization url
34-
def build_authorize_url(base_url, params)
35-
uri = URI.parse(base_url.to_s)
36-
queries = {}
37-
queries = Hash[URI.decode_www_form(uri.query)] if uri.query
38-
# TODO doesn't handle array values correctly
39-
queries.merge!(params) if params
40-
uri.query = URI.encode_www_form(queries) if !queries.empty?
41-
uri.to_s
42-
end
43-
44-
# construct an authenticate url
45-
def build_authenticate_url(base_url, params)
33+
# construct an authorization or authentication url
34+
def build_url(base_url, params)
4635
uri = URI.parse(base_url.to_s)
4736
queries = {}
4837
queries = Hash[URI.decode_www_form(uri.query)] if uri.query

0 commit comments

Comments
 (0)