jwt_api 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57a697d2434cc762c196c4840cde5eccc7fbc19963b5a62308acb8bc00a6471e
-  data.tar.gz: 5d9e68e19bfe23447772da6292f1974bec10ad30a85b65d382b0579b200bcc56
+  metadata.gz: 2236e6e97f3f4edb359ad86ba0ea5efe092b370756ff4534eec9ef75535b5209
+  data.tar.gz: 4b311aadb65a2816b3b5947916df457e092dd947677bbaa8683240c864e6dd66
 SHA512:
-  metadata.gz: e67834856aef77aced8c7ec5dc1063208207d707fab012be523d9f0a91b9bd629fec86c8dfcab94b754ca584b4393ec21ee2f5fb8c4b41248b1acb151d2a6292
-  data.tar.gz: 61118e1d8ef1f8434e1deffa692c8b996ce7f0e2618ff09862b3157a96d398fb1dd6c3d989f9b28cda1221846ffe71beb0e312cde4cc4b7f1e7d79686d8ca8f4
+  metadata.gz: 505253a7de5e59e0e9c5372c269e24e2f528081d1efcd72b423a8499e2f91ed404c81549921a25f710e52fac1d86f9be1d9b3891332661636d8d42cd726f78be
+  data.tar.gz: a8a9ea38d901d381be290d68de1320e736c4ea5b0a7d8f7a2ed8da2f363cd63370a62717c16583247fc440202eaed7a7ff00d982c50ff77c22c72a95d03e0a89

data/README.md

@@ -1,6 +1,6 @@
 # JwtApi
 
-Generate user, session, and password api routes with JWT authentication.
+Scaffold a JSON Web Token API.
 
 ## Installation
 
@@ -78,5 +78,5 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the JwtApi project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/jwt_api/blob/main/CODE_OF_CONDUCT.md).
+Everyone interacting in the JwtApi project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/leopolicastro/jwt_api/blob/main/CODE_OF_CONDUCT.md).
 

data/lib/generators/jwt_api/templates/api/base_controller.rb

@@ -8,7 +8,7 @@ class Api::BaseController < ApplicationController
   protected
 
   def authenticate_request!
-    user_id_in_token?
+    http_token && auth_token && jti_matches?
   rescue JWT::VerificationError, JWT::DecodeError
     render json: { errors: ['Unauthorized'] }, status: :unauthorized
   end
@@ -21,8 +21,7 @@ class Api::BaseController < ApplicationController
 
   def auth_token
     @auth_token ||= jwt.decode(http_token)[0].to_h.symbolize_keys!
-    return nil if token_expired?
-    return @auth_token if @auth_token.present? && @auth_token[:user_id].present? && jti_matches?
+    return @auth_token if @auth_token.present? && @auth_token[:user_id].present? && !token_expired?
   end
 
   def token_expired?
@@ -34,10 +33,6 @@ class Api::BaseController < ApplicationController
     @current_user&.jti == @auth_token[:jti]
   end
 
-  def user_id_in_token?
-    http_token && auth_token
-  end
-
   def user_reset_token_in_params?
     params[:reset_password_token]
   end

data/lib/jwt_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JwtApi
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jwt_api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Leo Policastro
@@ -48,8 +48,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- jwt_api-0.1.0.gem
-- jwt_api-0.1.1.gem
+- jwt_api-0.1.2.gem
 - jwt_api.gemspec
 - lib/generators/jwt_api/setup_generator.rb
 - lib/generators/jwt_api/templates/api/base_controller.rb