ishapi 0.1.8.136 → 0.1.8.137

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5339296869058b6d82a54995cceebfd6006e45050a1964efeae15decc76ba82d
-  data.tar.gz: d46ff74f622cee0e0f133305f3253a23ea9bbcf321bcc7489f59dbb3a21f23d5
+  metadata.gz: 4ea1237d3671ba3528065f0bbc15e6a684bb858a2a35383344d98b994812dcb2
+  data.tar.gz: 01f141ef6844db0a791350c25111c3d1abeacf500ee33428ea54bca0efc8fa71
 SHA512:
-  metadata.gz: 13fac7d4bf3e24d386c2f192cfa2cfdf3210e51d77f2a9df305a15ffd67b2c8a2e65a5cd85eff0b368df4b0501f1352fc3d7ea9b4760c39c998b073908796e22
-  data.tar.gz: ca09ad85b5a644461a68cd2aa80192cabcfd267f9f4fc3a5eb6e74cf44ad790375a163192d43bc38b4689a7c410eb3c66b3c7be9d7a10591e3a4cefccfc6a66c
+  metadata.gz: 72cf3aba0fd0e4666888d3e743e7ec0764276ee24a2cd6c5886183a14c99532dc3fa74b21a1d64d6b79bc5d30f391d9d1fc7db00a0d39a828019fad607464089
+  data.tar.gz: 81fa44fd7963acf87226f59f2d546e7a596667eaf7d1beb6febc83b343ef93bfc78274a1674133e785dcb1f721755b2c9bc911985083fe015809298924ecc391

data/app/controllers/ishapi/application_controller.rb

@@ -29,8 +29,6 @@ module Ishapi
       @me               = @graph.get_object( 'me', :fields => 'email' )
       @current_user     = User.where( :email => @me['email'] ).first
 
-      puts! @current_user, '#long_term_token @current_user'
-
       # send the jwt to client
       @jwt_token = encode(user_id: @current_user.id.to_s)
 
@@ -54,8 +52,6 @@ module Ishapi
     private
 
     def append_long_term_token
-      puts! nil, 'append_long_term_token'
-
       if @long_term_token
         response.body = JSON.parse(response.body).merge({ long_term_token: @long_term_token }).to_json
       end
@@ -137,12 +133,8 @@ module Ishapi
           @current_user     = current_user  if Rails.env.test?
         end
 
-        puts! @current_user, 'current_user'
-        puts! @current_profile, 'current_profile'
-
       elsif 'jwt' == provider
         decoded = decode(params[:jwt_token])
-        puts! decoded, 'decoded'
         @current_user = User.find decoded['user_id']
       else
         puts! 'check_multiprofile(): no access token'
@@ -156,12 +148,17 @@ module Ishapi
 
 
 
-    # same as check_profile but doesn't error out when jwt_token is missing
+    # same as check_profile but doesn't error out when jwt_token is missing or expired
     def check_profile_optionally
       if !params[:jwt_token]
         @current_user = User.new profile: Profile.new
       else
-        check_profile
+        begin
+          check_profile
+        rescue JWT::ExpiredSignature
+          Rails.logger.info("JWT::ExpiredSignature")
+          @current_user = User.new profile: Profile.new
+        end
       end
     end
 
@@ -173,10 +170,6 @@ module Ishapi
       # return check_multiprofile 'facebook'
       return check_multiprofile 'jwt'
 
-      # puts! params, 'params'
-      # puts! current_user, 'current_user'
-      # puts! @current_user, '@current_user'
-
       accessToken   = request.headers[:accessToken]
       accessToken ||= params[:fb_long_access_token]
       accessToken ||= params[:accessToken]
@@ -248,10 +241,9 @@ module Ishapi
       return token # ['access_token']
     end
 
-    def set_current_ability
-      # puts! current_user.email, '#set_current_ability() :: @current_user'
+    def current_ability
       @current_user ||= User.new({ profile: ::IshModels::UserProfile.new })
-      @current_ability ||= ::Ishapi::Ability.new( @current_user )
+      @current_ability ||= Ishapi::Ability.new( @current_user )
     end
 
     def puts! a, b=''

metadata

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