nyauth 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd6e65944c1dc06e5b03ed7744365a09f3611cb5
-  data.tar.gz: 91ae82f9fd0543b01abb601a2a8f780e54dd92ad
+  metadata.gz: 7aa459a7489bcf471b35e7d148e1f76c6f9fbc0c
+  data.tar.gz: 5814355e8fc532c97fb10e3d31cdc971170cddd0
 SHA512:
-  metadata.gz: 2ac0d0c2c4a60a97a29f42a03cc71800d74a046944e3ed64e5ebb82a07d4d6f30a2b3d96228c4a3e67e5f21be4013dd5495f21ff383510322b173b4778b72627
-  data.tar.gz: 2deefd3ca405a7686c3e1a5c6eccdfc3e12f27c48bf09279fff447167f258e1968ae69ea9fd7441afca7f4404d64c14ab6f8a97c9bb50befcb908ed9998849d6
+  metadata.gz: 2e1afbec3759f152cbfb0aa08dbe73a1d31586cf760c15b81ec7443c69800ecff3eb3b821b64e366c7a721427554d5003a72f9fa73f1a2beb7c3ea05823279c5
+  data.tar.gz: 7cfa5125de5e68bd175e0ee00daea93865a1e18b66972d27dcd5ca9b270db811798a5431a45145662398ac5fa2d7cf159c0db1444e47fdca080e7204e1c4cebe

data/README.md

@@ -21,8 +21,8 @@ class CreateUsers < ActiveRecord::Migration
       t.datetime :confirmed_at
       t.string :confirmation_key
       t.datetime :confirmation_key_expired_at
-      t.string :new_password_key
-      t.datetime :new_password_key_expired_at
+      t.string :reset_password_key
+      t.datetime :reset_password_key_expired_at
 
       t.timestamps null: false
     end
@@ -37,7 +37,7 @@ end
 class User < ActiveRecord::Base
   include Nyauth::Authenticatable
   include Nyauth::Confirmable
-  include Nyauth::NewPasswordAbility
+  include Nyauth::ResetPasswordAbility
 end
 ```
 
@@ -64,23 +64,22 @@ Prefix Verb URI Pattern Controller#Action
 nyauth      /nyauth     Nyauth::Engine
 
 Routes for Nyauth::Engine:
-            registration POST   /registration(.:format)                         nyauth/registrations#create
-        new_registration GET    /registration/new(.:format)                     nyauth/registrations#new
-                 session POST   /session(.:format)                              nyauth/sessions#create
-             new_session GET    /session/new(.:format)                          nyauth/sessions#new
-                         DELETE /session(.:format)                              nyauth/sessions#destroy
-           edit_password GET    /password/edit(.:format)                        nyauth/passwords#edit
-                password PATCH  /password(.:format)                             nyauth/passwords#update
-                         PUT    /password(.:format)                             nyauth/passwords#update
-   confirmation_requests POST   /confirmation_requests(.:format)                nyauth/confirmation_requests#create
-new_confirmation_request GET    /confirmation_requests/new(.:format)            nyauth/confirmation_requests#new
-            confirmation GET    /confirmations/:confirmation_key(.:format)      nyauth/confirmations#update
-   new_password_requests POST   /new_password_requests(.:format)                nyauth/new_password_requests#create
-new_new_password_request GET    /new_password_requests/new(.:format)            nyauth/new_password_requests#new
-       edit_new_password GET    /new_passwords/:new_password_key/edit(.:format) nyauth/new_passwords#edit
-            new_password PATCH  /new_passwords/:new_password_key(.:format)      nyauth/new_passwords#update
-                         PUT    /new_passwords/:new_password_key(.:format)      nyauth/new_passwords#update
-                    root GET    /                                               nyauth/sessions#new
+              registration POST   /registration(.:format)                             nyauth/registrations#create
+          new_registration GET    /registration/new(.:format)                         nyauth/registrations#new
+                   session POST   /session(.:format)                                  nyauth/sessions#create
+               new_session GET    /session/new(.:format)                              nyauth/sessions#new
+                           DELETE /session(.:format)                                  nyauth/sessions#destroy
+             edit_password GET    /password/edit(.:format)                            nyauth/passwords#edit
+                  password PATCH  /password(.:format)                                 nyauth/passwords#update
+                           PUT    /password(.:format)                                 nyauth/passwords#update
+     confirmation_requests POST   /confirmation_requests(.:format)                    nyauth/confirmation_requests#create
+  new_confirmation_request GET    /confirmation_requests/new(.:format)                nyauth/confirmation_requests#new
+              confirmation GET    /confirmations/:confirmation_key(.:format)          nyauth/confirmations#update
+   reset_password_requests POST   /reset_password_requests(.:format)                  nyauth/reset_password_requests#create
+new_reset_password_request GET    /reset_password_requests/new(.:format)              nyauth/reset_password_requests#new
+       edit_reset_password GET    /reset_passwords/:reset_password_key/edit(.:format) nyauth/reset_passwords#edit
+            reset_password PATCH  /reset_passwords/:reset_password_key(.:format)      nyauth/reset_passwords#update
+                           PUT    /reset_passwords/:reset_password_key(.:format)      nyauth/reset_passwords#update
 ```
 
 ```

data/app/controllers/nyauth/{new_password_requests_controller.rb → reset_password_requests_controller.rb}

@@ -1,18 +1,18 @@
 module Nyauth
-  class NewPasswordRequestsController < ApplicationController
+  class ResetPasswordRequestsController < ApplicationController
     include Nyauth::ApplicationConcern
     include Nyauth::ClientConcern
     allow_everyone
     respond_to :html, :json
     before_action :set_client, only: [:create]
-    after_action :send_mail, only: [:create], if: -> { @client.new_password_key.present? }
+    after_action :send_mail, only: [:create], if: -> { @client.reset_password_key.present? }
 
     def new
     end
 
     def create
-      @client.request_new_password
-      respond_with(@client, location: Nyauth.configuration.redirect_path_after_new_password_request || main_app.root_path)
+      @client.request_reset_password
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_reset_password_request || main_app.root_path)
     end
 
     private
@@ -24,7 +24,7 @@ module Nyauth
     end
 
     def send_mail
-      Nyauth::RequestMailer.request_new_password(@client).deliver_now
+      Nyauth::RequestMailer.request_reset_password(@client).deliver_now
     end
   end
 end

data/app/controllers/nyauth/{new_passwords_controller.rb → reset_passwords_controller.rb}

@@ -1,5 +1,5 @@
 module Nyauth
-  class NewPasswordsController < ApplicationController
+  class ResetPasswordsController < ApplicationController
     include Nyauth::ApplicationConcern
     include Nyauth::ClientConcern
     allow_everyone
@@ -10,14 +10,14 @@ module Nyauth
     end
 
     def update
-      @client.update_new_password(client_params)
-      respond_with(@client, location: Nyauth.configuration.redirect_path_after_update_new_password || new_session_path_for(client_name))
+      @client.reset_password(client_params)
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_reset_password || new_session_path_for(client_name))
     end
 
     private
 
     def set_client
-      @client = client_class.find_by!(new_password_key: params[:new_password_key])
+      @client = client_class.find_by!(reset_password_key: params[:reset_password_key])
     end
 
     def client_params

data/app/mailers/nyauth/request_mailer.rb

@@ -7,7 +7,7 @@ module Nyauth
       mail to: client.email
     end
 
-    def request_new_password(client)
+    def request_reset_password(client)
       @client = client
       mail to: client.email
     end

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

@@ -1,7 +1,6 @@
 module Nyauth
   module PasswordDigestAbility
     extend ActiveSupport::Concern
-    DIGEST_STRETCHES = 1000
 
     included do
       attr_accessor :password, :password_confirmation
@@ -19,7 +18,7 @@ module Nyauth
     private
 
     def generate_password_digest(password)
-      DIGEST_STRETCHES.times do
+      Nyauth.configuration.password_digest_stretches.times do
         password = Digest::SHA256.hexdigest("#{password}#{password_salt}")
       end
       password

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

@@ -0,0 +1,35 @@
+module Nyauth
+  module ResetPasswordAbility
+    extend ActiveSupport::Concern
+
+    included do
+      before_validation :check_reset_password_key, on: :reset_password
+      validates :email, email: { strict_mode: false }
+      validates :password, presence: true,
+                           length: { minimum: Nyauth.configuration.password_minium },
+                           on: [:create, :update_password, :reset_password]
+      validates :password, confirmation: true
+    end
+
+    def reset_password(params)
+      self.attributes = params
+      self.save(context: :reset_password)
+    end
+
+    def request_reset_password
+      self.reset_password_key = SecureRandom.hex(32)
+      self.reset_password_key_expired_at = Time.current + 1.hour
+      save
+    end
+
+    private
+
+    def check_reset_password_key
+      if reset_password_key_expired_at.past?
+        errors.add(:reset_password_key, :expired)
+      else
+        self.reset_password_key = nil
+      end
+    end
+  end
+end

data/app/views/nyauth/request_mailer/request_reset_password.html.slim

@@ -0,0 +1,2 @@
+p Plese set your new password
+p = link_to 'set new password', edit_reset_password_url(@client.reset_password_key)

data/app/views/nyauth/request_mailer/request_reset_password.text.erb

@@ -0,0 +1,3 @@
+Plese set your new password
+
+<%= edit_reset_password_url(@client.reset_password_key) %>

data/app/views/nyauth/reset_password_requests/new.html.slim

@@ -0,0 +1,5 @@
+= form_for(client_class.new, url: reset_password_requests_path_for(client_name), mehotd: :post, html: { class: 'pure-form' }) do |f|
+  fieldset
+    legend= t 'nav.reset_password_requests.new'
+  = f.text_field(:email, placeholder: :email)
+  = f.submit 'reset password', data: { disable_with: '...' }, class: 'pure-button pure-button-primary'

data/app/views/nyauth/{new_passwords → reset_passwords}/edit.html.slim

@@ -1,4 +1,4 @@
-= form_for(@client, url: new_password_path_for(client_name, params[:new_password_key]), html: { class: 'pure-form pure-form-stacked' }) do |f|
+= form_for(@client, url: reset_password_path_for(client_name, params[:reset_password_key]), html: { class: 'pure-form pure-form-stacked' }) do |f|
   fieldset
     legend
     - if @client.errors.present?

data/config/locales/en.yml

@@ -9,7 +9,7 @@ en:
       edit: 'Edit Profiles'
     confirmation_requests:
       new: 'Re send confirmation request'
-    new_password_requests:
+    reset_password_requests:
       new: 'New password request'
     profiles:
       edit: 'Profiles'
@@ -35,10 +35,10 @@ en:
       confirmation_requests:
         create:
           notice: 'sent mail'
-      new_password_requests:
+      reset_password_requests:
         create:
           notice: 'sent mail'
-      new_passwords:
+      reset_passwords:
         update:
           notice: 'updated password'
       group_requests:

data/config/routes.rb

@@ -4,7 +4,7 @@ Nyauth::Engine.routes.draw do
   resource :password, only: %i(edit update)
   resources :confirmation_requests, only: %i(new create)
   get '/confirmations/:confirmation_key' => 'confirmations#update', as: :confirmation
-  resources :new_password_requests, only: %i(new create)
-  resources :new_passwords, param: :new_password_key, only: %i(edit update)
+  resources :reset_password_requests, only: %i(new create)
+  resources :reset_passwords, param: :reset_password_key, only: %i(edit update)
   Nyauth.configuration.setup_redirect_path
 end

data/lib/nyauth/configuration.rb

@@ -6,9 +6,11 @@ module Nyauth
                   :redirect_path_after_registration,
                   :redirect_path_after_create_request_confirmation,
                   :redirect_path_after_update_confirmation,
-                  :redirect_path_after_new_password_request,
-                  :redirect_path_after_update_new_password,
-                  :redirect_path_after_update_password
+                  :redirect_path_after_reset_password_request,
+                  :redirect_path_after_reset_password,
+                  :redirect_path_after_update_password,
+                  :password_minium,
+                  :password_digest_stretches
 
 
     def initialize
@@ -17,9 +19,11 @@ module Nyauth
       @redirect_path_after_registration = nil
       @redirect_path_after_create_request_confirmation = nil
       @redirect_path_after_update_confirmation = nil
-      @redirect_path_after_new_password_request = nil
-      @redirect_path_after_update_new_password = nil
+      @redirect_path_after_reset_password_request = nil
+      @redirect_path_after_reset_password = nil
       @redirect_path_after_update_password = nil
+      @password_minium = 8
+      @password_digest_stretches = 1000
       @redirect_path_block = Proc.new {}
     end
 

data/lib/nyauth/version.rb

@@ -1,3 +1,3 @@
 module Nyauth
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/spec/dummy/app/models/user.rb

@@ -1,5 +1,5 @@
 class User < ActiveRecord::Base
   include Nyauth::Authenticatable
   include Nyauth::Confirmable
-  include Nyauth::NewPasswordAbility
+  include Nyauth::ResetPasswordAbility
 end

data/spec/dummy/db/migrate/20150303135922_create_users.rb

@@ -8,8 +8,8 @@ class CreateUsers < ActiveRecord::Migration
       t.datetime :confirmed_at
       t.string :confirmation_key
       t.datetime :confirmation_key_expired_at
-      t.string :new_password_key
-      t.datetime :new_password_key_expired_at
+      t.string :reset_password_key
+      t.datetime :reset_password_key_expired_at
 
       t.timestamps null: false
     end

data/spec/dummy/db/schema.rb

@@ -24,17 +24,17 @@ ActiveRecord::Schema.define(version: 20150317141956) do
   add_index "admins", ["email"], name: "index_admins_on_email", unique: true
 
   create_table "users", force: :cascade do |t|
-    t.string   "email",                       null: false
-    t.string   "password_digest",             null: false
-    t.string   "password_salt",               null: false
+    t.string   "email",                         null: false
+    t.string   "password_digest",               null: false
+    t.string   "password_salt",                 null: false
     t.string   "nickname"
     t.datetime "confirmed_at"
     t.string   "confirmation_key"
     t.datetime "confirmation_key_expired_at"
-    t.string   "new_password_key"
-    t.datetime "new_password_key_expired_at"
-    t.datetime "created_at",                  null: false
-    t.datetime "updated_at",                  null: false
+    t.string   "reset_password_key"
+    t.datetime "reset_password_key_expired_at"
+    t.datetime "created_at",                    null: false
+    t.datetime "updated_at",                    null: false
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true

data/spec/dummy/log/development.log

@@ -3566,3 +3566,54 @@ Started GET "/" for 127.0.0.1 at 2015-06-23 00:15:35 +0900
 Processing by PagesController#index as HTML
   Rendered pages/index.html.slim within layouts/application (0.1ms)
 Completed 200 OK in 20ms (Views: 19.5ms | ActiveRecord: 0.0ms)
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_admins_on_email' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_admins_on_email' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_email' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_email' AND type='index'
+
+   (2.2ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.3ms)  select sqlite_version(*)
+   (0.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateUsers (20150303135922)
+   (0.0ms)  begin transaction
+   (0.3ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar NOT NULL, "password_digest" varchar NOT NULL, "password_salt" varchar NOT NULL, "nickname" varchar, "confirmed_at" datetime, "confirmation_key" varchar, "confirmation_key_expired_at" datetime, "reset_password_key" varchar, "reset_password_key_expired_at" datetime, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.3ms)  CREATE UNIQUE INDEX "index_users_on_email" ON "users" ("email")
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150303135922"]]
+   (0.8ms)  commit transaction
+Migrating to CreateAdmins (20150317141956)
+   (0.0ms)  begin transaction
+   (0.3ms)  CREATE TABLE "admins" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar NOT NULL, "password_digest" varchar NOT NULL, "password_salt" varchar NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.3ms)  CREATE UNIQUE INDEX "index_admins_on_email" ON "admins" ("email")
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20150317141956"]]
+   (0.7ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_admins_on_email' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_admins_on_email' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_email' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_email' AND type='index'
+