authentifyd 0.2.0 → 0.3.0

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.
Files changed (9) hide show
  1. data/app/controllers/authentifyd/registrations_controller.rb +9 -7
  2. data/app/mailers/authentifyd/devise_mailer.rb +6 -0
  3. data/app/views/authentifyd/devise_mailer/confirmation_instructions.html.erb +5 -0
  4. data/app/views/authentifyd/{devise/mailer → devise_mailer}/reset_password_instructions.html.erb +1 -1
  5. data/app/views/authentifyd/{devise/mailer → devise_mailer}/unlock_instructions.html.erb +1 -1
  6. data/lib/authentifyd/engine.rb +2 -2
  7. data/lib/authentifyd/version.rb +1 -1
  8. metadata +33 -32
  9. data/app/views/authentifyd/devise/mailer/confirmation_instructions.html.erb +0 -5
data/app/controllers/authentifyd/registrations_controller.rb CHANGED
@@ -4,7 +4,7 @@ class Authentifyd::RegistrationsController < Devise::RegistrationsController
4
4
 
5
5
  layout Authentifyd.custom_layout || 'authentifyd/application'
6
6
  before_filter :define_body_class
7
-
7
+
8
8
  def new
9
9
  # Building the resource with information that MAY BE available from omniauth!
10
10
  build_resource(:email => session[:omniauth_email])
@@ -28,22 +28,24 @@ class Authentifyd::RegistrationsController < Devise::RegistrationsController
28
28
  def build_resource(*args)
29
29
  super
30
30
 
31
+ @user.language = I18n.locale
32
+
31
33
  if session[:omniauth]
32
34
  @user.apply_omniauth(session[:omniauth])
33
35
  @user.valid?
34
36
  end
35
37
  end
36
-
38
+
37
39
  private
38
-
40
+
39
41
  def define_body_class
40
42
  @body_class = "authentifyd_registrations_#{action_name}"
41
43
  end
42
-
44
+
43
45
  alias_method :orig_after_inactive_sign_up_path_for, :after_inactive_sign_up_path_for
44
46
  def after_inactive_sign_up_path_for resource_or_scope
45
47
  new_user_session_url || orig_after_sign_up_path_for
46
48
  end
47
-
48
-
49
- end
49
+
50
+
51
+ end
data/app/mailers/authentifyd/devise_mailer.rb ADDED
@@ -0,0 +1,6 @@
1
+ module Authentifyd
2
+ class DeviseMailer < ::Devise::Mailer
3
+ helper :application # gives access to all helpers defined within `application_helper`.
4
+ include ::Devise::Controllers::UrlHelpers # Optional. eg. `confirmation_url`
5
+ end
6
+ end
data/app/views/authentifyd/devise_mailer/confirmation_instructions.html.erb ADDED
@@ -0,0 +1,5 @@
1
+ <p><%= t('Welcome') %> <%= @resource.email %>!</p>
2
+
3
+ <p><%= t('You_can_confirm_your_account_email_through_the_link_below') %></p>
4
+
5
+ <p><%= link_to t('Confirm_my_account'), confirmation_url(@resource, :confirmation_token => @resource.confirmation_token, :locale => @resource.language || I18n.locale) %></p>
data/app/views/authentifyd/{devise/mailer → devise_mailer}/reset_password_instructions.html.erb RENAMED
@@ -2,7 +2,7 @@
2
2
 
3
3
  <p><%= t("Someone_has_requested_a_link_to_change_your_password_and_you_can_do_this_through_the_link_below") %></p>
4
4
 
5
- <p><%= link_to t('Change_my_password'), edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>
5
+ <p><%= link_to t('Change_my_password'), edit_password_url(@resource, :reset_password_token => @resource.reset_password_token, :locale => @resource.language || I18n.locale) %></p>
6
6
 
7
7
  <p><%= t('If_you_didnt_request_this_please_ignore_this_email') %> </p>
8
8
  <p><%= t('Your_password_wont_change_until_you_access_the_link_above_and_create_a_new_one') %></p>
data/app/views/authentifyd/{devise/mailer → devise_mailer}/unlock_instructions.html.erb RENAMED
@@ -4,4 +4,4 @@
4
4
 
5
5
  <p><%= t('Click_the_link_below_to_unlock_your_account') %></p>
6
6
 
7
- <p><%= link_to t('Unlock_my_account'), unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p>
7
+ <p><%= link_to t('Unlock_my_account'), unlock_url(@resource, :unlock_token => @resource.unlock_token, :locale => @resource.language || I18n.locale) %></p>
data/lib/authentifyd/engine.rb CHANGED
@@ -7,9 +7,9 @@ require_relative './action_controller/base'
7
7
  module Authentifyd
8
8
  class Engine < ::Rails::Engine
9
9
  isolate_namespace Authentifyd
10
-
10
+
11
11
  config.authentifyd = ActiveSupport::OrderedOptions.new
12
-
12
+
13
13
  initializer "authentifyd.configure_omniauth_services" do |app|
14
14
  require_relative "./configuration/omniauth"
15
15
  end
data/lib/authentifyd/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Authentifyd
2
- VERSION = "0.2.0"
2
+ VERSION = "0.3.0"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: authentifyd
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.3.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-06-03 00:00:00.000000000 Z
12
+ date: 2014-06-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70226993881400 !ruby/object:Gem::Requirement
16
+ requirement: &70270396753260 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.2.9
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70226993881400
24
+ version_requirements: *70270396753260
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: devise
27
- requirement: &70226993879260 !ruby/object:Gem::Requirement
27
+ requirement: &70270396752680 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - =
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 2.1.3
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70226993879260
35
+ version_requirements: *70270396752680
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: devise-encryptable
38
- requirement: &70226993875960 !ruby/object:Gem::Requirement
38
+ requirement: &70270396752220 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - =
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 0.1.2
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70226993875960
46
+ version_requirements: *70270396752220
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: omniauth
49
- requirement: &70226993875000 !ruby/object:Gem::Requirement
49
+ requirement: &70270396751760 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - =
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 1.1.4
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70226993875000
57
+ version_requirements: *70270396751760
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: omniauth-facebook
60
- requirement: &70226993890300 !ruby/object:Gem::Requirement
60
+ requirement: &70270396751300 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - =
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.5.1
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70226993890300
68
+ version_requirements: *70270396751300
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: omniauth-twitter
71
- requirement: &70226993889380 !ruby/object:Gem::Requirement
71
+ requirement: &70270396750840 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - =
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: 1.0.0
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70226993889380
79
+ version_requirements: *70270396750840
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: omniauth-google-oauth2
82
- requirement: &70226993888320 !ruby/object:Gem::Requirement
82
+ requirement: &70270396750380 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - =
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 0.2.1
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *70226993888320
90
+ version_requirements: *70270396750380
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: haml-rails
93
- requirement: &70226993887560 !ruby/object:Gem::Requirement
93
+ requirement: &70270396749940 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,21 +98,21 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *70226993887560
101
+ version_requirements: *70270396749940
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: localyzed
104
- requirement: &70226993886320 !ruby/object:Gem::Requirement
104
+ requirement: &70270396749340 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
108
108
  - !ruby/object:Gem::Version
109
- version: 0.0.6
109
+ version: 0.1.0
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *70226993886320
112
+ version_requirements: *70270396749340
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: mysql2
115
- requirement: &70226993885680 !ruby/object:Gem::Requirement
115
+ requirement: &70270396748900 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70226993885680
123
+ version_requirements: *70270396748900
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: sqlite3
126
- requirement: &70226993884420 !ruby/object:Gem::Requirement
126
+ requirement: &70270396748420 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *70226993884420
134
+ version_requirements: *70270396748420
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: rspec-rails
137
- requirement: &70226993897820 !ruby/object:Gem::Requirement
137
+ requirement: &70270396747960 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '0'
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *70226993897820
145
+ version_requirements: *70270396747960
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: debugger
148
- requirement: &70226993896360 !ruby/object:Gem::Requirement
148
+ requirement: &70270396747500 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
153
153
  version: '0'
154
154
  type: :development
155
155
  prerelease: false
156
- version_requirements: *70226993896360
156
+ version_requirements: *70270396747500
157
157
  description: Devise + Omniauth Authentication encapsulated in an Engine. Uses Devise.
158
158
  Parts taken from perens-instant-user and sso-devise-omniauth-provider
159
159
  email:
@@ -181,6 +181,7 @@ files:
181
181
  - app/controllers/authentifyd/sessions_controller.rb
182
182
  - app/controllers/authentifyd/unlocks_controller.rb
183
183
  - app/helpers/authentifyd/application_helper.rb
184
+ - app/mailers/authentifyd/devise_mailer.rb
184
185
  - app/models/authentifyd/authentication.rb
185
186
  - app/models/authentifyd/user.rb
186
187
  - app/models/authentifyd.rb
@@ -188,10 +189,10 @@ files:
188
189
  - app/views/authentifyd/authentications/index.html.erb
189
190
  - app/views/authentifyd/authentications/link.html.erb
190
191
  - app/views/authentifyd/confirmations/new.html.erb
191
- - app/views/authentifyd/devise/mailer/confirmation_instructions.html.erb
192
- - app/views/authentifyd/devise/mailer/reset_password_instructions.html.erb
193
- - app/views/authentifyd/devise/mailer/unlock_instructions.html.erb
194
192
  - app/views/authentifyd/devise/shared/_links.erb
193
+ - app/views/authentifyd/devise_mailer/confirmation_instructions.html.erb
194
+ - app/views/authentifyd/devise_mailer/reset_password_instructions.html.erb
195
+ - app/views/authentifyd/devise_mailer/unlock_instructions.html.erb
195
196
  - app/views/authentifyd/layouts/_account_menu.html.haml
196
197
  - app/views/authentifyd/passwords/edit.html.erb
197
198
  - app/views/authentifyd/passwords/new.html.erb
data/app/views/authentifyd/devise/mailer/confirmation_instructions.html.erb DELETED
@@ -1,5 +0,0 @@
1
- <p><%= t('Welcome') %><%= @resource.email %>!</p>
2
-
3
- <p><%= t('You_can_confirm_your_account_email_through_the_link_below')</p>
4
-
5
- <p><%= link_to t('Confirm_my_account'), confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>