nyauth 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81cfbcefaf5c3f92dbd8937cd999481e3863aed6
-  data.tar.gz: ddad74740d111f1e0adbdd4689020ada40e8d4b0
+  metadata.gz: 8a34d8d2548f9a885e7460318e03b5b4f99c7041
+  data.tar.gz: 66c7edf2dd7f42f166e55fe5f9aebad192ebbf24
 SHA512:
-  metadata.gz: 68e8227c95cd08c4fa2ec26ffd6b59d18aeaa23e5b1abde5241205c8ea4edce53375cb8da871c58a30a034d71e52184ffd743406c5826d1464d58a4cbadd4a56
-  data.tar.gz: 3c3651402abd49496a1bbbac2398193b6d6f5decdcc070f3c3868fa98103e61013c1f3ec5f901fa51688bd8f389b4bfb50a4d517106dd71aa4dc9a36f77fcec2
+  metadata.gz: 17a52d6ab151cce6bd3f54576ba56b4977f9d1195d0ef15963c37eeee941e339f08507be7fccd2321b373c5acc29bcf60652aeda0bd3a28877c014dee7fa68ef
+  data.tar.gz: 297bfd29c5fa6581ea4509433e5af0ab9e7f1f394b83d87152643e6fea0dca8c91dd1bccb46f058070fe16b4a453ade7d9c767052d2e1053e3097f9eb9c56c47

data/README.md

@@ -130,6 +130,8 @@ Or edit `config/initializers/nyauth.rb`
 ```
 nyauth.configure do |config|
   config.encryption_secret = ENV['NYAUTH_ENCRYPTION_SECRET'] || ENV['SECRET_KEY_BASE']
+  config.confirmation_expire_limit = 1.hour
+  config.reset_password_expire_limit = 1.hour
   config.redirect_path do |urls|
     # config.redirect_path_after_sign_in = -> (client_name) {
     #  if client_name == :admin
@@ -149,3 +151,41 @@ nyauth.configure do |config|
   end
 end
 ```
+
+I18n
+
+```
+ja:
+  flash:
+    nyauth:
+      passwords:
+        update:
+          notice: 'パスワードを更新しました'
+      registrations:
+        create:
+          notice: '登録完了しました'
+      sessions:
+        create:
+          notice: 'ログインしました'
+        destroy:
+          notice: 'ログアウトしました'
+      confirmations:
+        update:
+          notice: 'メールアドレスの確認をしました'
+      confirmation_requests:
+        create:
+          notice: 'メールアドレスへ確認メールを送信しました'
+      reset_password_requests:
+        create:
+          notice: 'メールアドレスへパスワードリセットの案内を送信しました'
+      reset_passwords:
+        update:
+          notice: 'パスワードを再設定しました'
+  activerecord:
+    errors:
+      messages:
+        key_expired: 'URLの有効期限が切れてしまいました'
+  errors:
+    messages:
+      invalid_email_or_password: 'ログイン情報に誤りがあります'
+```

data/app/controllers/nyauth/reset_passwords_controller.rb

@@ -7,6 +7,9 @@ module Nyauth
     before_action :set_client
 
     def edit
+      unless @client.valid?(:edit_reset_password)
+        redirect_to new_session_path_for(client_name), alert: @client.errors[:reset_password_key].last
+      end
     end
 
     def update

data/app/models/concerns/nyauth/confirmable.rb

@@ -17,7 +17,7 @@ module Nyauth
 
     def request_confirmation
       self.confirmation_key = SecureRandom.hex(32)
-      self.confirmation_key_expired_at = Time.current + 1.hour
+      self.confirmation_key_expired_at = Time.current + Nyauth.configuration.confirmation_expire_limit
       save
     end
 
@@ -25,7 +25,7 @@ module Nyauth
 
     def check_confirmation_key
       if confirmation_key_expired_at.past?
-        errors.add(:confirmation_key, :expired)
+        errors.add(:confirmation_key, :key_expired)
       else
         self.confirmation_key = nil
       end

data/app/models/concerns/nyauth/reset_password_ability.rb

@@ -3,7 +3,7 @@ module Nyauth
     extend ActiveSupport::Concern
 
     included do
-      before_validation :check_reset_password_key, on: :reset_password
+      before_validation :check_reset_password_key, on: %i(reset_password edit_reset_password)
       validates :password, presence: true,
                            length: { minimum: Nyauth.configuration.password_minium },
                            on: [:create, :update_password, :reset_password]
@@ -17,7 +17,7 @@ module Nyauth
 
     def request_reset_password
       self.reset_password_key = SecureRandom.hex(32)
-      self.reset_password_key_expired_at = Time.current + 1.hour
+      self.reset_password_key_expired_at = Time.current + Nyauth.configuration.reset_password_expire_limit
       save
     end
 
@@ -25,7 +25,7 @@ module Nyauth
 
     def check_reset_password_key
       if reset_password_key_expired_at.past?
-        errors.add(:reset_password_key, :expired)
+        errors.add(:reset_password_key, :key_expired)
       else
         self.reset_password_key = nil
       end

data/app/services/nyauth/session_service.rb

@@ -12,10 +12,10 @@ module Nyauth
       options.reverse_merge!(as: :user)
       klass = options[:as].to_s.classify.constantize
       @client = klass.authenticate(email, password)
-      errors.add(:client, 'invalid email or password') unless @client
+      errors.add(:base, :invalid_email_or_password) unless @client
       client
     rescue
-      errors.add(:client, 'invalid email or password')
+      errors.add(:base, :invalid_email_or_password)
     end
   end
 end

data/config/locales/en.yml

@@ -1,23 +1,6 @@
 en:
-  nav:
-    sessions:
-      new: 'Sign in'
-      destroy: 'Sign out'
-    registrations:
-      new: 'Sign up'
-    profiles:
-      edit: 'Edit Profiles'
-    confirmation_requests:
-      new: 'Re send confirmation request'
-    reset_password_requests:
-      new: 'New password request'
-    profiles:
-      edit: 'Profiles'
   flash:
     nyauth:
-      profiles:
-        update:
-          notice: 'updated profiles'
       passwords:
         update:
           notice: 'updated password'
@@ -41,6 +24,10 @@ en:
       reset_passwords:
         update:
           notice: 'updated password'
-      group_requests:
-        create:
-          notice: 'sent request'
+  activerecord:
+    errors:
+      messages:
+        key_expired: 'This URL is expired'
+  errors:
+    messages:
+      invalid_email_or_password: 'Invalid email or password'

data/config/locales/ja.yml

@@ -0,0 +1,33 @@
+ja:
+  flash:
+    nyauth:
+      passwords:
+        update:
+          notice: 'パスワードを更新しました'
+      registrations:
+        create:
+          notice: '登録完了しました'
+      sessions:
+        create:
+          notice: 'ログインしました'
+        destroy:
+          notice: 'ログアウトしました'
+      confirmations:
+        update:
+          notice: 'メールアドレスの確認をしました'
+      confirmation_requests:
+        create:
+          notice: 'メールアドレスへ確認メールを送信しました'
+      reset_password_requests:
+        create:
+          notice: 'メールアドレスへパスワードリセットの案内を送信しました'
+      reset_passwords:
+        update:
+          notice: 'パスワードを再設定しました'
+  activerecord:
+    errors:
+      messages:
+        key_expired: 'URLの有効期限が切れてしまいました'
+  errors:
+    messages:
+      invalid_email_or_password: 'ログイン情報に誤りがあります'

data/lib/generators/nyauth/templates/nyauth_install_initializer.rb

@@ -1,5 +1,7 @@
 Nyauth.configure do |config|
   config.encryption_secret = ENV['NYAUTH_ENCRYPTION_SECRET']
+  config.confirmation_expire_limit = 1.hour
+  config.reset_password_expire_limit = 1.hour
   config.redirect_path do |urls|
     # config.redirect_path_after_sign_in = -> (client_name) {
     #  if client_name == :admin

data/lib/nyauth/configuration.rb

@@ -9,6 +9,8 @@ module Nyauth
                   :redirect_path_after_reset_password_request,
                   :redirect_path_after_reset_password,
                   :redirect_path_after_update_password,
+                  :confirmation_expire_limit,
+                  :reset_password_expire_limit,
                   :password_minium,
                   :password_digest_stretches,
                   :encryption_secret
@@ -23,6 +25,8 @@ module Nyauth
       @redirect_path_after_reset_password_request = Proc.new {}
       @redirect_path_after_reset_password = Proc.new {}
       @redirect_path_after_update_password = Proc.new {}
+      @confirmation_expire_limit = 1.hour
+      @reset_password_expire_limit = 1.hour
       @password_minium = 8
       @password_digest_stretches = 1000
       @encryption_secret = ENV['NYAUTH_ENCRYPTION_SECRET']

data/lib/nyauth/engine.rb

@@ -10,8 +10,6 @@ module Nyauth
   class Engine < ::Rails::Engine
     isolate_namespace Nyauth
 
-    config.nyauth = ActiveSupport::OrderedOptions.new
-    config.nyauth.admin = 'admin'
     config.i18n.load_path += Dir[Engine.root.join('config', 'locales', '**', '*.{rb,yml}').to_s]
     config.generators do |g|
       g.test_framework      :rspec,        fixture: false

data/lib/nyauth/version.rb

@@ -1,3 +1,3 @@
 module Nyauth
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -12,7 +12,7 @@
 <% if flash[:notice] %>
   <%= flash[:notice] %>
 <% end %>
-<% if flash[:notice] %>
+<% if flash[:alert] %>
   <%= flash[:alert] %>
 <% end %>
 <%= link_to "URL helper on application", posts_path %>