ishapi 0.1.8.137 → 0.1.8.138

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ea1237d3671ba3528065f0bbc15e6a684bb858a2a35383344d98b994812dcb2
-  data.tar.gz: 01f141ef6844db0a791350c25111c3d1abeacf500ee33428ea54bca0efc8fa71
+  metadata.gz: 484a021badac24fd7cc60e51878246515d9f5a7c0061bc03a530161a9ca52be5
+  data.tar.gz: 69fba225c87c16878d240c94956616cfab4ef3e1a8f3f3214435c2683fa796df
 SHA512:
-  metadata.gz: 72cf3aba0fd0e4666888d3e743e7ec0764276ee24a2cd6c5886183a14c99532dc3fa74b21a1d64d6b79bc5d30f391d9d1fc7db00a0d39a828019fad607464089
-  data.tar.gz: 81fa44fd7963acf87226f59f2d546e7a596667eaf7d1beb6febc83b343ef93bfc78274a1674133e785dcb1f721755b2c9bc911985083fe015809298924ecc391
+  metadata.gz: 97b91683c848f49d69fb0df659923dbea16d45c0fcbe0f5ef30b8b48e70f7b59783ae6fd6097cba14e0942c98d789bad17f1dc752c231525ef8dda79b3620b3a
+  data.tar.gz: 475504a104554c49b03c937148daf096ae043381bee59d5d9b2baae2e2847f32e432593c63d85849af497d27b3d4ca69937665e422a785b0e0849db608672e79

data/app/controllers/ishapi/application_controller.rb

@@ -5,9 +5,6 @@ module Ishapi
     protect_from_forgery :prepend => true, :with => :exception
     layout :false
 
-    # before_action :check_profile, except: [ :test ]
-    # before_action :set_current_ability
-
     check_authorization except: [ :long_term_token ]
     skip_before_action :verify_authenticity_token
 
@@ -143,7 +140,7 @@ module Ishapi
 
       # @TODO: refactor [ref-5]
       sign_in @current_user, scope: :user
-      set_current_ability
+      current_ability
     end
 
 
@@ -253,10 +250,15 @@ module Ishapi
 
     # jwt
     def check_jwt
-      decoded = decode(params[:jwt_token])
-      puts! decoded, 'decoded'
-      @current_user = User.find decoded['user_id']
-      set_current_ability
+      begin
+        decoded = decode(params[:jwt_token])
+        puts! decoded, 'decoded'
+        @current_user = User.find decoded['user_id']
+      rescue JWT::ExpiredSignature
+        Rails.logger.info("JWT::ExpiredSignature")
+        @current_user = User.new
+      end
+      current_ability
     end
 
     # jwt

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.137
+  version: 0.1.8.138
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-01 00:00:00.000000000 Z
+date: 2021-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails