devise_oauth2_canvas_facebook 0.0.3 → 0.0.4
Sign up to get free protection for your applications and to get access to all the features.
@@ -21,9 +21,9 @@ class Devise::FacebookConsumerController < ApplicationController
|
|
21
21
|
token = client.access_token
|
22
22
|
fb_user = client.selection.me.info!
|
23
23
|
|
24
|
-
resource = resource_class.find_with_facebook_user(fb_user, token)
|
24
|
+
resource = resource_class.find_with_facebook_user(fb_user, token, client)
|
25
25
|
unless resource
|
26
|
-
resource = resource_class.create_with_facebook_user(fb_user, token)
|
26
|
+
resource = resource_class.create_with_facebook_user(fb_user, token, client)
|
27
27
|
end
|
28
28
|
if resource_class.respond_to?(:serialize_into_cookie)
|
29
29
|
resource.remember_me!
|
@@ -4,15 +4,15 @@ module Devise
|
|
4
4
|
module DeviseOauth2CanvasFacebook
|
5
5
|
extend ActiveSupport::Concern
|
6
6
|
|
7
|
-
def do_update_facebook_user(fb_user, token)
|
7
|
+
def do_update_facebook_user(fb_user, token, client)
|
8
8
|
self.send("#{self.class.facebook_uid_field}=".to_sym, fb_user.id)
|
9
9
|
self.send("#{self.class.facebook_token_field}=".to_sym, token)
|
10
10
|
self.email = fb_user.email.to_s.downcase if fb_user.email.present?
|
11
|
-
update_facebook_user(fb_user)
|
11
|
+
update_facebook_user(fb_user, client)
|
12
12
|
self.save(:validate => false)
|
13
13
|
end
|
14
14
|
|
15
|
-
def update_facebook_user(fb_user)
|
15
|
+
def update_facebook_user(fb_user, client)
|
16
16
|
# override me
|
17
17
|
end
|
18
18
|
|
@@ -25,18 +25,18 @@ module Devise
|
|
25
25
|
module ClassMethods
|
26
26
|
Devise::Models.config(self, :facebook_uid_field, :facebook_token_field)
|
27
27
|
|
28
|
-
def find_with_facebook_user(fb_user, token)
|
28
|
+
def find_with_facebook_user(fb_user, token,client)
|
29
29
|
user = where(facebook_uid_field.to_sym => fb_user.id).first
|
30
30
|
if user
|
31
|
-
user.do_update_facebook_user(fb_user, token)
|
31
|
+
user.do_update_facebook_user(fb_user, token, client)
|
32
32
|
end
|
33
33
|
user
|
34
34
|
end
|
35
35
|
|
36
|
-
def create_with_facebook_user(fb_user, token)
|
36
|
+
def create_with_facebook_user(fb_user, token,client)
|
37
37
|
user = new(facebook_uid_field.to_sym => fb_user.id, :password => "fakepass", :password_confirmation => "fakepass")
|
38
38
|
user.skip_confirmation! if user.respond_to?(:skip_confirmation!)
|
39
|
-
user.do_update_facebook_user(fb_user, token)
|
39
|
+
user.do_update_facebook_user(fb_user, token, client)
|
40
40
|
user
|
41
41
|
end
|
42
42
|
end
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: devise_oauth2_canvas_facebook
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 23
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 0
|
9
|
-
-
|
10
|
-
version: 0.0.
|
9
|
+
- 4
|
10
|
+
version: 0.0.4
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Nina Jansen
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2010-09-
|
18
|
+
date: 2010-09-13 00:00:00 +02:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|