[Fix] previous commit cause services cannot be authorized via callback

main.rb

@@ -18,15 +18,9 @@
 
 before do
   @agents = {}
-
   @agents[:plurk] = PlurkAgent.new(session[:plurk_attr]||{})
-  @agents[:plurk] = PlurkAgent.new unless @agents[:plurk].has_authorized?
-
   @agents[:facebook] = FBAgent.new(:access_token => session[:facebook_attr])
-  @agents[:facebook] = FBAgent.new unless @agents[:facebook].has_authorized?
-
   @agents[:twitter] = TwitterAgent.new(:data=>session[:twitter_attr])
-  @agents[:twitter] = TwitterAgent.new unless @agents[:twitter].has_authorized?
 end
 
 after do
@@ -35,7 +29,15 @@
   #  session[:facebook_attr] = @agents[:facebook].attributes
 end
 
+def check_agents_authorization
+  @agents[:plurk] = PlurkAgent.new unless @agents[:plurk].has_authorized?
+  @agents[:facebook] = FBAgent.new unless @agents[:facebook].has_authorized?
+  @agents[:twitter] = TwitterAgent.new unless @agents[:twitter].has_authorized?
+end
+
 get '/' do
+  check_agents_authorization
+
   @auth_url = {}
   @agents.each { |sns, agent|
 	 @auth_url[sns] = agent.get_authorize_url request.host,request.port unless agent.has_authorized?
@@ -81,8 +83,6 @@
 get '/tw_callback' do
   twitter = @agents[:twitter]
   access_token = twitter.get_access_token(params[:oauth_verifier])
-  @token = access_token[:token]
-  @secret = access_token[:secret]
   redirect to('/')
 end
 

twitter_agent.rb

@@ -15,15 +15,8 @@ def get_authorize_url(host, port)
     return @twitter.authorize_url!
   end
 
-  def get_access_token(verifier_or_token=nil,secret=nil)
-    if not verifier_or_token == nil then
-      if secret == nil then
-        @twitter.authorize!(:oauth_verifier=>verifier_or_token)
-      else
-        @twitter.oauth_token = verifier_or_token
-        @twitter.oauth_token_secret = secret
-      end
-    end
+  def get_access_token(verifier_or_token=nil)
+    @twitter.authorize!(:oauth_verifier=>verifier_or_token)
     return {:token => @twitter.oauth_token, :secret => @twitter.oauth_token_secret}
   end