lib/vidibus/user/warden_strategy.rb in vidibus-user-0.0.6 vs lib/vidibus/user/warden_strategy.rb in vidibus-user-0.0.7
- old
+ new
@@ -28,21 +28,21 @@
@this ||= Service.this
end
# Returns the current realm
def realm
- @realm ||= env[:realm] || raise("No realm available!")
+ @realm ||= params["realm"] || env[:realm] || raise("No realm available!")
end
# Returns OAuth client
def client
@client ||= OAuth2::Client.new(credentials[:client_id], credentials[:client_secret], :site => credentials[:service_url])
end
def authenticate!
code = params["code"]
- redirect_url = "#{host}/authenticate_user"
- args = { :redirect_url => redirect_url }
+ redirect_url = "#{host}/authenticate_user?realm=#{realm}"
+ args = {:redirect_url => redirect_url}
# Fetch code first
return redirect!(client.web_server.authorize_url(args)) unless code
# Exchange code for token