ishapi 0.1.8.194 → 0.1.8.196

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59e8e484d3741e6599d8d8397cfad5dd499635f956c92ed0ed9265172ea30e73
-  data.tar.gz: 5a1c6b3c8a307cf402167ced6ae4280d943f26c2791848e7cf084a7cee336c24
+  metadata.gz: 4cac74ad18c61255a3db45b0192d67c09f2ca7b498f7979d47983709f7a0036d
+  data.tar.gz: a04ddbdf71da020e89a4baf912f5796600ae37a215828cf01fc4538d5b689ff2
 SHA512:
-  metadata.gz: b7dba64e22efac66fc5167e3d9dfbca15572adfdf0d867f0abe74ab464fbae30020eae2038b59e52b48f2826f66dedd08bc0680c7a6e42eddfc80cd6729eee92
-  data.tar.gz: 7eaaccd91a551e98134431730f4cdee21f85bc580d9d7953054a9bb7abc2b9351418de9a32e3ed9bcce5eeca901c2882419f7b5f83957ff479eddf0758584365
+  metadata.gz: b8deb4efaf0d7c0fcfebda5a5484048f2bbf75350bf8865f8139eac9ebb42373a9f19f1dd79e5bea1220cdf04c4a4dcc494cb920a533f32da59864548518e1e3
+  data.tar.gz: b6bf703266e85ac946b3af85c3467cf61f6b33e6ea00025b55f6825d1fc9372a29bf8b5ed19a225dc6137e965c8d9e6a8e27427519d259ba333c9ea30e19fc3a

data/Rakefile

@@ -17,11 +17,8 @@ end
 APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
 load 'rails/tasks/statistics.rake'
 
-
-
 require 'bundler/gem_tasks'
 
 require 'rake/testtask'

data/app/controllers/ishapi/application_controller.rb

@@ -19,7 +19,7 @@ class Ishapi::ApplicationController < ActionController::Base
     @long_term_token  = j['access_token']
     @graph            = Koala::Facebook::API.new( accessToken )
     @me               = @graph.get_object( 'me', :fields => 'email' )
-    @current_user     = TmpUser.where( :email => @me['email'] ).first
+    @current_user     = User.where( :email => @me['email'] ).first
 
     # send the jwt to client
     @jwt_token = encode(user_id: @current_user.id.to_s)
@@ -28,7 +28,7 @@ class Ishapi::ApplicationController < ActionController::Base
       email: @current_user.email,
       jwt_token: @jwt_token,
       long_term_token: @long_term_token,
-      n_unlocks: @current_user.profile.n_unlocks,
+      n_unlocks: @current_profile.n_unlocks,
     }
   end
 
@@ -56,26 +56,24 @@ class Ishapi::ApplicationController < ActionController::Base
 
   private
 
-  ## This returns an empty user if not logged in!
+  ## This returns an empty profile if not logged in!
   def check_profile
     begin
       decoded = decode(params[:jwt_token])
-      @current_user = User.find decoded['user_id']
+      @current_profile = Ish::UserProfile.find decoded['user_profile_id']
     rescue JWT::ExpiredSignature, JWT::DecodeError => e
-      # flash[:notice] = 'You are not logged in, or you have been logged out.'
-      # puts! 'You are not logged in, or you have been logged out.'
-      @current_user = TmpUser.new({ profile: Ish::UserProfile.new })
+      flash[:notice] = 'You are not logged in, or you have been logged out.'
+      @current_profile = Ish::UserProfile.new
     end
   end
 
-  ## This errors out if not logged in!
-  def check_profile_hard
+  ## If not logged in, errors out
+  def check_profile!
     begin
       decoded = decode(params[:jwt_token])
-      @current_user = TmpUser.find decoded['user_id']
+      @current_profile = Ish::UserProfile.find decoded['user_profile_id']
     rescue JWT::ExpiredSignature, JWT::DecodeError => e
-      # flash[:notice] = 'You are not logged in, or you have been logged out.'
-      # puts! 'You are not logged in, or you have been logged out.'
+      flash[:notice] = 'You are not logged in, or you have been logged out.'
     end
   end
 
@@ -83,7 +81,7 @@ class Ishapi::ApplicationController < ActionController::Base
   def check_jwt
     begin
       decoded = decode(params[:jwt_token])
-      @current_user = TmpUser.find decoded['user_id']
+      @current_profile = Ish::UserProfile.find decoded['user_profile_id']
     rescue JWT::ExpiredSignature
       Rails.logger.info("JWT::ExpiredSignature")
     rescue JWT::DecodeError
@@ -105,7 +103,7 @@ class Ishapi::ApplicationController < ActionController::Base
   end
 
   def current_ability
-    @current_ability ||= Ishapi::Ability.new( @current_user )
+    @current_ability ||= Ishapi::Ability.new( @current_profile )
   end
 
 end

data/app/controllers/ishapi/galleries_controller.rb

@@ -9,10 +9,6 @@ module Ishapi
     def index
       @galleries = Gallery.all
       authorize! :index, Gallery
-      if params[:cityname]
-        city = City.find_by :cityname => params[:cityname]
-        @galleries = @galleries.where( :city => city )
-      end
       if params[:domain]
         @site = Site.find_by( :domain => params[:domain], :lang => 'en' )
         @galleries = @galleries.where( :site => @site )

data/app/controllers/ishapi/maps_controller.rb

@@ -14,7 +14,7 @@ class Ishapi::MapsController < Ishapi::ApplicationController
     @newsitems = @location.newsitems.page( params[:newsitems_page]
       ).per( @location.newsitems_page_size )
 
-    @markers = @map.markers.permitted_to(@current_user.profile).order_by(ordering: :asc)
+    @markers = @map.markers.permitted_to(@current_profile).order_by(ordering: :asc)
     # case @map.ordering_type
     # when ::Gameui::Map::ORDERING_TYPE_ALPHABETIC
     #   @markers = @markers.order_by( name: :asc )
@@ -22,15 +22,11 @@ class Ishapi::MapsController < Ishapi::ApplicationController
     #   @markers = @markers.order_by( ordering: :asc )
     # end
 
-    @tags = @map.tags
-
-    if @map.is_premium && !@current_user.profile.has_premium_purchase( @map )
+    if @map.is_premium && !@current_profile.has_premium_purchase( @map )
       render 'show_restricted'
     else
       render 'show'
     end
-
-
   end
 
   def show_marker

data/app/controllers/ishapi/payments_controller.rb

@@ -51,7 +51,7 @@ module Ishapi
     ##
     def create2
       authorize! :create, ::Ish::Payment
-      current_user.profile.update_attributes({ is_purchasing: true })
+      @current_profile.update_attributes({ is_purchasing: true })
 
       begin
         amount_cents  = params[:amount_cents].to_i # @TODO: change
@@ -65,9 +65,9 @@ module Ishapi
 
         payment = Ish::Payment.create!(
           client_secret: intent.client_secret,
-          email: current_user.email,
+          email: @current_profile.email,
           payment_intent_id: intent.id,
-          profile_id: current_user.profile.id,
+          profile_id: @current_profile.id,
         )
 
         render json: { client_secret: intent.client_secret }
@@ -110,18 +110,18 @@ module Ishapi
       authorize! :unlock, ::Ish::Payment
       item = Object::const_get(params['kind']).find params['id']
 
-      existing = Purchase.where( user_profile: @current_user.profile, item: item ).first
+      existing = Purchase.where( user_profile: @current_profile, item: item ).first
       if existing
         render status: 200, json: { status: :ok, message: 'already purchased' }
         return
       end
 
-      @current_user.profile.inc( n_unlocks: -item.premium_tier )
+      @current_profile.inc( n_unlocks: -item.premium_tier )
 
-      purchase = ::Gameui::PremiumPurchase.create!( item: item, user_profile: @current_user.profile, )
+      purchase = ::Gameui::PremiumPurchase.create!( item: item, user_profile: @current_profile, )
 
-      @profile = @current_user.profile
-      render 'ishapi/users/account'
+      @profile = @current_profile
+      render 'ishapi/user_profiles/account'
     end
 
   end

data/app/controllers/ishapi/users/registrations_controller.rb

@@ -5,7 +5,7 @@ class Ishapi::Users::RegistrationsController < Devise::RegistrationsController
   def create
     build_resource(sign_up_params)
     resource.save
-    resource.profile = Ish::UserProfile.create({ user: resource, email: resource.email })
+    user_profile = Ish::UserProfile.create({ email: resource.email })
     yield resource if block_given?
     if resource.persisted?
       render json: {

data/app/controllers/ishapi/users/sessions_controller.rb

@@ -11,9 +11,9 @@ class Ishapi::Users::SessionsController < Devise::SessionsController
 
     ## Send the jwt to client
     @current_user = resource
-    @jwt_token = encode(user_id: @current_user.id.to_s)
-    @profile = @current_user.profile
-    render 'ishapi/users/login', format: :json, layout: false
+    @current_profile = Ish::UserProfile.find_by({ email: @current_user.email })
+    @jwt_token = encode(user_profile_id: @current_profile.id.to_s)
+    render 'ishapi/user_profiles/login', format: :json, layout: false
   end
 
   private

data/app/controllers/ishapi/users_controller.rb

@@ -1,45 +1,43 @@
-# require_dependency "ishapi/application_controller"
 
-module Ishapi
-  class UsersController < Ishapi::ApplicationController
+##
+## Cannot move this class right now - it gets hit verifying user's account, every time.
+## @TODO: merge with user_profiles_controller. _vp_ 2022-10-13
+##
+class ::Ishapi::UsersController < Ishapi::ApplicationController
 
-    skip_authorization_check only: %i| create fb_sign_in login |
+  skip_authorization_check only: %i| create fb_sign_in login |
 
+  before_action :check_profile!, only: %i| account |
 
-    before_action :check_profile_hard, only: %i| account |
+  def account
+    authorize! :show, @current_profile
+    render 'ishapi/user_profiles/account'
+  rescue CanCan::AccessDenied
+    render json: {
+      status: :not_ok,
+    }, status: 401
+  end
 
-    def account
-      @profile = @current_user&.profile
-      authorize! :show, @profile
-      render 'ishapi/users/account'
-    rescue CanCan::AccessDenied
-      render json: {
-        status: :not_ok,
-      }, status: 401
-    end
+  def create
+    authorize! :open_permission, Ishapi
+    new_user_params = params[:user].permit!
 
-    def create
-      authorize! :open_permission, Ishapi
-      new_user_params = params[:user].permit!
-
-      @profile = Profile.new( email: new_user_params[:email] )
-      @user = User.new( email: new_user_params[:email], password: new_user_params[:password], profile: @profile )
-
-      if @profile.save && @user.save
-        @jwt_token = encode(user_id: @user.id.to_s)
-        render 'login'
-      else
-        render json: {
-          messages: @user.errors.messages.merge( @profile.errors.messages ),
-        }, status: 400
-      end
-    end
+    @profile = Profile.new( email: new_user_params[:email] )
+    @user = User.new( email: new_user_params[:email], password: new_user_params[:password], profile: @profile )
 
-    def fb_sign_in
-      authorize! :fb_sign_in, Ishapi
-      # render :json => { :status => :ok }
-      render :action => 'show'
+    if @profile.save && @user.save
+      @jwt_token = encode(user_id: @user.id.to_s)
+      render 'ishapi/user_profiles/login'
+    else
+      render json: {
+        messages: @user.errors.messages.merge( @profile.errors.messages ),
+      }, status: 400
     end
+  end
 
+  def fb_sign_in
+    authorize! :fb_sign_in, Ishapi
+    render 'ishapi/user_profiles/show'
   end
+
 end

data/app/controllers/ishapi/videos_controller.rb

@@ -10,15 +10,6 @@ module Ishapi
     def index
       authorize! :index, Video
       @videos = Video.all
-      if params[:cityname]
-        city = City.find_by :cityname => params[:cityname]
-        @videos = @videos.where( :city_id => city.id )
-      end
-      if params[:domain]
-        site = Site.find_by :domain => params[:domain], :lang => :en
-        @videos = @videos.where( :site_id => site.id )
-      end
-
       @videos = @videos.page( params[:videos_page] ).per( 10 )
     end
 

data/app/helpers/ishapi/application_helper.rb

@@ -2,7 +2,7 @@ module Ishapi
   module ApplicationHelper
 
     def image_missing
-      'https://s3.amazonaws.com/ish-wp/wp-content/uploads/2022/02/25232018/100x100_crossout.png'
+      'https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/02/25232018/100x100_crossout.png'
     end
 
   end

data/app/models/ishapi/ability.rb

@@ -2,30 +2,26 @@
 class Ishapi::Ability
   include ::CanCan::Ability
 
-  def initialize user
+  def initialize user_profile
     #
-    # signed in user
+    # signed in user_profile
     #
-    if !user.blank?
-
-      # if user.profile && user.profile.sudoer?
-      #   can :manage, :all
-      # end
+    if !user_profile.blank?
 
       can [ :my_index ], Gallery
       can [ :show ], Gallery do |gallery|
-        gallery.user_profile == user.profile || # my own
+        gallery.user_profile == user_profile || # my own
         (!gallery.is_trash && gallery.is_public ) || # public
-        (!gallery.is_trash && gallery.shared_profiles.include?( user.profile ) ) # shared with me
+        (!gallery.is_trash && gallery.shared_profiles.include?( user_profile ) ) # shared with me
       end
 
       can [ :do_purchase ], ::Gameui
       can [ :show ], ::Gameui::Map do |map|
-        map.creator_profile == user.profile
+        map.creator_profile == user_profile
       end
 
       can [ :destroy ], Newsitem do |n|
-        n.map.creator_profile.id == user.profile.id
+        n.map.creator_profile.id == user_profile.id
       end
 
       can [ :create, :unlock ], ::Ish::Payment
@@ -43,10 +39,6 @@ class Ishapi::Ability
       p.user.id.to_s == user.id.to_s
     end
 
-    can [ :index, :show ], City
-
-    can [ :index, :show ], Event
-
     #
     # G
     #
@@ -65,7 +57,7 @@ class Ishapi::Ability
     #
     can [ :index ], ::Gameui::Map
     can [ :show ], ::Gameui::Map do |map|
-      map.is_public || map.shared_profiles.include?( user.profile )
+      map.is_public || map.shared_profiles.include?( user_profile )
     end
     can [ :show ], ::Gameui::Marker do |m|
       m.is_public
@@ -87,23 +79,14 @@ class Ishapi::Ability
     #
     # S
     #
-    can [ :index, :show ], Site
 
     #
     # T
     #
-    can [ :index ], Tag
-    can [ :show ], Tag do |tag|
-      tag.is_public
-    end
 
     #
     # V
     #
-    can [ :index ], Venue
-    can [ :show ], Venue do |venue|
-      venue.is_public
-    end
     can [ :index, :my_index ], Video
     can [ :show ], Video do |video|
       video.is_public

data/app/views/ishapi/application/_meta.jbuilder

@@ -3,18 +3,8 @@
 # ishapi / application / _meta
 #
 
-if !item.tags.blank?
-  json.partial! 'ishapi/tags/index', tags: item.tags
-end
 json.created_at  item.created_at
 json.updated_at  item.updated_at
 json.username    item.user_profile.name if item.user_profile
-if item.city
-  json.city do
-    json.name item.city.name
-    json.slug item.city.cityname
-  end
-  json.cityname    item.city.cityname
-end
 json.subhead     item.subhead
 json.description item.descr

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

@@ -17,7 +17,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_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/index.jbuilder

@@ -6,13 +6,10 @@
 json.array! @galleries do |gallery|
   json.id          gallery.id.to_s
   json.name        gallery.name
-  json.slug gallery.slug
+  json.slug        gallery.slug
   json.slug        gallery.slug
   json.subhead     gallery.subhead
   json.username    gallery.user_profile.name
-  json.cityname    gallery.city.name    if gallery.city
-  json.tag_names   gallery.tags.map &:slug
-  json.venuename   gallery.venue.name   if gallery.venue
   json.partial! 'ishapi/photos/index', :photos => gallery.photos
 end
 

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

@@ -22,7 +22,7 @@ json.cache! this_key do
 
     json.premium_tier map.premium_tier
     json.is_premium   map.is_premium
-    json.is_purchased current_user&.profile&.has_premium_purchase( map )
+    json.is_purchased @current_profile&.has_premium_purchase( map )
 
     json.breadcrumbs do
       json.array! map.breadcrumbs do |b|
@@ -40,10 +40,6 @@ json.cache! this_key do
       json.partial! 'ishapi/newsitems/index', newsitems: newsitems
     end
 
-    if tags
-      json.partial! 'ishapi/tags/index', tags: tags
-    end
-
     if map.map
       json.partial! 'ishapi/maps/show', map: map.map
     end

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

@@ -2,5 +2,5 @@
 # ishapi / maps / show
 #
 
-json.partial! 'ishapi/maps/show', map: @map, markers: @markers, newsitems: @newsitems, tags: @tags
+json.partial! 'ishapi/maps/show', map: @map, markers: @markers, newsitems: @newsitems
 

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

@@ -25,8 +25,8 @@ json.markers do
       json.is_premium       destination.is_premium
       json.id               destination.id.to_s
       if destination.is_premium
-        if current_user && current_user.profile
-          json.is_purchased current_user.profile.has_premium_purchase( destination )
+        if @current_profile
+          json.is_purchased @current_profile.has_premium_purchase( destination )
         end
       end
     end

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

@@ -16,8 +16,8 @@ json.newsitems do
     json.description item.description
 
     json.votes_score item.votes_score
-    if @current_user&.profile
-      json.current_user_vote_value item.vote_value(@current_user.profile.id)
+    if @current_profile
+      json.current_user_vote_value item.vote_value(@current_profile.id)
     end
 
 
@@ -34,7 +34,7 @@ json.newsitems do
       if item.gallery.is_premium
         json.premium_tier item.gallery.premium_tier
         json.is_premium   item.gallery.premium_tier > 0
-        json.is_purchased current_user&.profile&.has_premium_purchase( item.gallery )
+        json.is_purchased @current_profile&.has_premium_purchase( item.gallery )
         json.partial!    'ishapi/photos/index',     :photos => [ item.gallery.photos[0] ]
       else
         json.partial!    'ishapi/photos/index',     :photos => item.gallery.photos[0...3]
@@ -63,7 +63,7 @@ json.newsitems do
         if item.report.is_premium
           json.premium_tier item.report.premium_tier
           json.is_premium   item.report.premium_tier > 0
-          json.is_purchased current_user&.profile&.has_premium_purchase( item.report )
+          json.is_purchased @current_profile&.has_premium_purchase( item.report )
         end
       end
     end

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

@@ -20,7 +20,5 @@ json.reports do
       end
     end
 
-    json.partial! 'ishapi/tags/index', tags: report.tags unless report.tags.blank?
-
   end
 end

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

@@ -21,7 +21,6 @@ json.cache! key do
     json.created_at  @report.created_at
     json.updated_at  @report.updated_at
     json.username    @report.user_profile.name if @report.user_profile
-    json.cityname    @report.city.cityname if @report.city
     json.subhead     @report.subhead
 
     case @report.item_type
@@ -38,8 +37,6 @@ json.cache! key do
         json.large_url @report.photo.photo.url :large
       end
     end
-
-    json.partial! 'ishapi/tags/index',   :tags   => @report.tags
   end
 
   # @deprecated, but specs use this _vp_ 20180423

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

@@ -0,0 +1,21 @@
+
+json.id                profile.id.to_s
+json.name              profile.name
+json.email             profile.email
+json.profile_photo_url profile.profile_photo.photo.url( :thumb ) if profile.profile_photo
+
+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
+

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

@@ -0,0 +1,2 @@
+
+json.partial! 'ishapi/user_profiles/account', profile: @current_profile

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

@@ -0,0 +1,5 @@
+
+json.email     @current_profile.email
+json.n_unlocks @current_profile.n_unlocks
+json.jwt_token @jwt_token
+json.partial!  'ishapi/user_profiles/account', profile: @current_profile

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

@@ -7,7 +7,3 @@ json.n_galleries @profile.galleries.count
 json.n_videos    @profile.videos.count
 json.n_stars     @profile.n_stars
 
-if @profile.current_city
-  json.current_city @profile.current_city
-end
-

data/app/views/ishapi/{users/show.jbuilder → user_profiles/show.jbuilder-bk}

@@ -1,7 +1,4 @@
 
-#
-# ishapi / users / show.jbuilder
-#
 
 json.email                @current_profile.email
 json.about                @current_profile.about
@@ -23,5 +20,5 @@ if @current_profile.measurement
   json.partial! 'ishapi/measurements/show', :measurement => @current_profile.measurement
 end
 
-json.partial! 'ishapi/orders/show', :order => @current_order
+# json.partial! 'ishapi/orders/show', :order => @current_order
 

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

@@ -13,14 +13,6 @@ json.x           video.x
 json.y           video.y
 json.url         video.video.url
 
-if video.city
-  json.cityname video.city.cityname
-  json.city do
-    json.name video.city.name
-    json.slug video.city.cityname
-  end
-end
-
 json.tags         [ { slug: 'adventure', name: 'Adventure' },
                     { slug: 'bars-and-clubs', name: 'Bars & Clubs' },
                     { slug: 'food', name: 'Food' },
@@ -34,8 +26,8 @@ end
 if video.is_premium
   json.premium_tier video.premium_tier
   json.is_premium   video.premium_tier > 0
-  if current_user && current_user.profile
-    json.is_purchased current_user.profile.has_premium_purchase( video )
+  if @current_profile
+    json.is_purchased @current_profile.has_premium_purchase( video )
   end
 end