Merge pull request #1 from undercase/master

merge from uppercase master

Author: jcgertig

README.md

@@ -39,11 +39,21 @@ For other authentication solutions or custom Devise setups, you must first use p
 
 `authenticate:` specifies the name of the method on the User model which accepts a password to authenticate the user. This is the name of an instance method on the User model which accepts the `password` param, and returns either true or false to indicate authentication.
 
+Proof also allows for a optional block that returns a hash to modify the json return
+
+    proof_actions authenticatable: :User do |user, token|
+      {
+        user_id: user.id,
+        email: user.email,
+        auth_token: token
+      }
+    end
+
 When your application sends a `POST` request to the `login` action, it will return JSON with the key `auth_token` if it finds a valid user. Your application must then save this token and send it with every request under the `Authorization` HTTP header, in the Bearer format: `Bearer [token]`.
 
 You must route the `login` action yourself. For example, if you had a controller named `AuthenticationController`, you could create a `/login` route like so:
 
-    post '/login' => 'authentication#login'
+    post '/login', to: 'authentication#login'
 
 In order to restrict an action to authenticated users, simply use a `before_action` call for the actions you'd like to restrict:
 

lib/generators/proof/devise/devise_generator.rb

@@ -2,17 +2,17 @@ module Proof
   module Generators
     class DeviseGenerator < Rails::Generators::NamedBase
       source_root File.expand_path('../templates', __FILE__)
+      argument :class_name, type: :string, default: "User"
       desc "This generator creates a 'login' route, and configures it to work with Devise (with the default model name User)."
 
       def create_controller
-        controller_file = "authentication_controller.rb"
+        controller_file = "authentication_controller.rb.erb"
         destination_file = "app/controllers/authentication_controller.rb"
-        copy_file controller_file, destination_file
-        gsub_file destination_file, 'authenticatable_class_name', name
+        template controller_file, destination_file
       end
 
       def create_routes
-        route "post 'login' => 'authentication#login'"
+        route "post 'login', to: 'authentication#login'"
       end
     end
   end

lib/generators/proof/devise/templates/authentication_controller.rb

@@ -0,0 +1,3 @@
+class AuthenticationController < ApplicationController
+  proof_actions authenticatable: :<%= class_name %>, authenticate: :valid_password?
+end

lib/generators/proof/devise/templates/authentication_controller.rb.erb

@@ -6,11 +6,15 @@ module ProofActions
     end
 
     module ClassMethods
-      def proof_actions(options={})
+      def proof_actions(options={}, &block)
         options[:authenticatable] ||= :User
         options[:identifier] ||= :email
         options[:password] ||= :password
         options[:authenticate] ||= :authenticate
+        options[:block] = nil
+        if block_given?
+          options[:block] = block
+        end
         cattr_accessor :proof_options
         self.proof_options = options
         include Proof::ProofActions::LocalInstanceMethods
@@ -20,9 +24,15 @@ def proof_actions(options={})
     module LocalInstanceMethods
       def login
         proof_class = self.class.proof_options[:authenticatable].to_s.camelize.constantize
-        user = proof_class.find_by(self.class.proof_options[:identifier] => params[:identifier])
+        identifier = self.class.proof_options[:identifier]
+        user = proof_class.find_by(identifier => params[identifier])
         if user && user.send(self.class.proof_options[:authenticate], params[self.class.proof_options[:password]])
-          render json: { auth_token: Proof::Token.from_data({ user_id: user.id }) }
+          auth_token = Proof::Token.from_data({ user_id: user.id })
+          json = { auth_token: auth_token }
+          if !self.class.proof_options[:block].nil?
+            json = self.class.proof_options[:block].call(user, auth_token)
+          end
+          render json: json
         else
           render json: { error: "Invalid Credentials." }, status: :unauthorized
         end

lib/proof/proof_actions.rb

@@ -1,3 +1,3 @@
 module Proof
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

lib/proof/version.rb

@@ -0,0 +1,27 @@
+require 'json'
+require 'test_helper'
+
+class BlockActionsTest < ActionController::TestCase
+  def setup
+    User.create(email: 'real@email.com', password: 'realpassword')
+
+    @controller = BlockController.new
+    @request = ActionController::TestRequest.new
+    @response = ActionController::TestResponse.new
+
+    Rails.application.routes.draw do
+      post 'login', to: 'block#login'
+    end
+  end
+
+  def test_proof_actions_block_works
+    post :login, { 'email' => 'real@email.com', 'password' => 'realpassword' }
+    response = JSON.parse(@response.body)
+
+    assert_response :success
+
+    assert_not_nil response['user_id']
+    assert_not_nil response['email']
+    assert_not_nil response['auth_token']
+  end
+end

test/block_actions_test.rb

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

test/dummy/app/assets/javascripts/block.js

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

test/dummy/app/assets/stylesheets/block.css

@@ -0,0 +1,14 @@
+class BlockController < ApplicationController
+  proof_actions authenticatable: :User do |user, token|
+    {
+      user_id: user.id,
+      email: user.email,
+      auth_token: token
+    }
+  end
+  before_action :require_proof, except: :login
+  
+  def test
+    render json: { status: 'authorized' }
+  end
+end