ishapi 0.1.8.254 → 0.1.8.256

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13f63645faf4ca0262003033c9f3a8b22ecdd17f4c4df7ac82dedf268ecc3be1
-  data.tar.gz: a5f84e4158ce19d00398050149f57df6e9721195a95547e46af2c2ea4950e65b
+  metadata.gz: f7be7e944fe040f6d8c8b41e7b8c8ee95e9cd1452ee29f07684fc92b4dc29f31
+  data.tar.gz: 9d04f5e48774f18bb31cc32d266613c10ca826ed9c4003d71d788d8cf0ab684a
 SHA512:
-  metadata.gz: e4b617956d9db8d0c22393299f15e4734f9c1a743b936973b351578b76bdbe1e4ab88c9bae6db77879d1319d580eaaaa0d7c4d5eb631fa6e76adddb0fa8128e3
-  data.tar.gz: f955f43ff3987f4ac16c79f7c4796d200c468ca49f55d625b655fd920e0510faf3f77bc884fef6fbda301d46474107d9c19f3433f1abc86b1a7a6efeffc4d832
+  metadata.gz: d2a0be8652485efcc2625054083ee810acd62f37a01aeaa3375702becf22059cc4ab4181851cdf621cb8189d3b7d26d6f8b12553b4a7e933097510bdcf4f7cb7
+  data.tar.gz: e02625e042f046018d03e13b78073fcc4cc9a9d7ab50591b602c733daff563851213c137dc72a3b5d4c5a0140e1a29602ae8c15becaa1ed8a470f601a3bad3bf

data/app/controllers/ishapi/application_controller.rb

@@ -10,6 +10,7 @@ class ::Ishapi::ApplicationController < ActionController::Base
   end
 
   ## POST /api/users/long_term_token , a FB login flow
+  ## 2023-03-29 _vp_ This should not work, needs to be rewritten.
   def long_term_token
     accessToken   = request.headers[:accessToken]
     accessToken ||= params[:accessToken]
@@ -27,7 +28,7 @@ class ::Ishapi::ApplicationController < ActionController::Base
     @current_profile  = Ish::UserProfile.find_by( email: @current_user.email )
 
     # send the jwt to client
-    @jwt_token = encode(user_id: @current_user.id.to_s)
+    @jwt_token = encode(user_profile_id: @current_user.profile.id.to_s)
 
     render json: {
       email: @current_user.email,

data/app/controllers/ishapi/galleries_controller.rb

@@ -25,7 +25,7 @@ module Ishapi
       respond_to do |format|
         format.json do
 
-          if @gallery.premium?
+          if @gallery.is_premium
             if @current_user&.profile&.has_premium_purchase( @gallery )
               render 'show_premium_unlocked'
             else
@@ -38,7 +38,7 @@ module Ishapi
         end
         format.html do
 
-          if @gallery.premium?
+          if @gallery.is_premium
             if @current_user&.profile&.has_premium_purchase( @gallery )
               render 'show_premium_unlocked'
             else

data/app/controllers/ishapi/maps_controller.rb

@@ -18,8 +18,7 @@ class Ishapi::MapsController < Ishapi::ApplicationController
 
     authorize! :show, @map
 
-    @newsitems = @location.newsitems.page( params[:newsitems_page]
-      ).per( @location.newsitems_page_size )
+    @newsitems = @location.newsitems.page( params[:newsitems_page] ).per( @location.newsitems_page_size )
 
     @markers = @map.markers.permitted_to(@current_profile).order_by(ordering: :asc)
     # case @map.ordering_type

data/app/controllers/ishapi/payments_controller.rb

@@ -3,6 +3,9 @@ class Ishapi::PaymentsController < ::Ishapi::ApplicationController
 
   before_action :check_profile, only: %i| create unlock |
 
+  ## Hmmm, ishapi does not verify authenticity token.
+  # skip_before_action :verify_authenticity_token, only: %i| create stripe_confirm |
+
   # alphabetized : )
 
   ## _vp_ 2020-07-21 This is for guyd
@@ -15,8 +18,6 @@ class Ishapi::PaymentsController < ::Ishapi::ApplicationController
   def create
     authorize! :create, ::Ish::Payment
 
-    puts! @current_profile, 'current_profile'
-
     @current_profile.update_attributes({ is_purchasing: true })
 
     begin
@@ -82,7 +83,7 @@ class Ishapi::PaymentsController < ::Ishapi::ApplicationController
     authorize! :unlock, ::Ish::Payment
     item = Object::const_get(params['kind']).find params['id']
 
-    existing = Purchase.where( user_profile: @current_profile, item: item ).first
+    existing = Ish::Payment.where( profile: @current_profile, item: item ).first
     if existing
       render status: 200, json: { status: :ok, message: 'already purchased' }
       return
@@ -90,7 +91,7 @@ class Ishapi::PaymentsController < ::Ishapi::ApplicationController
 
     @current_profile.inc( n_unlocks: -item.premium_tier )
 
-    purchase = ::Gameui::PremiumPurchase.create!( item: item, user_profile: @current_profile, )
+    purchase = ::Ish::Payment.create!( item: item, profile: @current_profile, )
 
     @profile = @current_profile
     render 'ishapi/user_profiles/account'

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

@@ -14,6 +14,7 @@ json.cache! this_key do
     json.h            map.h
     # json.x            map.x
     # json.y            map.y
+    # json.z            map.z
     # json.map_type     map.map_type
     json.img_path     map.image.image.url(:original)
     json.updated_at   map.updated_at

data/app/views/ishapi/user_profiles/_account.jbuilder

@@ -7,15 +7,12 @@ json.profile_photo_url profile.profile_photo.photo.url( :thumb ) if profile.prof
 json.n_reports     profile.reports.count
 json.n_galleries   profile.galleries.count
 json.n_videos      profile.videos.count
-# json.n_stars       profile.n_stars # @TODO: which one is deprecated?
+
 json.n_unlocks     profile.n_unlocks # @TODO: which one is deprecated?
 json.is_purchasing profile.is_purchasing
-if profile.current_city
-  json.current_city profile.current_city
-end
 
-json.bookmarks profile.bookmarks do |b|
-  json.name b.name
-  json.slug b.slug
-end
+# json.bookmarks profile.bookmarks do |b|
+#   json.name b.name
+#   json.slug b.slug
+# end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.254
+  version: 0.1.8.256
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails