ishapi 0.1.8.132 → 0.1.8.137

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5f3271a8289f2fc6526c0e1fe85f9724e5cc6266774fe0d3c6929be7b30f7f1
-  data.tar.gz: a0e800d62ef13b6797000bd33469f29f5bef6be2ac84c3a157b13ac4e085061c
+  metadata.gz: 4ea1237d3671ba3528065f0bbc15e6a684bb858a2a35383344d98b994812dcb2
+  data.tar.gz: 01f141ef6844db0a791350c25111c3d1abeacf500ee33428ea54bca0efc8fa71
 SHA512:
-  metadata.gz: f414e7dd9f06ed55bf31b0353bd0a6d06270414e6780a7a0154533fbc336e0b5eb502f11f07b77bed303b8ce9c8fece4eb3f9bf142d25da95035111e385c7ea8
-  data.tar.gz: 5f832287f8861b0e4ae6276339ab5ddf641303fcbb17df7204b1294b22b523c7304f74fefc5cede00b9b927574687c36f7171b1dde9b3e947656c24182718273
+  metadata.gz: 72cf3aba0fd0e4666888d3e743e7ec0764276ee24a2cd6c5886183a14c99532dc3fa74b21a1d64d6b79bc5d30f391d9d1fc7db00a0d39a828019fad607464089
+  data.tar.gz: 81fa44fd7963acf87226f59f2d546e7a596667eaf7d1beb6febc83b343ef93bfc78274a1674133e785dcb1f721755b2c9bc911985083fe015809298924ecc391

data/README.md

@@ -1,12 +1,19 @@
 
 # Develop
 
+-=----- 20201228
+
+Expects params[:jwtToken]
+no... expects params[:accessToken]
+somehow expects params[:jwt_token] ?
+
 # Test
 
  cd test/dummy
  be rspec spec
 
 # Install
+
  bundle
  gem build ishapi.gemspec
 

data/app/controllers/ishapi/application_controller.rb

@@ -6,39 +6,44 @@ module Ishapi
     layout :false
 
     # before_action :check_profile, except: [ :test ]
-    before_action :set_current_ability
+    # 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]
 
       params['domain'] = 'tgm.piousbox.com'
 
-      response = HTTParty.get "https://graph.facebook.com/v5.0/oauth/access_token?grant_type=fb_exchange_token&" +
+      response = ::HTTParty.get "https://graph.facebook.com/v5.0/oauth/access_token?grant_type=fb_exchange_token&" +
         "client_id=#{FB[params['domain']][:app]}&client_secret=#{FB[params['domain']][:secret]}&" +
         "fb_exchange_token=#{accessToken}"
       j = JSON.parse response.body
-      puts! j, 'fb response'
-      @long_term_token = j['access_token']
-
-      # get user email
+      @long_term_token  = j['access_token']
       @graph            = Koala::Facebook::API.new( accessToken )
       @me               = @graph.get_object( 'me', :fields => 'email' )
       @current_user     = User.where( :email => @me['email'] ).first
-      @profile          = @current_user.profile
 
       # send the jwt to client
-      @jwt_token = encode(user_id: @current_user.id)
+      @jwt_token = encode(user_id: @current_user.id.to_s)
+
+      render json: {
+        email: @current_user.email,
+        jwt_token: @jwt_token,
+        long_term_token: @long_term_token,
+        n_unlocks: @current_user.profile.n_unlocks,
+      }
+    end
 
-      render json: { long_term_token: @long_term_token, jwt_token: @jwt_token }
+    def home
+      authorize! :welcome_home, Ishapi
+      render :json => { :status => :ok, :message => 'Ishapi::ApiController.home',
+                        :n_reports => Report.count, :n_cities => City.count }
     end
 
     #
@@ -70,10 +75,10 @@ module Ishapi
         end
       end
     end
+
     ## Does not crap out if accessToken is missing
     def soft_check_long_term_token
       check_long_term_token soft=true
-      # puts! @profile, 'soft_check_long_term_token() profile'
     end
 
     def check_multiprofile provider = 'google'
@@ -128,25 +133,36 @@ 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]
-
+        @current_user = User.find decoded['user_id']
       else
         puts! 'check_multiprofile(): no access token'
         raise "ww1 - not implemented"
       end
 
+      # @TODO: refactor [ref-5]
       sign_in @current_user, scope: :user
       set_current_ability
     end
 
+
+
+    # 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
+        begin
+          check_profile
+        rescue JWT::ExpiredSignature
+          Rails.logger.info("JWT::ExpiredSignature")
+          @current_user = User.new profile: Profile.new
+        end
+      end
+    end
+
     # this doesn't generate long-lived token, doesn't update user_profile
-    # this is only for facebook now
     def check_profile
       puts! params, 'params'
 
@@ -154,10 +170,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]
@@ -229,10 +241,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=''
@@ -240,6 +251,14 @@ module Ishapi
       puts a.inspect
     end
 
+    # jwt
+    def check_jwt
+      decoded = decode(params[:jwt_token])
+      puts! decoded, 'decoded'
+      @current_user = User.find decoded['user_id']
+      set_current_ability
+    end
+
     # jwt
     def encode(payload, exp = 2.hours.from_now)
       payload[:exp] = exp.to_i

data/app/controllers/ishapi/galleries_controller.rb

@@ -3,7 +3,8 @@ require_dependency "ishapi/application_controller"
 module Ishapi
   class GalleriesController < ApplicationController
 
-    before_action :soft_check_long_term_token, only: [ :show ]
+    # before_action :soft_check_long_term_token, only: [ :show ]
+    before_action :check_jwt
 
     def index
       @galleries = Gallery.all

data/app/controllers/ishapi/gameui_controller.rb

@@ -21,7 +21,7 @@ module Ishapi
         :amount => params[:amount],
         :currency => 'usd',
         :source => params[:stripeToken],
-        :destination => { 
+        :destination => {
           :account => acct,
         }
       )
@@ -46,7 +46,7 @@ module Ishapi
     def do_purchase
       authorize! :do_purchase, ::Gameui
       item = params[:className].constantize.find_by_slug( params[:slug] )
-      
+
       raise 'no such item'     if !item
       raise 'too little funds' if @profile.n_stars < item.premium_tier
 

data/app/controllers/ishapi/my/galleries_controller.rb

@@ -0,0 +1,12 @@
+
+class Ishapi::My::GalleriesController < Ishapi::My::MyController
+
+  ## expects params[:jwt_token]
+  def index
+    authorize! :my_index, Gallery
+    @galleries = @current_user.profile.galleries.unscoped.where( is_trash: false ).order_by( created_at: :desc ).limit(20)
+    render 'ishapi/galleries/index'
+  end
+
+end
+

data/app/controllers/ishapi/my/my_controller.rb

@@ -4,15 +4,18 @@ module Ishapi
     class MyController < Ishapi::ApplicationController
 
       # before_action :set_profile # this is DoS on FB - disabled
-      before_action :do_login
+      # before_action :do_login
+      before_action :check_profile
+
+      def account
+        @profile = current_user.profile
+        authorize! :show, @profile
+      end
 
       private
 
       def do_login
-        puts! params, 'params'
-
         token = decode(params[:jwtToken])
-        puts! token, 'token'
         @current_user = User.find(token["user_id"])
       end
 

data/app/controllers/ishapi/my/videos_controller.rb

@@ -5,9 +5,7 @@ module Ishapi
 
       def index
         authorize! :my_index, Video
-        puts! @current_user, 'current_user'
-
-        @videos = @current_user.profile.videos.unscoped.where( is_trash: false ).limit(20)
+        @videos = @current_user.profile.videos.unscoped.where( is_trash: false ).order_by( created_at: :desc ).limit(20)
       end
 
     end

data/app/controllers/ishapi/payments_controller.rb

@@ -2,6 +2,12 @@ require_dependency "ishapi/application_controller"
 module Ishapi
   class PaymentsController < ApplicationController
 
+    before_action :check_profile, only: %i| create2 unlock |
+
+    ##
+    ## this is for invoices on wasya.co, isn't it?
+    ## 20200712
+    ##
     def create
       authorize! :open_permission, ::Ishapi
       begin
@@ -18,11 +24,10 @@ module Ishapi
           :amount => amount_cents,
           :currency => 'usd',
           :source => params[:token][:id],
-          :destination => { 
+          :destination => {
             :account => acct,
           }
         )
-        # puts! charge, 'charge'
 
         payment.charge = JSON.parse( charge.to_json )
         if payment.save
@@ -36,6 +41,73 @@ module Ishapi
       end
     end
 
+    ## This is for guyd _vp_ 20200721
+    def create2
+      authorize! :create, ::Ish::Payment
+
+      begin
+        amount_cents  = 503 # @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_user.email,
+          payment_intent_id: intent.id,
+          profile_id: @current_user.profile.id )
+
+        render json: { client_secret: intent.client_secret }
+      rescue Mongoid::Errors::DocumentNotFound => e
+        puts! e, 'e'
+        render :status => 404, :json => e
+      end
+    end
+
+    ## webhook
+    def stripe_confirm
+      authorize! :open_permission, ::Ishapi
+      payload = request.body.read
+      event = nil
+      begin
+        event = Stripe::Event.construct_from(JSON.parse(payload, symbolize_names: true))
+      rescue StandardError => e
+        puts! e, 'e'
+        render status: 400, json: { status: :not_ok }
+        return
+      end
+
+      payment_intent = event.data.object
+
+      payment = Ish::Payment.where( payment_intent_id: payment_intent.id ).first
+      if payment && payment_intent['status'] == 'succeeded'
+        payment.update_attributes( status: :confirmed )
+        payment.profile.update_attributes!( n_unlocks: payment.profile.n_unlocks + 5 )
+      end
+
+      render status: 200, json: { status: :ok }
+    end
+
+    def unlock
+      authorize! :unlock, ::Ish::Payment
+      item = Object::const_get(params['kind']).find params['id']
+
+      existing = Purchase.where( user_profile: @current_user.profile, item: item ).first
+      if existing
+        render status: 200, json: { status: :ok, message: 'already purchased' }
+        return
+      end
+
+      @current_user.profile.update_attributes n_unlocks: @current_user.profile.n_unlocks - 1 # @TODO: the number is variable
+      purchase = ::Gameui::PremiumPurchase.create!( item: item, user_profile: @current_user.profile, )
+
+      render status: 200, json: { status: :ok }
+    end
+
   end
 end
 

data/app/controllers/ishapi/sites_controller.rb

@@ -3,6 +3,8 @@ require_dependency "ishapi/application_controller"
 module Ishapi
   class SitesController < ApplicationController
 
+    before_action :check_profile_optionally, only: %i| show |
+
     def index
       authorize! :index, ::Site
       @sites = ::Site.all
@@ -14,10 +16,9 @@ module Ishapi
       else
         domain = params[:domain]
       end
-      @site = ::Site.find_by :domain => domain, :lang => :en
+      @site = ::Site.find_by(domain: domain, lang: :en)
       authorize! :show, @site
 
-
       if @site.is_private
         if !params[:accessToken]
           render :json => { :status => :unauthorized}, :status => :unauthorized

data/app/controllers/ishapi/user_profiles_controller.rb

@@ -9,12 +9,5 @@ module Ishapi
       authorize! :show, @profile
     end
 
-    def my
-      puts! params, 'params 233'
-
-      @profile = current_user.profile
-      authorize! :show, @profile
-    end
-
   end
 end

data/app/models/ishapi/ability.rb

@@ -3,7 +3,6 @@ class Ishapi::Ability
   include ::CanCan::Ability
 
   def initialize user
-
     #
     # signed in user
     #
@@ -13,15 +12,18 @@ class Ishapi::Ability
         can :manage, :all
       end
 
+      can [ :update ], ::CoTailors::Address do |address|
+        puts [ user.inspect, address.inspect ], '+++ user in cancancan'
+        true
+      end
+
+      can [ :my_index ], Gallery
       can [ :show ], Gallery do |gallery|
         gallery.user_profile == user.profile
       end
       can [ :do_purchase ], ::Gameui
 
-      can [ :update ], ::CoTailors::Address do |address|
-        puts [ user.inspect, address.inspect ], '+++ user in cancancan'
-        true
-      end
+      can [ :create, :unlock ], ::Ish::Payment
 
       can [ :buy_stars ], ::IshModels::UserProfile
 
@@ -42,6 +44,11 @@ class Ishapi::Ability
 
     can [ :index, :show ], Event
 
+    #
+    # Ish::P
+    #
+
+
     #
     # G
     #

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

@@ -11,7 +11,7 @@ json.array! @galleries do |gallery|
   json.subhead     gallery.subhead
   json.username    gallery.user_profile.name
   json.cityname    gallery.city.name    if gallery.city
-  json.tagname     gallery.tag.name_seo if gallery.tag
+  json.tag_names   gallery.tags.map &:name_seo
   json.venuename   gallery.venue.name   if gallery.venue
   json.partial! 'ishapi/photos/index', :photos => gallery.photos
 end

data/app/views/ishapi/{user_profiles/my.jbuilder → my/my/account.jbuilder}

@@ -8,6 +8,8 @@ json.n_galleries @profile.galleries.count
 json.n_videos    @profile.videos.count
 json.n_stars     @profile.n_stars
 
+json.n_unlocks @profile.n_unlocks
+
 if @profile.current_city
   json.current_city @profile.current_city
 end

data/app/views/ishapi/my/videos/index.jbuilder

@@ -1,7 +1,9 @@
 
 json.videos(@videos) do |video|
-  json.name      video.name
-  json.video_url     video.video
-  json.thumb_url     video.thumb
+  json.created_at video.created_at
+  json.id         video.id.to_s
+  json.name       video.name
+  json.thumb_url  video.thumb
+  json.video_url  video.video
 end
 

data/app/views/ishapi/newsitems/_index.jbuilder

@@ -10,7 +10,7 @@ json.newsitems do
     json.name        item.name
     json.created_at  item.created_at
     json.updated_at  item.updated_at
-    
+
     if item.gallery
       json.item_type    'gallery'
       json.name         item.gallery.name
@@ -39,7 +39,7 @@ json.newsitems do
       json.username   item.report.user_profile.name if item.report.user_profile
 
       if item.report.photo
-        json.photo_s169_url item.report.photo.photo.url( :s169 ) 
+        json.photo_s169_url item.report.photo.photo.url( :s169 )
         json.photo_thumb2_url item.report.photo.photo.url( :thumb2 )
       end
 
@@ -51,7 +51,7 @@ json.newsitems do
         json.is_purchased current_user.profile.has_premium_purchase( item.report )
       end
     end
-    
+
     if item.video_id
       json.partial! 'ishapi/videos/show', :video => Video.unscoped.find( item.video_id )
     end
@@ -60,6 +60,6 @@ json.newsitems do
       json.item_type 'photo'
       json.partial! 'ishapi/photos/index', :photos => [ item.photo ]
     end
-    
+
   end
 end

data/app/views/ishapi/sites/show.jbuilder

@@ -1,4 +1,4 @@
- 
+
 #
 # ishapi / sites / show
 #
@@ -22,7 +22,7 @@ json.cache! key do
   json.partial! 'ishapi/newsitems/index', :newsitems => @newsitems,     :resource => @site
   json.partial! 'ishapi/reports/index',   :reports   => @reports,       :resource => @site
   json.partial! 'ishapi/videos/index',    :videos    => @site.videos
-  
+
   json.feature_tags do
     json.array! @feature_tags do |feature_tag|
       json.partial! 'ishapi/tags/widget', :tag => feature_tag

data/config/routes.rb

@@ -1,6 +1,6 @@
 Ishapi::Engine.routes.draw do
-  root :to => 'api#home'
-  post 'home', :to => 'api#home'
+  root :to => 'application#home'
+  post 'home', :to => 'application#home'
 
   resources :addresses
 
@@ -15,8 +15,6 @@ Ishapi::Engine.routes.draw do
   namespace :co_tailors do
   end
 
-  post 'do_purchase', to: 'gameui#do_purchase'
-
   get 'events/view/:eventname',      :to => 'events#show'
 
   get  'galleries',                   :to => 'galleries#index'
@@ -29,17 +27,21 @@ Ishapi::Engine.routes.draw do
   get 'maps', to: 'maps#index'
   get 'maps/view/:slug', to: 'maps#show'
   get 'markers/view/:slug', to: 'maps#show_marker'
-
-  get 'my/newsitems', to: 'newsitems#index'
-  get 'my/account',   to: 'user_profiles#my'
+  get "/my/account", to: "my/my#account"
   namespace :my do
-    # post 'reports', :to => 'reports#index'
-    get  'reports', :to => 'reports#index'
-    get 'videos', to: 'videos#index'
-    post 'videos', to: 'videos#index'
+    get 'galleries', to: 'galleries#index'
+    get 'newsitems', to: 'newsitems#index'
+    get  'reports',  to: 'reports#index'
+    get  'videos',   to: 'videos#index'
+    post 'videos',   to: 'videos#index'
   end
 
+  post 'do_purchase', to: 'gameui#do_purchase' # @TODO: rename to just purchase, or destroy endpoint
   post 'payments', :to => 'payments#create'
+  post 'payments2', :to => 'payments#create2' # @TODO: change
+  get  'payments2', to: 'payments#create2'
+  post 'payments/unlock', to: 'payments#unlock' # do_purchase
+  post  'stripe_confirm', to: 'payments#stripe_confirm' # @TODO: test-drive
 
   get 'profiles/view/:username', :to => 'user_profiles#show'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.132
+  version: 0.1.8.137
 platform: ruby
 authors:
 - piousbox
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-04 00:00:00.000000000 Z
+date: 2021-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -195,7 +195,6 @@ files:
 - app/assets/stylesheets/ishapi/articles.css
 - app/assets/stylesheets/scaffold.css
 - app/controllers/ishapi/addresses_controller.rb
-- app/controllers/ishapi/api_controller.rb
 - app/controllers/ishapi/application_controller.rb
 - app/controllers/ishapi/articles_controller.rb
 - app/controllers/ishapi/cities_controller.rb
@@ -205,6 +204,7 @@ files:
 - app/controllers/ishapi/invoices_controller.rb
 - app/controllers/ishapi/maps_controller.rb
 - app/controllers/ishapi/measurements_controller.rb
+- app/controllers/ishapi/my/galleries_controller.rb
 - app/controllers/ishapi/my/my_controller.rb
 - app/controllers/ishapi/my/reports_controller.rb
 - app/controllers/ishapi/my/videos_controller.rb
@@ -249,6 +249,7 @@ files:
 - app/views/ishapi/maps/index.jbuilder
 - app/views/ishapi/maps/show.jbuilder
 - app/views/ishapi/measurements/_show.jbuilder
+- app/views/ishapi/my/my/account.jbuilder
 - app/views/ishapi/my/videos/index.jbuilder
 - app/views/ishapi/newsitems/_index.jbuilder
 - app/views/ishapi/newsitems/index.jbuilder
@@ -265,7 +266,6 @@ files:
 - app/views/ishapi/tags/_widget.jbuilder
 - app/views/ishapi/tags/index.jbuilder
 - app/views/ishapi/tags/show.jbuilder
-- app/views/ishapi/user_profiles/my.jbuilder
 - app/views/ishapi/user_profiles/show.jbuilder
 - app/views/ishapi/users/_index.jbuilder
 - app/views/ishapi/users/show.jbuilder
@@ -284,7 +284,7 @@ homepage: http://wasya.co
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -300,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Summary of Ishapi.
 test_files: []

data/app/controllers/ishapi/api_controller.rb

@@ -1,13 +0,0 @@
-require_dependency "ishapi/application_controller"
-
-module Ishapi
-  class ApiController < UnrestrictedController
-
-    def home
-      authorize! :welcome_home, Ishapi
-      render :json => { :status => :ok, :message => 'Ishapi::ApiController.home', 
-                        :n_reports => Report.count, :n_cities => City.count }
-    end
-
-  end
-end