knock 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95b56eed3136555f3aa41844e00f9dd8faedb638
-  data.tar.gz: bf957608fc856b195c6e668b1b2d373a04b498f4
+  metadata.gz: a3966295873b5de911304239f5bd841144a88333
+  data.tar.gz: 4a88b9f1efbf8b6919e29b17ea331824b51c44c5
 SHA512:
-  metadata.gz: 5608467c83aee855c5474388aa6cb9725a397d59ba45afeb27137455958c5c0f0c541d8a7420a8132965e0a3c2e001abea0b43a83aa9b89d186651fa008bf6b2
-  data.tar.gz: ebfd80d26c2655cb77032921ef60221c3e0312ffaf70983692d5b691456ae5d3c2cd0254a4d6d95d70413dcd1148559c135705ab4733744a134a0213a5b0bd81
+  metadata.gz: be761b6599228ae01ec6533eb8f7f99b79dab91d6b69b62bc2be54839cbdd9392773be7ee8c673e0c076802ad83fa70e4081c24d8ecfa9d5c5a585a2fbec9db8
+  data.tar.gz: 5e0a0d1b1edc8071935ac6f99fbf4dcda8d91e2a859278fc704070b307840bb42453b1f3aa8b123ee9db02f7884edc15f96ebd799aff37f1900c5da411253e25

data/app/controllers/knock/auth_token_controller.rb

@@ -14,7 +14,7 @@ module Knock
     end
 
     def auth_token
-      AuthToken.new payload: { user_id: user.id }
+      AuthToken.new payload: { sub: user.id }
     end
 
     def user

data/lib/generators/templates/knock.rb

@@ -1,5 +1,16 @@
 Knock.setup do |config|
 
+  ## Current user retrieval when validating token
+  ## --------------------------------------------
+  ##
+  ## This is how you can tell Knock how to retrieve the current_user.
+  ## By default, it assumes you have a model called `User` and that
+  ## the user_id is stored in the 'sub' claim.
+  ##
+  ## Default:
+  # config.current_user_from_token = -> (claims) { User.find claims['sub'] }
+
+
   ## Expiration claim
   ## ----------------
   ##
@@ -31,6 +42,6 @@ Knock.setup do |config|
   # config.token_secret_signature_key = -> { Rails.application.secrets.secret_key_base }
 
   ## If using Auth0, uncomment the line below
-  # config.token_secret_signature_key = -> { Rails.application.secrets.auth0_client_secret }
+  # config.token_secret_signature_key = -> { JWT.base64url_decode Rails.application.secrets.auth0_client_secret }
 
 end

data/lib/knock.rb

@@ -11,6 +11,9 @@ module Knock
   mattr_accessor :token_secret_signature_key
   self.token_secret_signature_key = -> { Rails.application.secrets.secret_key_base }
 
+  mattr_accessor :current_user_from_token
+  self.current_user_from_token = -> (claims) { User.find claims['sub'] }
+
   # Default way to setup Knock. Run rails generate knock_install to create
   # a fresh initializer with all configuration values.
   def self.setup

data/lib/knock/authenticable.rb

@@ -5,7 +5,7 @@ module Knock::Authenticable
     begin
       token = request.headers['Authorization'].split(' ').last
       payload, header = Knock::AuthToken.new(token: token).validate!
-      @current_user = User.find(payload['user_id'])
+      @current_user = Knock.current_user_from_token.call(payload)
     rescue
       head :unauthorized
     end

data/lib/knock/version.rb

@@ -1,3 +1,3 @@
 module Knock
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/test/dummy/log/test.log

@@ -3846,3 +3846,579 @@ Processing by Knock::AuthTokenController#create as HTML
   User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "one@example.net"]]
 Completed 201 Created in 3ms (Views: 0.2ms | ActiveRecord: 0.1ms)
    (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+  Fixture Delete (0.8ms)  DELETE FROM "users"
+  Fixture Insert (0.5ms)  INSERT INTO "users" ("email", "password_digest", "created_at", "updated_at", "id") VALUES ('one@example.net', '$2a$04$XIklu6b1fu1FKZ40/zthquwZtWD1iOVDxOHSKXMCiXQTmv9tdE1k2', '2015-07-16 09:38:29', '2015-07-16 09:38:29', 980190962)
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("email", "password_digest", "created_at", "updated_at", "id") VALUES ('two@example.net', '$2a$04$HmSbuUSOgrKFCMcSG3bHgOBOqNlaEOGaLodG3bkgYK7vae.DCe81y', '2015-07-16 09:38:29', '2015-07-16 09:38:29', 298486374)
+   (0.8ms)  commit transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_404_if_password_is_invalid
+-----------------------------------------------------------------------------
+  User Load (0.2ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"auth"=>{"email"=>"one@example.net", "password"=>"[FILTERED]"}}
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."email" IS NULL LIMIT 1
+Completed 404 Not Found in 1ms (ActiveRecord: 0.1ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_201
+------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"auth"=>{"email"=>"one@example.net", "password"=>"[FILTERED]"}}
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."email" IS NULL LIMIT 1
+Completed 404 Not Found in 0ms (ActiveRecord: 0.1ms)
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_404_if_user_does_not_exist
+-----------------------------------------------------------------------------
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"auth"=>{"email"=>"wrong@example.net", "password"=>"[FILTERED]"}}
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."email" IS NULL LIMIT 1
+Completed 404 Not Found in 0ms (ActiveRecord: 0.1ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------
+InstallGeneratorTest: test_Assert_all_files_are_properly_created
+----------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------
+ProtectedResourcesControllerTest: test_responds_with_unauthorized
+-----------------------------------------------------------------
+Processing by ProtectedResourcesController#index as HTML
+Filter chain halted as :authenticate rendered or redirected
+Completed 401 Unauthorized in 1ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------
+ProtectedResourcesControllerTest: test_responds_with_success_if_authenticated
+-----------------------------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by ProtectedResourcesController#index as HTML
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", nil]]
+Filter chain halted as :authenticate rendered or redirected
+Completed 401 Unauthorized in 2ms (ActiveRecord: 0.1ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------------------------------
+ProtectedResourcesControllerTest: test_has_a_current_user_after_authentication
+------------------------------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by ProtectedResourcesController#index as HTML
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", nil]]
+Filter chain halted as :authenticate rendered or redirected
+Completed 401 Unauthorized in 0ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------
+KnockTest: test_setup_block_yields_self
+---------------------------------------
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+  Fixture Delete (0.2ms)  DELETE FROM "users"
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("email", "password_digest", "created_at", "updated_at", "id") VALUES ('one@example.net', '$2a$04$.sMdp6yE/Zt4bywOmkjEyeR/M9ZMkTAQCLYSvbdgyAZEDwYVhq8oS', '2015-07-16 09:44:11', '2015-07-16 09:44:11', 980190962)
+  Fixture Insert (0.0ms)  INSERT INTO "users" ("email", "password_digest", "created_at", "updated_at", "id") VALUES ('two@example.net', '$2a$04$8dRtTY5vUsVbAdOk5FYkU.Jn37Li2HVIH8xhowD1QY7Mu.6zU2teG', '2015-07-16 09:44:11', '2015-07-16 09:44:11', 298486374)
+   (0.8ms)  commit transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_404_if_password_is_invalid
+-----------------------------------------------------------------------------
+  User Load (0.2ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"auth"=>{"email"=>"one@example.net", "password"=>"[FILTERED]"}}
+  User Load (0.3ms)  SELECT  "users".* FROM "users" WHERE "users"."email" IS NULL LIMIT 1
+Completed 404 Not Found in 1ms (ActiveRecord: 0.3ms)
+   (0.2ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_404_if_user_does_not_exist
+-----------------------------------------------------------------------------
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"auth"=>{"email"=>"wrong@example.net", "password"=>"[FILTERED]"}}
+  User Load (0.2ms)  SELECT  "users".* FROM "users" WHERE "users"."email" IS NULL LIMIT 1
+Completed 404 Not Found in 1ms (ActiveRecord: 0.2ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_201
+------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"auth"=>{"email"=>"one@example.net", "password"=>"[FILTERED]"}}
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."email" IS NULL LIMIT 1
+Completed 404 Not Found in 0ms (ActiveRecord: 0.1ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------
+ProtectedResourcesControllerTest: test_responds_with_unauthorized
+-----------------------------------------------------------------
+Processing by ProtectedResourcesController#index as HTML
+Filter chain halted as :authenticate rendered or redirected
+Completed 401 Unauthorized in 0ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------
+ProtectedResourcesControllerTest: test_responds_with_success_if_authenticated
+-----------------------------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by ProtectedResourcesController#index as HTML
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", nil]]
+Filter chain halted as :authenticate rendered or redirected
+Completed 401 Unauthorized in 2ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------------------------------
+ProtectedResourcesControllerTest: test_has_a_current_user_after_authentication
+------------------------------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by ProtectedResourcesController#index as HTML
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", nil]]
+Filter chain halted as :authenticate rendered or redirected
+Completed 401 Unauthorized in 0ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------
+InstallGeneratorTest: test_Assert_all_files_are_properly_created
+----------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------------
+KnockTest: test_setup_block_yields_self
+---------------------------------------
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+  Fixture Delete (0.2ms)  DELETE FROM "users"
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("email", "password_digest", "created_at", "updated_at", "id") VALUES ('one@example.net', '$2a$04$08oFJCfJGV4ze1vKJRYbAOKcHdp/oH6IVeF4YcX44cs2TVvYmJcgK', '2015-07-16 09:56:24', '2015-07-16 09:56:24', 980190962)
+  Fixture Insert (0.0ms)  INSERT INTO "users" ("email", "password_digest", "created_at", "updated_at", "id") VALUES ('two@example.net', '$2a$04$ugtejufJzCgRRVlNVR.fq.MQeJ8dykhBw0wOxWc1IrC021SJHSfPq', '2015-07-16 09:56:24', '2015-07-16 09:56:24', 298486374)
+   (1.1ms)  commit transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------------------------
+ProtectedResourcesControllerTest: test_has_a_current_user_after_authentication
+------------------------------------------------------------------------------
+  User Load (0.2ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by ProtectedResourcesController#index as HTML
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", nil]]
+Filter chain halted as :authenticate rendered or redirected
+Completed 401 Unauthorized in 2ms (ActiveRecord: 0.1ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------
+ProtectedResourcesControllerTest: test_responds_with_success_if_authenticated
+-----------------------------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by ProtectedResourcesController#index as HTML
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", nil]]
+Filter chain halted as :authenticate rendered or redirected
+Completed 401 Unauthorized in 0ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------
+ProtectedResourcesControllerTest: test_responds_with_unauthorized
+-----------------------------------------------------------------
+Processing by ProtectedResourcesController#index as HTML
+Filter chain halted as :authenticate rendered or redirected
+Completed 401 Unauthorized in 0ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------
+KnockTest: test_setup_block_yields_self
+---------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_201
+------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"email"=>"one@example.net", "password"=>"[FILTERED]"}
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "one@example.net"]]
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "one@example.net"]]
+Completed 201 Created in 2ms (Views: 0.1ms | ActiveRecord: 0.1ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_404_if_password_is_invalid
+-----------------------------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"email"=>"one@example.net", "password"=>"[FILTERED]"}
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "one@example.net"]]
+Completed 404 Not Found in 1ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_404_if_user_does_not_exist
+-----------------------------------------------------------------------------
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"email"=>"wrong@example.net", "password"=>"[FILTERED]"}
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "wrong@example.net"]]
+Completed 404 Not Found in 0ms (ActiveRecord: 0.1ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------
+InstallGeneratorTest: test_Assert_all_files_are_properly_created
+----------------------------------------------------------------
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+  Fixture Delete (0.2ms)  DELETE FROM "users"
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("email", "password_digest", "created_at", "updated_at", "id") VALUES ('one@example.net', '$2a$04$mGECCWvf2.VjIDBcfKh7MOg4UyxtY5Q./myTBhaYkh.S77ZuY8z.O', '2015-07-16 09:57:12', '2015-07-16 09:57:12', 980190962)
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("email", "password_digest", "created_at", "updated_at", "id") VALUES ('two@example.net', '$2a$04$GET9U7cpvZqQmrWl4lSdee6IW6zvMICcVi.zojH4rZTXE8Mao/EHi', '2015-07-16 09:57:12', '2015-07-16 09:57:12', 298486374)
+   (1.4ms)  commit transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_201
+------------------------------------------------------
+  User Load (0.2ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"email"=>"one@example.net", "password"=>"[FILTERED]"}
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "one@example.net"]]
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "one@example.net"]]
+Completed 201 Created in 17ms (Views: 0.2ms | ActiveRecord: 0.2ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_404_if_user_does_not_exist
+-----------------------------------------------------------------------------
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"email"=>"wrong@example.net", "password"=>"[FILTERED]"}
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "wrong@example.net"]]
+Completed 404 Not Found in 0ms (ActiveRecord: 0.1ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_404_if_password_is_invalid
+-----------------------------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"email"=>"one@example.net", "password"=>"[FILTERED]"}
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "one@example.net"]]
+Completed 404 Not Found in 2ms (ActiveRecord: 0.1ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------
+InstallGeneratorTest: test_Assert_all_files_are_properly_created
+----------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------
+ProtectedResourcesControllerTest: test_responds_with_success_if_authenticated
+-----------------------------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by ProtectedResourcesController#index as HTML
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Completed 200 OK in 1ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------------------------
+ProtectedResourcesControllerTest: test_has_a_current_user_after_authentication
+------------------------------------------------------------------------------
+  User Load (0.2ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by ProtectedResourcesController#index as HTML
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Completed 200 OK in 0ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------
+ProtectedResourcesControllerTest: test_responds_with_unauthorized
+-----------------------------------------------------------------
+Processing by ProtectedResourcesController#index as HTML
+Filter chain halted as :authenticate rendered or redirected
+Completed 401 Unauthorized in 0ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------
+KnockTest: test_setup_block_yields_self
+---------------------------------------
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+  Fixture Delete (0.3ms)  DELETE FROM "users"
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("email", "password_digest", "created_at", "updated_at", "id") VALUES ('one@example.net', '$2a$04$PYLUT1UhR5lwzT8P22ef8Ojnb4AHZNzaAD67NQP1xsPHG8UzmslnO', '2015-07-16 10:23:58', '2015-07-16 10:23:58', 980190962)
+  Fixture Insert (0.0ms)  INSERT INTO "users" ("email", "password_digest", "created_at", "updated_at", "id") VALUES ('two@example.net', '$2a$04$eXOZCzcgj5DbFV/K0OIDhu.BQQbx2cVS7krRqQJsxnfRJSHhUJCAC', '2015-07-16 10:23:58', '2015-07-16 10:23:58', 298486374)
+   (0.7ms)  commit transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------------------------
+ProtectedResourcesControllerTest: test_has_a_current_user_after_authentication
+------------------------------------------------------------------------------
+  User Load (0.2ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by ProtectedResourcesController#index as HTML
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Completed 200 OK in 2ms (ActiveRecord: 0.1ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------
+ProtectedResourcesControllerTest: test_responds_with_success_if_authenticated
+-----------------------------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by ProtectedResourcesController#index as HTML
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Completed 200 OK in 0ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------
+ProtectedResourcesControllerTest: test_responds_with_unauthorized
+-----------------------------------------------------------------
+Processing by ProtectedResourcesController#index as HTML
+Filter chain halted as :authenticate rendered or redirected
+Completed 401 Unauthorized in 0ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_201
+------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"email"=>"one@example.net", "password"=>"[FILTERED]"}
+Completed 400 Bad Request in 0ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_404_if_user_does_not_exist
+-----------------------------------------------------------------------------
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"email"=>"wrong@example.net", "password"=>"[FILTERED]"}
+Completed 400 Bad Request in 0ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_404_if_password_is_invalid
+-----------------------------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"email"=>"one@example.net", "password"=>"[FILTERED]"}
+Completed 400 Bad Request in 0ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------
+InstallGeneratorTest: test_Assert_all_files_are_properly_created
+----------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------
+KnockTest: test_setup_block_yields_self
+---------------------------------------
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+  Fixture Delete (0.3ms)  DELETE FROM "users"
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("email", "password_digest", "created_at", "updated_at", "id") VALUES ('one@example.net', '$2a$04$fj8sa6plfdreIFtTWP60Vud08hkBuX9pHRKlei2z72X20aEol3v0O', '2015-07-16 10:24:41', '2015-07-16 10:24:41', 980190962)
+  Fixture Insert (0.0ms)  INSERT INTO "users" ("email", "password_digest", "created_at", "updated_at", "id") VALUES ('two@example.net', '$2a$04$ql5fbaUCydiFeL/KoZfe3OS9EJTK6e16PHuuxTnIfzPxQZYjj95xK', '2015-07-16 10:24:41', '2015-07-16 10:24:41', 298486374)
+   (1.5ms)  commit transaction
+   (0.1ms)  begin transaction
+---------------------------------------
+KnockTest: test_setup_block_yields_self
+---------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------
+InstallGeneratorTest: test_Assert_all_files_are_properly_created
+----------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_404_if_user_does_not_exist
+-----------------------------------------------------------------------------
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"auth"=>{"email"=>"wrong@example.net", "password"=>"[FILTERED]"}}
+  User Load (0.2ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "wrong@example.net"]]
+Completed 404 Not Found in 11ms (ActiveRecord: 0.2ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_404_if_password_is_invalid
+-----------------------------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"auth"=>{"email"=>"one@example.net", "password"=>"[FILTERED]"}}
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "one@example.net"]]
+Completed 404 Not Found in 2ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_201
+------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"auth"=>{"email"=>"one@example.net", "password"=>"[FILTERED]"}}
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "one@example.net"]]
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "one@example.net"]]
+Completed 201 Created in 7ms (Views: 0.1ms | ActiveRecord: 0.1ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------
+ProtectedResourcesControllerTest: test_responds_with_unauthorized
+-----------------------------------------------------------------
+Processing by ProtectedResourcesController#index as HTML
+Filter chain halted as :authenticate rendered or redirected
+Completed 401 Unauthorized in 0ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------
+ProtectedResourcesControllerTest: test_responds_with_success_if_authenticated
+-----------------------------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by ProtectedResourcesController#index as HTML
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Completed 200 OK in 1ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------------------------------
+ProtectedResourcesControllerTest: test_has_a_current_user_after_authentication
+------------------------------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by ProtectedResourcesController#index as HTML
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Completed 200 OK in 0ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+  Fixture Delete (0.2ms)  DELETE FROM "users"
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("email", "password_digest", "created_at", "updated_at", "id") VALUES ('one@example.net', '$2a$04$orGP2.6Hy7ckBDOemlIv2ejeS3MPla.ULVHFqJOiPWRB6dz6x5DHK', '2015-07-16 10:26:51', '2015-07-16 10:26:51', 980190962)
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("email", "password_digest", "created_at", "updated_at", "id") VALUES ('two@example.net', '$2a$04$oYsWRTGRx4sfJIGsruqNM.eTjI0ZzjufLbKkjD4YkJJh26j7WhUCG', '2015-07-16 10:26:51', '2015-07-16 10:26:51', 298486374)
+   (1.5ms)  commit transaction
+   (0.1ms)  begin transaction
+---------------------------------------
+KnockTest: test_setup_block_yields_self
+---------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_404_if_password_is_invalid
+-----------------------------------------------------------------------------
+  User Load (0.2ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"auth"=>{"email"=>"one@example.net", "password"=>"[FILTERED]"}}
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "one@example.net"]]
+Completed 404 Not Found in 11ms (ActiveRecord: 0.1ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_201
+------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"auth"=>{"email"=>"one@example.net", "password"=>"[FILTERED]"}}
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "one@example.net"]]
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "one@example.net"]]
+Completed 201 Created in 7ms (Views: 0.2ms | ActiveRecord: 0.1ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_404_if_user_does_not_exist
+-----------------------------------------------------------------------------
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"auth"=>{"email"=>"wrong@example.net", "password"=>"[FILTERED]"}}
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "wrong@example.net"]]
+Completed 404 Not Found in 0ms (ActiveRecord: 0.1ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------------
+InstallGeneratorTest: test_Assert_all_files_are_properly_created
+----------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------
+ProtectedResourcesControllerTest: test_responds_with_unauthorized
+-----------------------------------------------------------------
+Processing by ProtectedResourcesController#index as HTML
+Filter chain halted as :authenticate rendered or redirected
+Completed 401 Unauthorized in 0ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------
+ProtectedResourcesControllerTest: test_responds_with_success_if_authenticated
+-----------------------------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by ProtectedResourcesController#index as HTML
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Completed 200 OK in 1ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------------------------------
+ProtectedResourcesControllerTest: test_has_a_current_user_after_authentication
+------------------------------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by ProtectedResourcesController#index as HTML
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Completed 200 OK in 0ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+  Fixture Delete (0.3ms)  DELETE FROM "users"
+  Fixture Insert (0.1ms)  INSERT INTO "users" ("email", "password_digest", "created_at", "updated_at", "id") VALUES ('one@example.net', '$2a$04$YvWXmr54tipdqITMnPZ80eLyBpR3RCJClbMMvxFmmou2IhdPOKGia', '2015-07-16 10:26:56', '2015-07-16 10:26:56', 980190962)
+  Fixture Insert (0.0ms)  INSERT INTO "users" ("email", "password_digest", "created_at", "updated_at", "id") VALUES ('two@example.net', '$2a$04$LvbNMrc1vHI8pnUO3O6sFummv4nXdKvH2/V7Tn6d40uRA/dUatK/2', '2015-07-16 10:26:56', '2015-07-16 10:26:56', 298486374)
+   (1.2ms)  commit transaction
+   (0.0ms)  begin transaction
+---------------------------------------
+KnockTest: test_setup_block_yields_self
+---------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_404_if_user_does_not_exist
+-----------------------------------------------------------------------------
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"auth"=>{"email"=>"wrong@example.net", "password"=>"[FILTERED]"}}
+  User Load (0.2ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "wrong@example.net"]]
+Completed 404 Not Found in 4ms (ActiveRecord: 0.2ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_404_if_password_is_invalid
+-----------------------------------------------------------------------------
+  User Load (8.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"auth"=>{"email"=>"one@example.net", "password"=>"[FILTERED]"}}
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "one@example.net"]]
+Completed 404 Not Found in 2ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------------
+Knock::AuthTokenControllerTest: test_responds_with_201
+------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by Knock::AuthTokenController#create as HTML
+  Parameters: {"auth"=>{"email"=>"one@example.net", "password"=>"[FILTERED]"}}
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "one@example.net"]]
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."email" = ? LIMIT 1  [["email", "one@example.net"]]
+Completed 201 Created in 7ms (Views: 0.2ms | ActiveRecord: 0.1ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------------------------------------
+ProtectedResourcesControllerTest: test_has_a_current_user_after_authentication
+------------------------------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by ProtectedResourcesController#index as HTML
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Completed 200 OK in 1ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------------------------------
+ProtectedResourcesControllerTest: test_responds_with_success_if_authenticated
+-----------------------------------------------------------------------------
+  User Load (0.1ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Processing by ProtectedResourcesController#index as HTML
+  User Load (0.0ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? LIMIT 1  [["id", 980190962]]
+Completed 200 OK in 0ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------------------------
+ProtectedResourcesControllerTest: test_responds_with_unauthorized
+-----------------------------------------------------------------
+Processing by ProtectedResourcesController#index as HTML
+Filter chain halted as :authenticate rendered or redirected
+Completed 401 Unauthorized in 0ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+----------------------------------------------------------------
+InstallGeneratorTest: test_Assert_all_files_are_properly_created
+----------------------------------------------------------------
+   (0.1ms)  rollback transaction

data/test/dummy/test/controllers/protected_resources_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class ProtectedResourcesControllerTest < ActionController::TestCase
   def authenticate
     @user = users(:one)
-    @token = Knock::AuthToken.new(payload: { user_id: @user.id }).token
+    @token = Knock::AuthToken.new(payload: { sub: @user.id }).token
     @request.env['HTTP_AUTHORIZATION'] = "Bearer #{@token}"
   end
 

data/test/tmp/config/initializers/knock.rb

@@ -1,5 +1,16 @@
 Knock.setup do |config|
 
+  ## Current user retrieval when validating token
+  ## --------------------------------------------
+  ##
+  ## This is how you can tell Knock how to retrieve the current_user.
+  ## By default, it assumes you have a model called `User` and that
+  ## the user_id is stored in the 'sub' claim.
+  ##
+  ## Default:
+  # config.current_user_from_token = -> (claims) { User.find claims['sub'] }
+
+
   ## Expiration claim
   ## ----------------
   ##
@@ -31,6 +42,6 @@ Knock.setup do |config|
   # config.token_secret_signature_key = -> { Rails.application.secrets.secret_key_base }
 
   ## If using Auth0, uncomment the line below
-  # config.token_secret_signature_key = -> { Rails.application.secrets.auth0_client_secret }
+  # config.token_secret_signature_key = -> { JWT.base64url_decode Rails.application.secrets.auth0_client_secret }
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knock
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Arnaud MESUREUR
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails