ishapi 0.1.8.138 → 0.1.8.142

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 484a021badac24fd7cc60e51878246515d9f5a7c0061bc03a530161a9ca52be5
-  data.tar.gz: 69fba225c87c16878d240c94956616cfab4ef3e1a8f3f3214435c2683fa796df
+  metadata.gz: 22b9f244f6e4a3c79fda643d0eca55e244a03ad5762412d2cb52f6175ee2ce97
+  data.tar.gz: b6bd24cdaad0054db3ad571623964a87517784933e0e01f7c67fe745fea5c93b
 SHA512:
-  metadata.gz: 97b91683c848f49d69fb0df659923dbea16d45c0fcbe0f5ef30b8b48e70f7b59783ae6fd6097cba14e0942c98d789bad17f1dc752c231525ef8dda79b3620b3a
-  data.tar.gz: 475504a104554c49b03c937148daf096ae043381bee59d5d9b2baae2e2847f32e432593c63d85849af497d27b3d4ca69937665e422a785b0e0849db608672e79
+  metadata.gz: 582ad0e2dd8f1f809a87ee5716b1770d05a00198d3d93a1b203151dca8cdf0c7844c18a499486686d6f95a84dd78c920263c07b6c73f4eff8ead2b6372cb412f
+  data.tar.gz: 01c8f26d18422745fdae325588c46d92828d65f86a677fece418ec2e98e9f6ba1fb9a694fb23d140ee270f1ca8a42d179b9667cc362e504be8aef43eefc9b28a

data/app/controllers/ishapi/application_controller.rb

@@ -134,7 +134,6 @@ module Ishapi
         decoded = decode(params[:jwt_token])
         @current_user = User.find decoded['user_id']
       else
-        puts! 'check_multiprofile(): no access token'
         raise "ww1 - not implemented"
       end
 
@@ -161,8 +160,6 @@ module Ishapi
 
     # this doesn't generate long-lived token, doesn't update user_profile
     def check_profile
-      puts! params, 'params'
-
       # return check_multiprofile 'google'
       # return check_multiprofile 'facebook'
       return check_multiprofile 'jwt'
@@ -183,7 +180,6 @@ module Ishapi
 
       ## for sedux
       sign_in( @current_user )
-      # puts! @current_user, '@current_user 222'
     end
 
     def set_profile
@@ -252,12 +248,13 @@ module Ishapi
     def check_jwt
       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
+      rescue JWT::DecodeError
+        Rails.logger.info("JWT::DecodeError")
       end
+      @current_user ||= User.new
       current_ability
     end
 

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.138
+  version: 0.1.8.142
 platform: ruby
 authors:
 - piousbox
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-02 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: []