nyauth 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f7b92e040021887635fc5cd0c21427d7afc72a3
-  data.tar.gz: 489d0039f87c0481e739cbe48d9106a74091ae5f
+  metadata.gz: 81cfbcefaf5c3f92dbd8937cd999481e3863aed6
+  data.tar.gz: ddad74740d111f1e0adbdd4689020ada40e8d4b0
 SHA512:
-  metadata.gz: bb13e17f77ddab00ead54b2f455662c09f21bdc5980a945358e2a61833f7ba1416bb0ecd8feb6053c0916b3fcc38966a02c44229c0d42aac64e634382bfacd3c
-  data.tar.gz: 91814e70d9698c204632932ecdbc142dfd16c6dbde8caa1187307d0b54bca9f865446404eb60607f998972781307375860fedbf70d07dcb40e4c2d6b085183a8
+  metadata.gz: 68e8227c95cd08c4fa2ec26ffd6b59d18aeaa23e5b1abde5241205c8ea4edce53375cb8da871c58a30a034d71e52184ffd743406c5826d1464d58a4cbadd4a56
+  data.tar.gz: 3c3651402abd49496a1bbbac2398193b6d6f5decdcc070f3c3868fa98103e61013c1f3ec5f901fa51688bd8f389b4bfb50a4d517106dd71aa4dc9a36f77fcec2

data/README.md

@@ -44,6 +44,13 @@ class User < ActiveRecord::Base
 end
 ```
 
+```ruby
+class Admin < ActiveRecord::Base
+  include Nyauth::Authenticatable
+  #include Nyauth::Confirmable
+end
+```
+
 ### config/routes.rb
 
 ```ruby
@@ -98,6 +105,47 @@ new_session_path_for(:admin) # /admin/session/new
 rails g nyauth:install
 ```
 
+```
+rails g nyauth <MODEL>
+rails g nyauth User
+rails g nyauth Admin
+```
+
 ```
 rails g nyauth:views
 ```
+
+### Customize
+
+Change redirect path after action.
+
+Please set NYAUTH_ENCRYPTION_SECRET ENV like following.
+
+```
+export NYAUTH_ENCRYPTION_SECRET=`bundle exec rake secret`
+```
+
+Or edit `config/initializers/nyauth.rb`
+
+```
+nyauth.configure do |config|
+  config.encryption_secret = ENV['NYAUTH_ENCRYPTION_SECRET'] || ENV['SECRET_KEY_BASE']
+  config.redirect_path do |urls|
+    # config.redirect_path_after_sign_in = -> (client_name) {
+    #  if client_name == :admin
+    #    urls.admin_secret_notes_path
+    #  else
+    #    urls.root_path
+    #  end
+    #}
+    # config.redirect_path_after_sign_in = -> (client_name) {}
+    # config.redirect_path_after_sign_out = -> (client_name) {}
+    # config.redirect_path_after_registration = -> (client_name) {}
+    # config.redirect_path_after_create_request_confirmation = -> (client_name) {}
+    # config.redirect_path_after_update_confirmation = -> (client_name) {}
+    # config.redirect_path_after_reset_password_request = -> (client_name) {}
+    # config.redirect_path_after_reset_password = -> (client_name) {}
+    # config.redirect_path_after_update_password = -> (client_name) {}
+  end
+end
+```

data/app/controllers/nyauth/confirmation_requests_controller.rb

@@ -12,7 +12,7 @@ module Nyauth
 
     def create
       @client.request_confirmation
-      respond_with(@client, location: Nyauth.configuration.redirect_path_after_create_request_confirmation || main_app.root_path)
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_create_request_confirmation.call(client_name) || main_app.root_path)
     end
 
     private

data/app/controllers/nyauth/confirmations_controller.rb

@@ -9,7 +9,7 @@ module Nyauth
 
     def update
       @client.confirm
-      respond_with(@client, location: Nyauth.configuration.redirect_path_after_update_confirmation || main_app.root_path)
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_update_confirmation.call(client_name) || main_app.root_path)
     end
 
     private

data/app/controllers/nyauth/passwords_controller.rb

@@ -11,7 +11,7 @@ module Nyauth
     def update
       @client.attributes = client_params
       @client.save(context: :update_password)
-      respond_with(@client, location: Nyauth.configuration.redirect_path_after_update_password || main_app.root_path)
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_update_password.call(client_name) || main_app.root_path)
     end
 
     private

data/app/controllers/nyauth/registrations_controller.rb

@@ -11,7 +11,7 @@ module Nyauth
 
     def create
       sign_in(@client) if @client.save
-      respond_with(@client, location: Nyauth.configuration.redirect_path_after_registration || main_app.root_path)
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_registration.call(client_name) || main_app.root_path)
     end
 
     private

data/app/controllers/nyauth/reset_password_requests_controller.rb

@@ -12,7 +12,7 @@ module Nyauth
 
     def create
       @client.request_reset_password
-      respond_with(@client, location: Nyauth.configuration.redirect_path_after_reset_password_request || main_app.root_path)
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_reset_password_request.call(client_name) || main_app.root_path)
     end
 
     private

data/app/controllers/nyauth/reset_passwords_controller.rb

@@ -11,7 +11,7 @@ module Nyauth
 
     def update
       @client.reset_password(client_params)
-      respond_with(@client, location: Nyauth.configuration.redirect_path_after_reset_password || new_session_path_for(client_name))
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_reset_password.call(client_name) || new_session_path_for(client_name))
     end
 
     private

data/app/controllers/nyauth/sessions_controller.rb

@@ -11,12 +11,12 @@ module Nyauth
 
     def create
       sign_in(@session_service.client) if @session_service.save(as: client_name)
-      respond_with @session_service, location: Nyauth.configuration.redirect_path_after_sign_in || main_app.root_path
+      respond_with @session_service, location: Nyauth.configuration.redirect_path_after_sign_in.call(client_name) || main_app.root_path
     end
 
     def destroy
       sign_out
-      respond_with @session_service, location: Nyauth.configuration.redirect_path_after_sign_out || new_session_path
+      respond_with @session_service, location: Nyauth.configuration.redirect_path_after_sign_out.call(client_name) || new_session_path
     end
 
     private

data/app/helpers/nyauth/application_helper.rb

@@ -14,7 +14,8 @@ module Nyauth
     def detect_url_helper(feature, client_name, *args)
       @__methods ||= Nyauth::Engine.routes.url_helpers.instance_methods + Rails.application.routes.url_helpers.instance_methods
       @__candidates ||= @__methods.reject{|m| m =~ /\A(:?rails_|_)/}.map(&:to_s)
-      if client_name.to_sym == :user
+      if respond_to?(:nyauth) && client_name.to_sym == :user
+        # mounted as nyauth
         detect_url_helper_for_nyauth(feature, *args)
       else
         detect_url_helper_for_app(feature, client_name, *args)

data/lib/generators/nyauth/nyauth_generator.rb

@@ -0,0 +1,56 @@
+require 'rails/generators/active_record'
+
+class Nyauth::NyauthGenerator < ActiveRecord::Generators::Base
+  source_root File.expand_path("../templates", __FILE__)
+  
+  def copy_nyauth_migration
+    migration_template "migration.rb", "db/migrate/add_nyauth_to_#{table_name}.rb"
+  end
+  
+  def inject_devise_content
+    content = model_contents
+
+    class_path = if namespaced?
+      class_name.to_s.split("::")
+    else
+      [class_name]
+    end
+
+    indent_depth = class_path.size - 1
+    content = content.split("\n").map { |line| "  " * indent_depth + line } .join("\n") << "\n"
+
+    inject_into_class(model_path, class_path.last, content) if model_exists?
+  end
+  
+  def migration_data
+<<RUBY
+      # Authenticatable
+      t.string :email, null: false
+      t.string :password_digest, null: false
+      t.string :password_salt, null: false
+      t.string :reset_password_key
+      t.datetime :reset_password_key_expired_at
+      # Confirmable
+      #t.datetime :confirmed_at
+      #t.string :confirmation_key
+      #t.datetime :confirmation_key_expired_at
+RUBY
+  end
+  
+  def model_contents
+<<RUBY
+  include Nyauth::Authenticatable
+  #include Nyauth::Confirmable
+RUBY
+  end
+  
+  private
+
+  def model_exists?
+    File.exists?(File.join(destination_root, model_path))
+  end
+  
+  def model_path
+    @model_path ||= File.join("app", "models", "#{file_path}.rb")
+  end
+end

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

@@ -0,0 +1,16 @@
+class AddNyauthTo<%= table_name.camelize %> < ActiveRecord::Migration
+  def self.up
+    change_table(:<%= table_name %>) do |t|
+<%= migration_data -%>
+    end
+
+    add_index :<%= table_name %>, :email, unique: true
+    add_index :<%= table_name %>, :reset_password_key, unique: true
+    # Confirmable
+    #add_index :<%= table_name %>, :confirmation_key, unique: true
+  end
+
+  def self.down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

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

@@ -1,7 +1,20 @@
 Nyauth.configure do |config|
+  config.encryption_secret = ENV['NYAUTH_ENCRYPTION_SECRET']
   config.redirect_path do |urls|
-    # config.redirect_path_after_sign_in = urls.admin_secret_notes_path
-    # config.redirect_path_after_sign_out = urls.root_path
-    # config.redirect_path_after_registration = urls.root_path
+    # config.redirect_path_after_sign_in = -> (client_name) {
+    #  if client_name == :admin
+    #    urls.admin_secret_notes_path
+    #  else
+    #    urls.root_path
+    #  end
+    #}
+    # config.redirect_path_after_sign_in = -> (client_name) {}
+    # config.redirect_path_after_sign_out = -> (client_name) {}
+    # config.redirect_path_after_registration = -> (client_name) {}
+    # config.redirect_path_after_create_request_confirmation = -> (client_name) {}
+    # config.redirect_path_after_update_confirmation = -> (client_name) {}
+    # config.redirect_path_after_reset_password_request = -> (client_name) {}
+    # config.redirect_path_after_reset_password = -> (client_name) {}
+    # config.redirect_path_after_update_password = -> (client_name) {}
   end
 end

data/lib/nyauth/configuration.rb

@@ -10,20 +10,22 @@ module Nyauth
                   :redirect_path_after_reset_password,
                   :redirect_path_after_update_password,
                   :password_minium,
-                  :password_digest_stretches
+                  :password_digest_stretches,
+                  :encryption_secret
 
 
     def initialize
-      @redirect_path_after_sign_in = nil
-      @redirect_path_after_sign_out = nil
-      @redirect_path_after_registration = nil
-      @redirect_path_after_create_request_confirmation = nil
-      @redirect_path_after_update_confirmation = nil
-      @redirect_path_after_reset_password_request = nil
-      @redirect_path_after_reset_password = nil
-      @redirect_path_after_update_password = nil
+      @redirect_path_after_sign_in = Proc.new {}
+      @redirect_path_after_sign_out = Proc.new {}
+      @redirect_path_after_registration = Proc.new {}
+      @redirect_path_after_create_request_confirmation = Proc.new {}
+      @redirect_path_after_update_confirmation = Proc.new {}
+      @redirect_path_after_reset_password_request = Proc.new {}
+      @redirect_path_after_reset_password = Proc.new {}
+      @redirect_path_after_update_password = Proc.new {}
       @password_minium = 8
       @password_digest_stretches = 1000
+      @encryption_secret = ENV['NYAUTH_ENCRYPTION_SECRET']
       @redirect_path_block = Proc.new {}
     end
 

data/lib/nyauth/encryptor.rb

@@ -3,14 +3,13 @@ module Nyauth
     include Singleton
 
     cattr_writer :secret, :cipher, :digest
-    self.secret = ENV['ENCRYPTION_SECRET'] || '46d9a00e79b6bbf1c64a829c5640f5798c2e7c5066493f6d7e56ba800fd17d62b9e2bdf9102ae915f22eb40f5d6c83d6b3266baa509de7fc330c88bd4947bf56'
     self.cipher = 'aes-256-cbc'
     self.digest = 'SHA512'
 
     attr_reader :encryptor
 
     def initialize
-      @encryptor = ::ActiveSupport::MessageEncryptor.new(@@secret, cipher: @@cipher, digest: @@digest)
+      @encryptor = ::ActiveSupport::MessageEncryptor.new(Nyauth.configuration.encryption_secret, cipher: @@cipher, digest: @@digest)
     end
 
     class << self

data/lib/nyauth/version.rb

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

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

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