lib/provider/github.rb in ticketmaster-github-0.4.9 vs lib/provider/github.rb in ticketmaster-github-0.5.0

@@ -14,21 +14,24 @@
     
     # declare needed overloaded methods here
     def authorize(auth = {})
       @authentication ||= TicketMaster::Authenticator.new(auth)
       auth = @authentication
+      login = auth.login || auth.username
       if auth.login.blank? and auth.username.blank?
         raise TicketMaster::Exception.new('Please provide at least a username')
-      elsif auth.token.blank? || auth.password.blank?
-        login = auth.login || auth.username
-        TicketMaster::Provider::Github.login = 
+      elsif auth.token
+        TicketMaster::Provider::Github.login = login
+        TicketMaster::Provider::Github.user_token = auth.token
+        TicketMaster::Provider::Github.api = Octokit.client(:login => login, :token => auth.token)
+      elsif auth.password
+        TicketMaster::Provider::Github.login = login
+        TicketMaster::Provider::Github.user_token = auth.token
+        TicketMaster::Provider::Github.api = Octokit.client(:login => login, :password => auth.password)
+      else 
+        TicketMaster::Provider::Github.login = login
         TicketMaster::Provider::Github.user_token = nil
         TicketMaster::Provider::Github.api = Octokit.client(:login => login)
-      else
-        token = auth.token || auth.password
-        TicketMaster::Provider::Github.login = auth.login || auth.username
-        TicketMaster::Provider::Github.user_token = auth.token
-        TicketMaster::Provider::Github.api = Octokit.client(:login => auth.login, :token => token)
       end
     end
 
     def projects(*options)
       if options.empty?