jwt_extended 0.1.0 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8653dae8dd88f4218aa3bba25281cbc90658c9e67343326d369de93d047b947
-  data.tar.gz: e6307b74238996dea7f1ad0c31644f1d19501a0a02f2bc1d0e209ee4ef0a179d
+  metadata.gz: 6e9a7e051e97ccf13f44689822a3f6b2298d8bf7cb3244032b27aebc75816859
+  data.tar.gz: 79495af695f50f3199cbcaf41d36819b73f184a4118a2ab9c45ecd2edd6a94d5
 SHA512:
-  metadata.gz: a3d26a82e2b7c936b55971330e087448efab14b0149b84213245b85f5394a2d12c5227206736d510fae6ab2aaf0b2c1e5592624f4fb330a3dd7a44be0e842fbd
-  data.tar.gz: 329a63df2e3728d2eec8e083599a90a76010eec029954bd2a765fc1932fab11f5d354026f9115cf7c2dda260c701caa698c1066b801eb6e21c3619de4884a562
+  metadata.gz: 7f7f9d5d173eba4e5801069b55f566e040998d2a8f3e369ef4fc660a73f76f006087d49263a59e297917d3a2b10969dd7cfef953e17f8a9b29b15dc25190c01e
+  data.tar.gz: 3e7a04aa68e3fa32045c8568b8ec5b924e31115ec4543937ef22ef8cce14dc7419fe4a0300f077cf46cb92a6ad2c3134cdc3d367b0485b0dad626774ee4ff065

data/lib/jwt_base.rb

@@ -4,60 +4,55 @@ require 'action_controller/api'
 
 
 class JWTBase < ActionController::API
-  attr_reader :payload
 
-  def initialize(secret_key, access_exp, refresh_exp)
+  def initialize(secret_key, access_exp, refresh_exp, algorithm = 'HS256')
     @secret_key = secret_key
     @access_exp = access_exp
     @refresh_exp = refresh_exp
-    @algorithm = 'HS256'
+    @algorithm = algorithm
 
     raise Time::TypeError unless @access_exp.class == ActiveSupport::Duration
     raise Time::TypeError unless @refresh_exp.class == ActiveSupport::Duration
   end
 
-  def create_access_token(payload)
+  def create_access_token(payload, header = { typ: :JWT })
     raise JWT::EncodeError unless payload[:exp].nil? || payload[:type].nil?
 
     payload[:exp] = (Time.now + @access_exp).to_i
-    payload[:type] = :access_token
-    JWT.encode(payload, @secret_key, @algorithm)
+    payload[:type] = :access
+    JWT.encode(payload, @secret_key, @algorithm, header)
   end
 
-  def create_refresh_token(payload)
+  def create_refresh_token(payload, header = { typ: :JWT })
     raise JWT::EncodeError unless payload[:exp].nil? || payload[:type].nil?
 
     payload[:exp] = (Time.now + @refresh_exp).to_i
-    payload[:type] = :refresh_token
-    JWT.encode(payload, @secret_key, @algorithm)
+    payload[:type] = :refresh
+    JWT.encode(payload, @secret_key, @algorithm, header)
   end
 
   def token_required(token)
-    return { error: :unauthorized } unless token[0] == 'Bearer'
-
-    payload = JWT.decode(token[1], @secret_key, @algorithm)[0]
-  rescue JWT::DecodeError || NoMethodError
+    payload = JWT.decode(token, @secret_key, @algorithm)[0]
+  rescue JWT::DecodeError || NoMethodError || JWT::ExpiredSignature
     { error: :unauthorized }
-  rescue JWT::ExpiredSignature
-    { error: :gone }
   else
     payload
   end
 
   def jwt_required(token)
     payload = token_required(token)
-    return render status: payload[:error] if payload[:error]
-    return render status: :forbidden unless payload['type'] == 'access_token'
+    return { status: payload[:error] } if payload[:error]
+    return { status: :forbidden } unless payload['type'] == 'access'
 
-    @payload
+    payload
   end
 
   def refresh_token_required(token)
     payload = token_required(token)
-    return render status: payload[:error] if payload[:error]
-    return render status: :forbidden unless payload['type'] == 'refresh_token'
+    return { status: payload[:error] } if payload[:error]
+    return { status: :forbidden } unless payload['type'] == 'refresh'
 
-    @payload
+    payload
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jwt_extended
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.6
 platform: ruby
 authors:
 - JeongWooYeong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt