authorizme 0.0.10 → 0.0.11
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG.md +7 -0
- data/app/controllers/authorizme/login/facebook_controller.rb +30 -27
- data/app/views/authorizme/login/facebook/auth.html.erb +4 -0
- data/config/routes.rb +0 -2
- data/lib/authorizme/provider/draugiem.rb +0 -2
- data/lib/authorizme/provider/facebook.rb +46 -20
- data/lib/authorizme/version.rb +1 -1
- data/lib/generators/authorizme/templates/migrations/3_create_user_roles.rb +7 -1
- metadata +33 -32
data/CHANGELOG.md
CHANGED
@@ -1,44 +1,47 @@
|
|
1
1
|
module Authorizme
|
2
2
|
module Login
|
3
3
|
class FacebookController < AuthorizmeController
|
4
|
-
|
4
|
+
before_filter :set_facebook, :only => [:auth, :callback, :canvas]
|
5
|
+
|
5
6
|
def auth
|
6
|
-
|
7
|
-
|
8
|
-
|
7
|
+
callback_url = params[:callback_url] || redirect_uri("facebook")
|
8
|
+
if params[:canvas]
|
9
|
+
@authorize_url = @facebook.get_dialog_authorize_url callback_url, Authorizme::facebook_perms
|
10
|
+
else
|
11
|
+
redirect_to @facebook.get_popup_authorize_url callback_url, Authorizme::facebook_perms
|
12
|
+
end
|
9
13
|
end
|
10
14
|
|
11
15
|
def callback
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
16
|
+
if params[:signed_request]
|
17
|
+
@facebook.authorize_with_signed_request params[:signed_request]
|
18
|
+
authorize_user @facebook
|
19
|
+
redirect_to Authorizme::after_login_path
|
20
|
+
elsif params[:code]
|
21
|
+
@facebook.authorize_with_code params[:code], redirect_uri("facebook")
|
22
|
+
authorize_user @facebook
|
23
|
+
render_popup_view
|
24
|
+
else
|
25
|
+
redirect_to Authorizme::after_login_path
|
26
|
+
end
|
21
27
|
end
|
22
28
|
|
23
29
|
private
|
24
|
-
|
25
|
-
def
|
26
|
-
options = {client_id: Authorizme::facebook_client_id,
|
27
|
-
|
28
|
-
@client ||= FBGraph::Client.new(options)
|
30
|
+
|
31
|
+
def set_facebook
|
32
|
+
options = {client_id: Authorizme::facebook_client_id, client_secret: Authorizme::facebook_client_secret}
|
33
|
+
@facebook = Authorizme::Provider::Facebook.new(options)
|
29
34
|
end
|
30
35
|
|
31
|
-
def authorize_user
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
unless user
|
38
|
-
attributes[:email] = user_json.email
|
36
|
+
def authorize_user facebook
|
37
|
+
fb_user = facebook.get_user
|
38
|
+
if fb_user[:email]
|
39
|
+
user = User.find_by_email(fb_user[:email])
|
40
|
+
if user
|
41
|
+
fb_user.delete(:email)
|
39
42
|
end
|
40
43
|
end
|
41
|
-
user = User.authenticate_with_facebook(
|
44
|
+
user = User.authenticate_with_facebook(facebook.get_user_json.id, fb_user, facebook.get_access_token)
|
42
45
|
login user
|
43
46
|
user
|
44
47
|
end
|
data/config/routes.rb
CHANGED
@@ -12,8 +12,6 @@ Rails.application.routes.draw do
|
|
12
12
|
get "/login/#{provider}" => "login/#{provider}#auth", :as => "#{provider}_login"
|
13
13
|
get "/login/#{provider}/callback" => "login/#{provider}#callback", :as => "#{provider}_callback"
|
14
14
|
end
|
15
|
-
|
16
|
-
post "/login/facebook/canvas" => "login/facebook#canvas", :as => "facebook_canvas"
|
17
15
|
|
18
16
|
post '/login' => 'sessions#create', :as => 'login'
|
19
17
|
get '/logout' => 'sessions#destroy', :as => 'logout'
|
@@ -19,8 +19,6 @@ module Authorizme
|
|
19
19
|
end
|
20
20
|
|
21
21
|
def login_url
|
22
|
-
puts "App key: #{@options[:draugiem_app_key]}"
|
23
|
-
puts "Redirect url: #{@options[:redirect_url]}"
|
24
22
|
hash = Digest::MD5.hexdigest(@options[:draugiem_app_key] + @options[:redirect_url])
|
25
23
|
"#{@options[:draugiem_api_authorize_path]}?app=#{@options[:draugiem_app_id]}&hash=#{hash}&redirect=#{@options[:redirect_url]}"
|
26
24
|
end
|
@@ -7,22 +7,8 @@ module Authorizme
|
|
7
7
|
attr_accessor :options
|
8
8
|
|
9
9
|
def initialize(options={})
|
10
|
-
@options =
|
11
|
-
|
12
|
-
end
|
13
|
-
|
14
|
-
def set_client
|
15
|
-
options = {client_id: Authorizme::facebook_client_id, secret_id: Authorizme::facebook_client_secret}
|
16
|
-
@client ||= FBGraph::Client.new(options)
|
17
|
-
@access_token = nil
|
18
|
-
if @options[:code] && @options[:redirect_uri]
|
19
|
-
@access_token = @client.authorization.process_callback(@options[:code], :redirect_uri => @options[:redirect_uri])
|
20
|
-
elsif @options[:signed_request]
|
21
|
-
data = FBGraph::Canvas.parse_signed_request(@options[:secret_id], @options[:signed_request])
|
22
|
-
@access_token = data["oauth_token"]
|
23
|
-
@client.set_token @access_token
|
24
|
-
end
|
25
|
-
@client
|
10
|
+
@options = options
|
11
|
+
init_client
|
26
12
|
end
|
27
13
|
|
28
14
|
def get_client
|
@@ -33,18 +19,58 @@ module Authorizme
|
|
33
19
|
@access_token
|
34
20
|
end
|
35
21
|
|
36
|
-
def
|
37
|
-
user_json
|
22
|
+
def get_user_json
|
23
|
+
@user_json ||= @client.selection.me.info!
|
24
|
+
end
|
25
|
+
|
26
|
+
def get_user
|
27
|
+
user_json = get_user_json
|
38
28
|
image_url = "https://graph.facebook.com/#{user_json.id}/picture?type=large"
|
39
29
|
attributes = {first_name: user_json.first_name, last_name: user_json.last_name, image_url: image_url, email: user_json.email}
|
40
30
|
end
|
41
31
|
|
42
|
-
def
|
43
|
-
@
|
32
|
+
def get_signed_request_data
|
33
|
+
if @signed_request_data
|
34
|
+
return @signed_request_data
|
35
|
+
else
|
36
|
+
return nil
|
37
|
+
end
|
38
|
+
end
|
39
|
+
|
40
|
+
def authorize_with_code code, redirect_uri
|
41
|
+
@access_token = @client.authorization.process_callback(code, :redirect_uri => redirect_uri)
|
42
|
+
return @access_token != nil
|
43
|
+
end
|
44
|
+
|
45
|
+
def authorize_with_signed_request signed_request
|
46
|
+
@signed_request_data = FBGraph::Canvas.parse_signed_request(@options[:client_secret], signed_request)
|
47
|
+
@access_token = @signed_request_data["oauth_token"] if @signed_request_data["oauth_token"]
|
48
|
+
@client.set_token @access_token if @client
|
49
|
+
return @access_token != nil
|
50
|
+
end
|
51
|
+
|
52
|
+
def get_popup_authorize_url callback_url, scope
|
53
|
+
@client.authorization.authorize_url(:redirect_uri => callback_url,
|
54
|
+
:scope => scope,
|
55
|
+
:display => "popup")
|
56
|
+
end
|
57
|
+
|
58
|
+
def get_dialog_authorize_url callback_url, scope
|
59
|
+
"https://www.facebook.com/dialog/oauth/?client_id=#{@options[:client_id]}&redirect_uri=#{CGI.escape(callback_url)}&scope=#{scope}"
|
44
60
|
end
|
45
61
|
|
46
62
|
private
|
47
63
|
|
64
|
+
def init_client
|
65
|
+
@client = nil
|
66
|
+
@access_token = nil
|
67
|
+
if @options[:client_id] && @options[:client_secret]
|
68
|
+
options = {client_id: @options[:client_id], secret_id: @options[:client_secret]}
|
69
|
+
@client = FBGraph::Client.new(options)
|
70
|
+
end
|
71
|
+
@client
|
72
|
+
end
|
73
|
+
|
48
74
|
end
|
49
75
|
end
|
50
76
|
end
|
data/lib/authorizme/version.rb
CHANGED
@@ -6,7 +6,13 @@ class CreateUserRoles < ActiveRecord::Migration
|
|
6
6
|
t.timestamps
|
7
7
|
end
|
8
8
|
|
9
|
-
Authorizme::UserRole.
|
9
|
+
member_role = Authorizme::UserRole.new
|
10
|
+
member_role.name = "member"
|
11
|
+
member_role.save!
|
12
|
+
|
13
|
+
admin_role = Authorizme::UserRole.new
|
14
|
+
admin_role.name = "admin"
|
15
|
+
admin_role.save!
|
10
16
|
end
|
11
17
|
|
12
18
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: authorizme
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.11
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -10,11 +10,11 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2012-06-
|
13
|
+
date: 2012-06-26 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: rake
|
17
|
-
requirement: &
|
17
|
+
requirement: &73618960 !ruby/object:Gem::Requirement
|
18
18
|
none: false
|
19
19
|
requirements:
|
20
20
|
- - ! '>='
|
@@ -22,10 +22,10 @@ dependencies:
|
|
22
22
|
version: '0'
|
23
23
|
type: :development
|
24
24
|
prerelease: false
|
25
|
-
version_requirements: *
|
25
|
+
version_requirements: *73618960
|
26
26
|
- !ruby/object:Gem::Dependency
|
27
27
|
name: rspec
|
28
|
-
requirement: &
|
28
|
+
requirement: &73617750 !ruby/object:Gem::Requirement
|
29
29
|
none: false
|
30
30
|
requirements:
|
31
31
|
- - ! '>='
|
@@ -33,10 +33,10 @@ dependencies:
|
|
33
33
|
version: '0'
|
34
34
|
type: :development
|
35
35
|
prerelease: false
|
36
|
-
version_requirements: *
|
36
|
+
version_requirements: *73617750
|
37
37
|
- !ruby/object:Gem::Dependency
|
38
38
|
name: rspec-rails
|
39
|
-
requirement: &
|
39
|
+
requirement: &73616730 !ruby/object:Gem::Requirement
|
40
40
|
none: false
|
41
41
|
requirements:
|
42
42
|
- - ! '>='
|
@@ -44,10 +44,10 @@ dependencies:
|
|
44
44
|
version: '0'
|
45
45
|
type: :development
|
46
46
|
prerelease: false
|
47
|
-
version_requirements: *
|
47
|
+
version_requirements: *73616730
|
48
48
|
- !ruby/object:Gem::Dependency
|
49
49
|
name: webrat
|
50
|
-
requirement: &
|
50
|
+
requirement: &73615080 !ruby/object:Gem::Requirement
|
51
51
|
none: false
|
52
52
|
requirements:
|
53
53
|
- - ! '>='
|
@@ -55,10 +55,10 @@ dependencies:
|
|
55
55
|
version: '0'
|
56
56
|
type: :development
|
57
57
|
prerelease: false
|
58
|
-
version_requirements: *
|
58
|
+
version_requirements: *73615080
|
59
59
|
- !ruby/object:Gem::Dependency
|
60
60
|
name: capybara
|
61
|
-
requirement: &
|
61
|
+
requirement: &73613250 !ruby/object:Gem::Requirement
|
62
62
|
none: false
|
63
63
|
requirements:
|
64
64
|
- - ! '>='
|
@@ -66,10 +66,10 @@ dependencies:
|
|
66
66
|
version: '0'
|
67
67
|
type: :development
|
68
68
|
prerelease: false
|
69
|
-
version_requirements: *
|
69
|
+
version_requirements: *73613250
|
70
70
|
- !ruby/object:Gem::Dependency
|
71
71
|
name: factory_girl_rails
|
72
|
-
requirement: &
|
72
|
+
requirement: &73612250 !ruby/object:Gem::Requirement
|
73
73
|
none: false
|
74
74
|
requirements:
|
75
75
|
- - ! '>='
|
@@ -77,10 +77,10 @@ dependencies:
|
|
77
77
|
version: '0'
|
78
78
|
type: :development
|
79
79
|
prerelease: false
|
80
|
-
version_requirements: *
|
80
|
+
version_requirements: *73612250
|
81
81
|
- !ruby/object:Gem::Dependency
|
82
82
|
name: activesupport
|
83
|
-
requirement: &
|
83
|
+
requirement: &73611560 !ruby/object:Gem::Requirement
|
84
84
|
none: false
|
85
85
|
requirements:
|
86
86
|
- - ! '>='
|
@@ -88,10 +88,10 @@ dependencies:
|
|
88
88
|
version: '0'
|
89
89
|
type: :runtime
|
90
90
|
prerelease: false
|
91
|
-
version_requirements: *
|
91
|
+
version_requirements: *73611560
|
92
92
|
- !ruby/object:Gem::Dependency
|
93
93
|
name: rails
|
94
|
-
requirement: &
|
94
|
+
requirement: &73627140 !ruby/object:Gem::Requirement
|
95
95
|
none: false
|
96
96
|
requirements:
|
97
97
|
- - ! '>='
|
@@ -99,10 +99,10 @@ dependencies:
|
|
99
99
|
version: '0'
|
100
100
|
type: :runtime
|
101
101
|
prerelease: false
|
102
|
-
version_requirements: *
|
102
|
+
version_requirements: *73627140
|
103
103
|
- !ruby/object:Gem::Dependency
|
104
104
|
name: bcrypt-ruby
|
105
|
-
requirement: &
|
105
|
+
requirement: &73626440 !ruby/object:Gem::Requirement
|
106
106
|
none: false
|
107
107
|
requirements:
|
108
108
|
- - ! '>='
|
@@ -110,10 +110,10 @@ dependencies:
|
|
110
110
|
version: '0'
|
111
111
|
type: :runtime
|
112
112
|
prerelease: false
|
113
|
-
version_requirements: *
|
113
|
+
version_requirements: *73626440
|
114
114
|
- !ruby/object:Gem::Dependency
|
115
115
|
name: json
|
116
|
-
requirement: &
|
116
|
+
requirement: &73624260 !ruby/object:Gem::Requirement
|
117
117
|
none: false
|
118
118
|
requirements:
|
119
119
|
- - ! '>='
|
@@ -121,10 +121,10 @@ dependencies:
|
|
121
121
|
version: '0'
|
122
122
|
type: :runtime
|
123
123
|
prerelease: false
|
124
|
-
version_requirements: *
|
124
|
+
version_requirements: *73624260
|
125
125
|
- !ruby/object:Gem::Dependency
|
126
126
|
name: twitter_oauth
|
127
|
-
requirement: &
|
127
|
+
requirement: &73620970 !ruby/object:Gem::Requirement
|
128
128
|
none: false
|
129
129
|
requirements:
|
130
130
|
- - ! '>='
|
@@ -132,10 +132,10 @@ dependencies:
|
|
132
132
|
version: '0'
|
133
133
|
type: :runtime
|
134
134
|
prerelease: false
|
135
|
-
version_requirements: *
|
135
|
+
version_requirements: *73620970
|
136
136
|
- !ruby/object:Gem::Dependency
|
137
137
|
name: twitter
|
138
|
-
requirement: &
|
138
|
+
requirement: &73635230 !ruby/object:Gem::Requirement
|
139
139
|
none: false
|
140
140
|
requirements:
|
141
141
|
- - ! '>='
|
@@ -143,10 +143,10 @@ dependencies:
|
|
143
143
|
version: '0'
|
144
144
|
type: :runtime
|
145
145
|
prerelease: false
|
146
|
-
version_requirements: *
|
146
|
+
version_requirements: *73635230
|
147
147
|
- !ruby/object:Gem::Dependency
|
148
148
|
name: oauth2
|
149
|
-
requirement: &
|
149
|
+
requirement: &73630450 !ruby/object:Gem::Requirement
|
150
150
|
none: false
|
151
151
|
requirements:
|
152
152
|
- - ! '>='
|
@@ -154,10 +154,10 @@ dependencies:
|
|
154
154
|
version: '0'
|
155
155
|
type: :runtime
|
156
156
|
prerelease: false
|
157
|
-
version_requirements: *
|
157
|
+
version_requirements: *73630450
|
158
158
|
- !ruby/object:Gem::Dependency
|
159
159
|
name: fbgraph
|
160
|
-
requirement: &
|
160
|
+
requirement: &73629500 !ruby/object:Gem::Requirement
|
161
161
|
none: false
|
162
162
|
requirements:
|
163
163
|
- - ! '>='
|
@@ -165,7 +165,7 @@ dependencies:
|
|
165
165
|
version: '0'
|
166
166
|
type: :runtime
|
167
167
|
prerelease: false
|
168
|
-
version_requirements: *
|
168
|
+
version_requirements: *73629500
|
169
169
|
description: Authorization that includes basic authorization and 3 social authorization
|
170
170
|
with Latvia social network draugiem.lv, facebook.com and twitter.com.
|
171
171
|
email:
|
@@ -196,6 +196,7 @@ files:
|
|
196
196
|
- app/views/authorizme/authorizme/popup.html.erb
|
197
197
|
- app/views/authorizme/layouts/authorizme.html.erb
|
198
198
|
- app/views/authorizme/layouts/popup.html.erb
|
199
|
+
- app/views/authorizme/login/facebook/auth.html.erb
|
199
200
|
- app/views/authorizme/users/new.html.erb
|
200
201
|
- authorizme.gemspec
|
201
202
|
- config/routes.rb
|
@@ -238,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
238
239
|
version: '0'
|
239
240
|
segments:
|
240
241
|
- 0
|
241
|
-
hash:
|
242
|
+
hash: -176114737
|
242
243
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
243
244
|
none: false
|
244
245
|
requirements:
|
@@ -247,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
247
248
|
version: '0'
|
248
249
|
segments:
|
249
250
|
- 0
|
250
|
-
hash:
|
251
|
+
hash: -176114737
|
251
252
|
requirements: []
|
252
253
|
rubyforge_project: authorizme
|
253
254
|
rubygems_version: 1.8.15
|