ishapi 0.1.8.135 → 0.1.8.140

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d4ac76a945cecc499cbcd7702b5fa87065bbc551b68681871f8dd8e049d7434
-  data.tar.gz: 27faa2c48c19a47d7b46572c4ce3c7ff052737df6840e3ee22d930f65be37752
+  metadata.gz: 664c57181dacaa8682f95923ceee4bea1b41d0e1aaf3c576fecbcf82f02350b9
+  data.tar.gz: f7643a6a16fab2abe799e056901ca73ec9561070bf9d03ddac6a4358a9af1e96
 SHA512:
-  metadata.gz: 814a536e1e9f406bc707576da08b8265fcb6a72637b97b5ebd077c459943dec930f7172fbdf28469fb59f5d3057d3796f37ff3ad75db312fa9754b6628c5641b
-  data.tar.gz: da987ea35b0a763299fa30997546b3ebbee28229dfef11193f78ba668c1ab195e5742ad4de73fd06346c54a9cd1e698b9d1c1ad40a515c65ad8d669797eaa7fd
+  metadata.gz: b2765fabf05e20faa94bfec7ee0ae593b18dacc55e6eb52b63deca84eb625e0f850f09aa7f59a9d7e8e2bc59b97b23dd4d642d37e23ecff68d84859f1b65a0fd
+  data.tar.gz: 36f3c49f167b8eb451df2d88e2d9a3a5b8dd2a1eb9c92ba7fd67580f5bee4a461c25dfe7b314bb52aa1288ec25261d5890ccc8200fbd511f63127b4361d661c9

data/app/controllers/ishapi/application_controller.rb

@@ -5,18 +5,13 @@ module Ishapi
     protect_from_forgery :prepend => true, :with => :exception
     layout :false
 
-    # before_action :check_profile, except: [ :test ]
-    # before_action :set_current_ability
-
-    check_authorization
+    check_authorization except: [ :long_term_token ]
     skip_before_action :verify_authenticity_token
 
     def test
     end
 
     def long_term_token
-      authorize! :long_term_token, ::Ishapi
-
       accessToken   = request.headers[:accessToken]
       accessToken ||= params[:accessToken]
 
@@ -31,8 +26,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)
 
@@ -56,8 +49,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
@@ -139,12 +130,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'
@@ -153,17 +140,22 @@ module Ishapi
 
       # @TODO: refactor [ref-5]
       sign_in @current_user, scope: :user
-      set_current_ability
+      current_ability
     end
 
 
 
-    # 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
 
@@ -175,10 +167,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]
@@ -250,10 +238,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=''
@@ -263,10 +250,17 @@ 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")
+      rescue JWT::DecodeError
+        Rails.logger.info("JWT::DecodeError")
+      end
+      @current_user ||= User.new
+      current_ability
     end
 
     # jwt

data/app/views/ishapi/galleries/_show.jbuilder

@@ -14,7 +14,7 @@ json.partial!    'ishapi/application/meta', :item => gallery
 if gallery.is_premium
   json.premium_tier gallery.premium_tier
   json.is_premium   gallery.premium_tier > 0
-  json.is_purchased current_user.profile.has_premium_purchase( gallery )
+  json.is_purchased current_user&.profile&.has_premium_purchase( gallery )
   json.partial!    'ishapi/photos/index',     :photos => [ gallery.photos[0] ]
 else
   json.partial!    'ishapi/photos/index',     :photos => gallery.photos

metadata

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