ishapi 0.1.8.254 → 0.1.8.259

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13f63645faf4ca0262003033c9f3a8b22ecdd17f4c4df7ac82dedf268ecc3be1
-  data.tar.gz: a5f84e4158ce19d00398050149f57df6e9721195a95547e46af2c2ea4950e65b
+  metadata.gz: 2b2b1dfb4bd9597b2d12c84d53282ee8574c15ef652c4beafbe9238b382c49f3
+  data.tar.gz: c845cd0828bc8316ca4884bd8484637dc04bcc42990cad24b9ea63bafa705ea5
 SHA512:
-  metadata.gz: e4b617956d9db8d0c22393299f15e4734f9c1a743b936973b351578b76bdbe1e4ab88c9bae6db77879d1319d580eaaaa0d7c4d5eb631fa6e76adddb0fa8128e3
-  data.tar.gz: f955f43ff3987f4ac16c79f7c4796d200c468ca49f55d625b655fd920e0510faf3f77bc884fef6fbda301d46474107d9c19f3433f1abc86b1a7a6efeffc4d832
+  metadata.gz: 4b5fffc9ea10304e43316a34ef25190e08e7ade5958b2fc2218a41924d93e0fc8ec4c237b7ea4eaf8a892c7dd2fc5a3c2fe8bbcd648c9484424c7e802578828f
+  data.tar.gz: 8b4a8eae4b0af269d71b0e0552e7061b2cf0f97e263b94f813ad7e5b766e488df49483a3c8a7b28223245f0998b007404c9138e9d5166a4a254d4ce663be4b40

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,51 +3,58 @@ class Ishapi::PaymentsController < ::Ishapi::ApplicationController
 
   before_action :check_profile, only: %i| create unlock |
 
+  protect_from_forgery with: :exception
+  skip_before_action :verify_authenticity_token, only: %i| stripe_confirm |
+
   # alphabetized : )
 
   ## _vp_ 2020-07-21 This is for guyd
   ## _vp_ 2022-03-01 It's been a while!
   ## _vp_ 2022-09-04 continue
+  ## _vp_ 2023-03-29 Continue
   ##
   ## @TODO: cannot proceed if already is_purchasing?
   ## @TODO: and this doesn't say what you're buying! herehere
   ##
   def create
-    authorize! :create, ::Ish::Payment
-
-    puts! @current_profile, 'current_profile'
+    authorize! :create, Ish::Payment.new
 
     @current_profile.update_attributes({ is_purchasing: true })
 
-    begin
-      amount_cents  = params[:amount_cents].to_i # @TODO: change
-
-      ::Stripe.api_key = ::STRIPE_SK
-      intent = Stripe::PaymentIntent.create({
-        amount: amount_cents,
-        currency: 'usd',
-        metadata: { integration_check: "accept_a_payment" },
-      })
-
-      payment = Ish::Payment.create!(
-        client_secret: intent.client_secret,
-        email: @current_profile.email,
-        payment_intent_id: intent.id,
-        profile_id: @current_profile.id,
-      )
-      render json: {
-        client_secret: intent.client_secret,
-        clientSecret: intent.client_secret,
-      }
-
-    rescue Mongoid::Errors::DocumentNotFound => e
-      puts! e, '#create2 Mongoid::Errors::DocumentNotFound'
-      render :status => 404, :json => e
+    amount_cents  = params[:amount_cents].to_i # @TODO: change
+
+    ::Stripe.api_key = ::STRIPE_SK
+    intent = Stripe::PaymentIntent.create({
+      amount: amount_cents,
+      currency: 'usd',
+      metadata: { integration_check: "accept_a_payment" },
+    })
+
+    item_type = case params[:item_type]
+    when 'Ish::Location'
+      'Gameui::Map'
+    else
+      throw "item_type not implemented: #{params[:item_type]}"
     end
+    item = item_type.constantize.find params[:item_id]
+
+    payment = Ish::Payment.create!(
+      client_secret: intent.client_secret,
+      email: @current_profile.email,
+      item: item,
+      payment_intent_id: intent.id,
+      profile_id: @current_profile.id,
+    )
+    render json: {
+      client_secret: intent.client_secret,
+      clientSecret: intent.client_secret,
+    }
+
   end
 
   ##
   ## webhook
+  ## _vp_ 2023-03-29 Continue
   ##
   def stripe_confirm
     authorize! :open_permission, ::Ishapi
@@ -62,11 +69,12 @@ class Ishapi::PaymentsController < ::Ishapi::ApplicationController
     end
 
     payment_intent = event.data.object
+    puts! payment_intent, 'payment_intent'
 
     payment = Ish::Payment.where( payment_intent_id: payment_intent.id ).first
     if payment && payment_intent['status'] == 'succeeded'
 
-      payment.update_attributes( status: :confirmed )
+      payment.update_attributes( status: Ish::Payment::STATUS_CONFIRMED )
       n_unlocks = payment.profile.n_unlocks + 1 # @TODO: it's not always 5, adjust! herehere
 
       payment.profile.update_attributes!( n_unlocks: n_unlocks, is_purchasing: false )
@@ -82,7 +90,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 +98,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.259
 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