Merge pull request pelle#90 from HeiaHeia/master

Allow callback_url equal nil
tomhughes · Oct 20, 2011 · 6b1ded0 · 6b1ded0
2 parents 93c51f2 + 4246b1b
commit 6b1ded0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/oauth/controllers/provider_controller.rb b/lib/oauth/controllers/provider_controller.rb
@@ -100,7 +100,8 @@ def oauth1_authorize
           if request.post?
             if user_authorizes_token?
               @token.authorize!(current_user)
-              @redirect_url = URI.parse(@token.oob? ? @token.client_application.callback_url : @token.callback_url)
+              callback_url  = @token.oob? ? @token.client_application.callback_url : @token.callback_url
+              @redirect_url = URI.parse(callback_url) unless callback_url.blank?
 
               unless @redirect_url.to_s.blank?
                 @redirect_url.query = @redirect_url.query.blank? ?