odania_omniauth_authentication 0.0.1 → 0.0.2
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.
- checksums.yaml +4 -4
- data/Rakefile +11 -13
- data/app/controllers/odania_omniauth_authentication/sessions_controller.rb +6 -5
- data/lib/odania_omniauth_authentication/engine.rb +3 -0
- data/lib/odania_omniauth_authentication/version.rb +1 -1
- data/test/dummy/log/development.log +16 -0
- metadata +26 -27
- data/app/helpers/odania_omniauth_authentication/session_helper.rb +0 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2a298c1df65b8915d786eca31b618e1b80d5e065
|
4
|
+
data.tar.gz: d67c988d237e32833b8fd22ffbc262eaac3608f3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d9d5c175cd9847820eba846f5954956f846035ae995e8288e1d39256a3ad07265513ebcc5a04ad9dc44e7b64302f070a54e4fb79e22ebf99fe6eb362edc63fcc
|
7
|
+
data.tar.gz: 1791d893442745dc0776d0214e5393c8d183882fded95e7ad36a71ea32a155c79a2bfd5d5b44b6543ca825169d59f2ec63f661438913cd0986f372d7973108c8
|
data/Rakefile
CHANGED
@@ -1,34 +1,32 @@
|
|
1
1
|
begin
|
2
|
-
|
2
|
+
require 'bundler/setup'
|
3
3
|
rescue LoadError
|
4
|
-
|
4
|
+
puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
|
5
5
|
end
|
6
6
|
|
7
7
|
require 'rdoc/task'
|
8
8
|
|
9
9
|
RDoc::Task.new(:rdoc) do |rdoc|
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
10
|
+
rdoc.rdoc_dir = 'rdoc'
|
11
|
+
rdoc.title = 'OdaniaOmniauthAuthentication'
|
12
|
+
rdoc.options << '--line-numbers'
|
13
|
+
rdoc.rdoc_files.include('README.rdoc')
|
14
|
+
rdoc.rdoc_files.include('lib/**/*.rb')
|
15
15
|
end
|
16
16
|
|
17
17
|
APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
|
18
18
|
load 'rails/tasks/engine.rake'
|
19
19
|
|
20
20
|
|
21
|
-
|
22
21
|
Bundler::GemHelper.install_tasks
|
23
22
|
|
24
23
|
require 'rake/testtask'
|
25
24
|
|
26
25
|
Rake::TestTask.new(:test) do |t|
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
26
|
+
t.libs << 'lib'
|
27
|
+
t.libs << 'test'
|
28
|
+
t.pattern = 'test/**/*_test.rb'
|
29
|
+
t.verbose = false
|
31
30
|
end
|
32
31
|
|
33
|
-
|
34
32
|
task default: :test
|
@@ -3,6 +3,7 @@ require_dependency "odania_omniauth_authentication/application_controller"
|
|
3
3
|
module OdaniaOmniauthAuthentication
|
4
4
|
class SessionsController < ApplicationController
|
5
5
|
skip_before_filter :verify_authenticity_token, :only => :create
|
6
|
+
before_filter :valid_site!
|
6
7
|
|
7
8
|
def new
|
8
9
|
end
|
@@ -23,20 +24,20 @@ module OdaniaOmniauthAuthentication
|
|
23
24
|
# account. But we found the identity and the user associated with it
|
24
25
|
# is the current user. So the identity is already associated with
|
25
26
|
# this user. So let's display an error message.
|
26
|
-
|
27
|
+
return redirect_back_or_default('Already linked that account')
|
27
28
|
else
|
28
29
|
# The identity is not associated with the current_user so lets
|
29
30
|
# associate the identity
|
30
31
|
@identity.user = current_user
|
31
32
|
@identity.save!
|
32
|
-
|
33
|
+
return redirect_back_or_default(t('Successfully linked that account'))
|
33
34
|
end
|
34
35
|
else
|
35
36
|
if @identity.user.present?
|
36
37
|
# The identity we found had a user associated with it so let's
|
37
38
|
# just log them in here
|
38
39
|
set_current_user(@identity.user)
|
39
|
-
|
40
|
+
return redirect_back_or_default(t('Signed in'))
|
40
41
|
else
|
41
42
|
# No user associated with the identity so we need to create a new one
|
42
43
|
user = Odania::User.new
|
@@ -50,14 +51,14 @@ module OdaniaOmniauthAuthentication
|
|
50
51
|
|
51
52
|
set_current_user(user)
|
52
53
|
|
53
|
-
|
54
|
+
return redirect_back_or_default(t('Signed in'))
|
54
55
|
end
|
55
56
|
end
|
56
57
|
end
|
57
58
|
|
58
59
|
def destroy
|
59
60
|
set_current_user(nil)
|
60
|
-
|
61
|
+
redirect_back_or_default('Signed out')
|
61
62
|
end
|
62
63
|
|
63
64
|
protected
|
@@ -12402,3 +12402,19 @@ Started GET "/assets/ckeditor/ckeditor.js?body=1" for 127.0.0.1 at 2014-04-11 20
|
|
12402
12402
|
|
12403
12403
|
|
12404
12404
|
Started GET "/assets/odania_core_admin/application.js?body=1" for 127.0.0.1 at 2014-04-11 20:37:14 +0200
|
12405
|
+
No background_enqueue defined!
|
12406
|
+
No background_enqueue defined!
|
12407
|
+
|
12408
|
+
|
12409
|
+
Started GET "/" for 127.0.0.1 at 2014-04-14 21:46:11 +0200
|
12410
|
+
Processing by Odania::MenuController#index as HTML
|
12411
|
+
[1m[36mOdania::Site Load (14.0ms)[0m [1mSELECT `odania_sites`.* FROM `odania_sites` WHERE `odania_sites`.`is_active` = 1 AND `odania_sites`.`host` = 'www.lvh.me:3001' ORDER BY `odania_sites`.`id` ASC LIMIT 1[0m
|
12412
|
+
[1m[35mOdania::Site Load (0.6ms)[0m SELECT `odania_sites`.* FROM `odania_sites` WHERE `odania_sites`.`is_active` = 1 AND `odania_sites`.`is_default` = 1 ORDER BY `odania_sites`.`id` ASC LIMIT 1
|
12413
|
+
Redirected to http://lvh.me:3000
|
12414
|
+
Filter chain halted as :valid_site! rendered or redirected
|
12415
|
+
Completed 302 Found in 33ms (ActiveRecord: 16.7ms)
|
12416
|
+
|
12417
|
+
|
12418
|
+
Started GET "/auth/identity" for 127.0.0.1 at 2014-04-14 21:46:33 +0200
|
12419
|
+
(identity) Request phase initiated.
|
12420
|
+
No background_enqueue defined!
|
metadata
CHANGED
@@ -1,167 +1,167 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: odania_omniauth_authentication
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Mike Petersen
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-04-
|
11
|
+
date: 2014-04-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- - ~>
|
17
|
+
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: 4.1.0
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- - ~>
|
24
|
+
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: 4.1.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: omniauth
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- -
|
31
|
+
- - ">="
|
32
32
|
- !ruby/object:Gem::Version
|
33
33
|
version: '0'
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
|
-
- -
|
38
|
+
- - ">="
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: '0'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: omniauth-identity
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- -
|
45
|
+
- - ">="
|
46
46
|
- !ruby/object:Gem::Version
|
47
47
|
version: '0'
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
|
-
- -
|
52
|
+
- - ">="
|
53
53
|
- !ruby/object:Gem::Version
|
54
54
|
version: '0'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: odania_core
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
|
-
- -
|
59
|
+
- - ">="
|
60
60
|
- !ruby/object:Gem::Version
|
61
61
|
version: '0'
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
|
-
- -
|
66
|
+
- - ">="
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: '0'
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: minitest
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
|
-
- -
|
73
|
+
- - ">="
|
74
74
|
- !ruby/object:Gem::Version
|
75
75
|
version: '0'
|
76
76
|
type: :development
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
|
-
- -
|
80
|
+
- - ">="
|
81
81
|
- !ruby/object:Gem::Version
|
82
82
|
version: '0'
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: minitest-reporters
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
|
-
- -
|
87
|
+
- - ">="
|
88
88
|
- !ruby/object:Gem::Version
|
89
89
|
version: '0'
|
90
90
|
type: :development
|
91
91
|
prerelease: false
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
|
-
- -
|
94
|
+
- - ">="
|
95
95
|
- !ruby/object:Gem::Version
|
96
96
|
version: '0'
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
98
|
name: factory_girl_rails
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
|
-
- -
|
101
|
+
- - ">="
|
102
102
|
- !ruby/object:Gem::Version
|
103
103
|
version: '0'
|
104
104
|
type: :development
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
|
-
- -
|
108
|
+
- - ">="
|
109
109
|
- !ruby/object:Gem::Version
|
110
110
|
version: '0'
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
112
|
name: database_cleaner
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
114
114
|
requirements:
|
115
|
-
- -
|
115
|
+
- - ">="
|
116
116
|
- !ruby/object:Gem::Version
|
117
117
|
version: '0'
|
118
118
|
type: :development
|
119
119
|
prerelease: false
|
120
120
|
version_requirements: !ruby/object:Gem::Requirement
|
121
121
|
requirements:
|
122
|
-
- -
|
122
|
+
- - ">="
|
123
123
|
- !ruby/object:Gem::Version
|
124
124
|
version: '0'
|
125
125
|
- !ruby/object:Gem::Dependency
|
126
126
|
name: sqlite3
|
127
127
|
requirement: !ruby/object:Gem::Requirement
|
128
128
|
requirements:
|
129
|
-
- -
|
129
|
+
- - ">="
|
130
130
|
- !ruby/object:Gem::Version
|
131
131
|
version: '0'
|
132
132
|
type: :development
|
133
133
|
prerelease: false
|
134
134
|
version_requirements: !ruby/object:Gem::Requirement
|
135
135
|
requirements:
|
136
|
-
- -
|
136
|
+
- - ">="
|
137
137
|
- !ruby/object:Gem::Version
|
138
138
|
version: '0'
|
139
139
|
- !ruby/object:Gem::Dependency
|
140
140
|
name: mysql2
|
141
141
|
requirement: !ruby/object:Gem::Requirement
|
142
142
|
requirements:
|
143
|
-
- -
|
143
|
+
- - ">="
|
144
144
|
- !ruby/object:Gem::Version
|
145
145
|
version: '0'
|
146
146
|
type: :development
|
147
147
|
prerelease: false
|
148
148
|
version_requirements: !ruby/object:Gem::Requirement
|
149
149
|
requirements:
|
150
|
-
- -
|
150
|
+
- - ">="
|
151
151
|
- !ruby/object:Gem::Version
|
152
152
|
version: '0'
|
153
153
|
- !ruby/object:Gem::Dependency
|
154
154
|
name: pg
|
155
155
|
requirement: !ruby/object:Gem::Requirement
|
156
156
|
requirements:
|
157
|
-
- -
|
157
|
+
- - ">="
|
158
158
|
- !ruby/object:Gem::Version
|
159
159
|
version: '0'
|
160
160
|
type: :development
|
161
161
|
prerelease: false
|
162
162
|
version_requirements: !ruby/object:Gem::Requirement
|
163
163
|
requirements:
|
164
|
-
- -
|
164
|
+
- - ">="
|
165
165
|
- !ruby/object:Gem::Version
|
166
166
|
version: '0'
|
167
167
|
description: The Odania Portal is an open source portal system with strong focus on
|
@@ -178,7 +178,6 @@ files:
|
|
178
178
|
- app/controllers/odania_omniauth_authentication/application_controller.rb
|
179
179
|
- app/controllers/odania_omniauth_authentication/sessions_controller.rb
|
180
180
|
- app/helpers/odania_omniauth_authentication/application_helper.rb
|
181
|
-
- app/helpers/odania_omniauth_authentication/session_helper.rb
|
182
181
|
- app/models/odania_omniauth_authentication/identity.rb
|
183
182
|
- app/models/odania_omniauth_authentication/user_authentication.rb
|
184
183
|
- app/views/odania_omniauth_authentication/sessions/new.html.erb
|
@@ -1309,12 +1308,12 @@ require_paths:
|
|
1309
1308
|
- lib
|
1310
1309
|
required_ruby_version: !ruby/object:Gem::Requirement
|
1311
1310
|
requirements:
|
1312
|
-
- -
|
1311
|
+
- - ">="
|
1313
1312
|
- !ruby/object:Gem::Version
|
1314
1313
|
version: '0'
|
1315
1314
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
1316
1315
|
requirements:
|
1317
|
-
- -
|
1316
|
+
- - ">="
|
1318
1317
|
- !ruby/object:Gem::Version
|
1319
1318
|
version: '0'
|
1320
1319
|
requirements: []
|