nyauth 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78c8dca6c49fd4abe898394914257767fa4c002f
-  data.tar.gz: 52dbfeeaaab4f1109d86565598db322f8978f5eb
+  metadata.gz: 2ad3b4a881cc5ba9efe2e7230467642068906b52
+  data.tar.gz: 50d8fdee969e3210e9a54217bcc0b146bec4fb1a
 SHA512:
-  metadata.gz: a53bafdb9cce12f04697e1921d2b7ce5a2238f259884447929eb38c420bb11391079730d65aa760f6784dea57346facb4052632763a9954a1d6859ef17661c37
-  data.tar.gz: f7e05ea17062c114207d436177a8ec31d674e7ac239d2030611ca99d3b43b76007cad7600954aa4dbdcdecb26da4eec8ab175b353b1e13c6016d195dacbd0ba5
+  metadata.gz: da27181102d3320122ca94bcc6b9f8bd1864675b8d49f0e697a93fd01a4d53dc1f37878441ba96bdb4149e4bb81e7702664726d998929600f91a9e0ac386625f
+  data.tar.gz: 3dd04d685f016d32c57ce1d80b6ac9e5058f6e178be9227c03a8ba085928c8a5f54367d476f0fbaad3d70e24bc13ca96fc7a5558a2b7eb7d3749ef52789624a0

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2015 koshikawa
+Copyright 2015 ppworks
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -2,6 +2,8 @@
 
 Simple & modualbe authentication gem
 
+[CHANGE LOG](https://github.com/ppworks/nyauth/blob/master/CHANGELOG.md)
+
 ### application_controller.rb
 
 ```ruby
@@ -94,7 +96,7 @@ new_reset_password_request GET    /reset_password_requests/new(.:format)
                            PUT    /reset_passwords/:reset_password_key(.:format)      nyauth/reset_passwords#update
 ```
 
-```
+```ruby
 new_session_path_for(:user) # /session/new
 new_session_path_for(:admin) # /admin/session/new
 ```
@@ -127,7 +129,7 @@ export NYAUTH_ENCRYPTION_SECRET=`bundle exec rake secret`
 
 Or edit `config/initializers/nyauth.rb`
 
-```
+```ruby
 nyauth.configure do |config|
   config.encryption_secret = ENV['NYAUTH_ENCRYPTION_SECRET'] || ENV['SECRET_KEY_BASE']
   config.confirmation_expire_limit = 1.hour
@@ -154,7 +156,7 @@ end
 
 I18n
 
-```
+```yaml
 ja:
   flash:
     nyauth:

data/app/controllers/nyauth/passwords_controller.rb

@@ -2,6 +2,9 @@ module Nyauth
   class PasswordsController < ApplicationController
     include Nyauth::ApplicationConcern
     include Nyauth::ClientConcern
+    include Nyauth::SessionConcern
+    before_action -> { require_authentication! as: client_name }
+
     respond_to :html, :json
     before_action :set_client
 

data/app/controllers/nyauth/sessions_controller.rb

@@ -2,6 +2,8 @@ module Nyauth
   class SessionsController < ApplicationController
     include Nyauth::ApplicationConcern
     include Nyauth::ClientConcern
+    include Nyauth::SessionConcern
+    before_action -> { require_authentication! as: client_name }
     allow_everyone only: [:new, :create]
     respond_to :html, :json
     before_action :set_session_service
@@ -16,7 +18,7 @@ module Nyauth
 
     def destroy
       sign_out
-      respond_with @session_service, location: Nyauth.configuration.redirect_path_after_sign_out.call(client_name) || new_session_path
+      respond_with @session_service, location: Nyauth.configuration.redirect_path_after_sign_out.call(client_name) || new_session_path_for(client_name)
     end
 
     private

data/app/helpers/nyauth/application_helper.rb

@@ -35,7 +35,7 @@ module Nyauth
         path = @__candidates.grep(/\A#{client_name}_#{feature}_path\z/).first
       end
       return nil unless path
-      __send__(path, *args)
+      main_app.__send__(path, *args)
     end
 
     def root_path

data/lib/nyauth/version.rb

@@ -1,3 +1,3 @@
 module Nyauth
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,4 +1,5 @@
 class ApplicationController < ActionController::Base
+  include Nyauth::ApplicationConcern
   include Nyauth::SessionConcern
   self.responder = Nyauth::AppResponder
   # Prevent CSRF attacks by raising an exception.

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

@@ -16,6 +16,11 @@
   <%= flash[:alert] %>
 <% end %>
 <%= link_to "URL helper on application", posts_path %>
-<%= link_to 'Sign out', nyauth.session_path, class: 'pure-menu-link', method: :delete %>
+<% if signed_in?(as: :user) %>
+  <%= link_to 'Sign out', session_path_for(:user), class: 'pure-menu-link', method: :delete %>
+<% end %>
+<% if signed_in?(as: :admin) %>
+  <%= link_to 'Sign out', session_path_for(:admin), class: 'pure-menu-link', method: :delete %>
+<% end %>
 </body>
 </html>

data/spec/dummy/config/initializers/nyauth.rb

@@ -0,0 +1,3 @@
+Nyauth.configure do |config|
+  config.encryption_secret = ENV['NYAUTH_ENCRYPTION_SECRET'] || 'rails6dd08eff1c2cf5aecb54cb1a97266817b58cc27f06be9e95918c06607d3950d623a4fd4c0c306d2216cdaf3f99871e21e0e975a5e64ef5cf286b68ed8d7379a4'
+end