rpbertp13-merb_facebooker 0.0.2.3 → 0.0.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/merb_facebooker/controller.rb +7 -3
- metadata +1 -1
|
@@ -68,7 +68,6 @@ module Facebooker
|
|
|
68
68
|
# from the facebook_params hash key
|
|
69
69
|
#
|
|
70
70
|
def secure_with_facebook_params!
|
|
71
|
-
debugger
|
|
72
71
|
return if !request_is_for_a_facebook_canvas? && !using_facebook_connect?
|
|
73
72
|
|
|
74
73
|
if ['user', 'session_key'].all? {|element| facebook_params[element]}
|
|
@@ -200,8 +199,8 @@ module Facebooker
|
|
|
200
199
|
|
|
201
200
|
def ensure_has_status_update(options = {})
|
|
202
201
|
has_extended_permission?("status_update") || application_needs_permission("status_update", options)
|
|
203
|
-
end
|
|
204
|
-
|
|
202
|
+
end
|
|
203
|
+
|
|
205
204
|
def ensure_has_photo_upload(options = {})
|
|
206
205
|
has_extended_permission?("photo_upload") || application_needs_permission("photo_upload", options)
|
|
207
206
|
end
|
|
@@ -224,6 +223,11 @@ module Facebooker
|
|
|
224
223
|
|
|
225
224
|
def ensure_authenticated_to_facebook
|
|
226
225
|
set_facebook_session || create_new_facebook_session_and_redirect!
|
|
226
|
+
end
|
|
227
|
+
|
|
228
|
+
def ensure_authenticated_with_connect
|
|
229
|
+
set_facebook_session
|
|
230
|
+
throw :halt, redirect(url(:index)) if (facebook_session.nil? || !using_facebook_connect?)
|
|
227
231
|
end
|
|
228
232
|
|
|
229
233
|
def ensure_application_is_installed_by_facebook_user
|