Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Bumped to 0.0.3

  • Loading branch information...
commit 20d71c5496595fd2ea2c533219868129d5b6df3b 2 parents 4be55de + 5a7cf12
@xanagi xanagi authored
View
2  lib/opensocial-wap/rack/opensocial_oauth.rb
@@ -82,7 +82,7 @@ def remove_utf8_form_input_tag(str)
else
str
end
- end
+ end
def unauthorized
[ 401,
View
6 lib/opensocial-wap/session/opensocial_wap_sid.rb
@@ -18,7 +18,7 @@ def self.included(base)
# request.params メソッドを使用しないこと(文字コード変換で問題が発生するため).
def extract_session_id(env)
stale_session_check! do
- request = ActionDispatch::Request.new(env)
+ request = ::Rack::Request.new(env)
if use_opensocial_wap_sid?(request)
# opensocial_(viewer|owner)_id をsession_idとして使用.
sid = opensocial_user_id(request)
@@ -44,7 +44,7 @@ def use_opensocial_wap_sid?(request)
sid = app_config.opensocial_wap[:session_id] || :cookie # デフォルトでは無効(cookieからセッションIDを取得する).
if sid.to_sym == :parameter
# OAuthの検証にパスしている.
- if request.opensocial_oauth_verified?
+ if request.env['opensocial-wap.oauth-verified']
# opensocial_(viewer|owner)_id がクエリパラメータに存在する.
if opensocial_user_id(request)
return true
@@ -58,7 +58,7 @@ def use_opensocial_wap_sid?(request)
def opensocial_user_id(request)
unless @opensocial_user_id
params = begin
- request.GET.update(request.POST)
+ request.GET.merge(request.POST)
rescue EOFError => e
request.GET
end
Please sign in to comment.
Something went wrong with that request. Please try again.