ishapi 0.1.8.137 → 0.1.8.141

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ea1237d3671ba3528065f0bbc15e6a684bb858a2a35383344d98b994812dcb2
-  data.tar.gz: 01f141ef6844db0a791350c25111c3d1abeacf500ee33428ea54bca0efc8fa71
+  metadata.gz: 4cb2445a1bf7bb72379c50c715e525a4a25e9fb935f82a6f1aa4a0973d983a8e
+  data.tar.gz: 690d1d6c4af836ddf56739969b9231e86f785e220944d5aedcd2e2ae779d9441
 SHA512:
-  metadata.gz: 72cf3aba0fd0e4666888d3e743e7ec0764276ee24a2cd6c5886183a14c99532dc3fa74b21a1d64d6b79bc5d30f391d9d1fc7db00a0d39a828019fad607464089
-  data.tar.gz: 81fa44fd7963acf87226f59f2d546e7a596667eaf7d1beb6febc83b343ef93bfc78274a1674133e785dcb1f721755b2c9bc911985083fe015809298924ecc391
+  metadata.gz: 4fbc093ce463bd15b63d07efe534815551c2d9e85244ec412907af8208639916b8c87b5ffa4a1c8456a1668c0208e81abe360c15fb2e0b902efcc3dd801ac797
+  data.tar.gz: '0568bb4b138b37874bdad4a86ad93f6e465ee333d841ed5ef41958cd98cfcf0bc1ce5fea4df400ead891cca085a91fab872038ee1eddf60ab6eda76683823ac9'

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,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/controllers/ishapi/galleries_controller.rb

@@ -24,7 +24,7 @@ module Ishapi
       @gallery = ::Gallery.unscoped.find_by :galleryname => params[:galleryname]
       authorize! :show, @gallery
       if @gallery.premium?
-        if current_user.profile.has_premium_purchase( @gallery )
+        if current_user&.profile&.has_premium_purchase( @gallery )
           render 'show_premium_unlocked'
         else
           render 'show_premium_locked'

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

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

@@ -10,8 +10,8 @@ json.cache! this_key do
     json.is_premium   @gallery.is_premium
     json.is_purchased false
 
-    json.partial! 'ishapi/galleries/show', gallery: @gallery   
-    json.partial! 'ishapi/photos/index', :photos => [ @gallery.photos[0] ]
+    # json.partial! 'ishapi/galleries/show', gallery: @gallery
+    # json.partial! 'ishapi/photos/index', :photos => [ @gallery.photos[0] ]
   end
 end
 

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.141
 platform: ruby
 authors:
 - piousbox
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-01 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -284,7 +284,7 @@ homepage: http://wasya.co
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -299,8 +299,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubygems_version: 3.2.25
+signing_key: 
 specification_version: 4
 summary: Summary of Ishapi.
 test_files: []