ishapi 0.1.8.194 → 0.1.8.196

data/config/routes.rb

@@ -6,12 +6,6 @@ Ishapi::Engine.routes.draw do
 
   resources :addresses
 
-  get 'cities',                :to => 'cities#index'
-  get 'cities/view/:cityname', :to => 'cities#show'
-  get 'cities/features',       :to => 'cities#features'
-
-  get 'events/view/:eventname',      :to => 'events#show'
-
   get  'galleries',                   :to => 'galleries#index'
   post 'galleries',                   :to => 'galleries#index'
   get  'galleries/view/:slug', :to => 'galleries#show'
@@ -24,11 +18,11 @@ Ishapi::Engine.routes.draw do
   get 'markers/view/:slug', to: 'maps#show_marker'
   match  "/my/account", to: "users#account", via: [ :get, :post ]
   namespace :my do
-    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'
+    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
 
   # N
@@ -47,19 +41,12 @@ Ishapi::Engine.routes.draw do
   get 'reports', :to => 'reports#index'
   get 'reports/view/:slug', :to => 'reports#show'
 
-  get  'sites/view/:domain',                            :to => 'sites#show',      :constraints => { :domain => /[^\/]+/ }
-  post 'sites/view/:domain',                            :to => 'sites#show',      :constraints => { :domain => /[^\/]+/ }
-  get  'sites/view/:domain/newsitems/:newsitems_page',  :to => 'newsitems#index', :constraints => { :domain => /[^\/]+/ }
-  get  'sites/view/:domain/reports',                    :to => 'reports#index',   :constraints => { :domain => /[^\/]+/ }
-  get  'sites/view/:domain/reports/page/:reports_page', :to => 'reports#index',   :constraints => { :domain => /[^\/]+/ }
-  get  'sites/view/:domain/tags',                       :to => 'tags#index',      :constraints => { :domain => /[^\/]+/ }
-
   post 'stars/buy', to: 'gameui#buy_stars'
 
   ## 2022-02-12 moved to iron_warbler gem _vp_
   # resources "stock_watches"
 
-  get 'tags/view/:slug', :to => 'tags#show'
+
   get 'test', to: 'application#test'
 
   post  'users/fb_sign_in',      to: 'users#fb_sign_in'
@@ -75,9 +62,6 @@ Ishapi::Engine.routes.draw do
 
   post 'v1/vote/:votee_class_name/:votee_id/:voter_id/:value', to: 'application#vote'
 
-  get 'venues', :to => 'venues#index'
-  get 'venues/view/:venuename', :to => 'venues#show'
-
   resources :videos
 
 end

data/lib/ishapi/engine.rb

@@ -1,7 +1,7 @@
 
 require 'rubygems'
 require 'rack/throttle'
-# require 'jbuilder'
+require 'jbuilder' # _vp_ 2022-10-07 - otherwise host app cant find templates
 
 module Ishapi
   class Engine < ::Rails::Engine

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.194
+  version: 0.1.8.196
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-04 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -266,15 +266,10 @@ files:
 - app/assets/stylesheets/scaffold.css
 - app/controllers/ishapi/addresses_controller.rb
 - app/controllers/ishapi/application_controller.rb
-- app/controllers/ishapi/application_controller.rb-trash
-- app/controllers/ishapi/articles_controller.rb
-- app/controllers/ishapi/cities_controller.rb
-- app/controllers/ishapi/events_controller.rb
 - app/controllers/ishapi/galleries_controller.rb
 - app/controllers/ishapi/gameui_controller.rb
 - 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/reports_controller.rb
 - app/controllers/ishapi/my/videos_controller.rb
@@ -284,36 +279,20 @@ files:
 - app/controllers/ishapi/payments_controller.rb
 - app/controllers/ishapi/photos_controller.rb
 - app/controllers/ishapi/reports_controller.rb
-- app/controllers/ishapi/sites_controller.rb
 - app/controllers/ishapi/stock_watches_controller.rb
-- app/controllers/ishapi/tags_controller.rb
 - app/controllers/ishapi/user_profiles_controller.rb
 - app/controllers/ishapi/users/registrations_controller.rb
 - app/controllers/ishapi/users/sessions_controller.rb
 - app/controllers/ishapi/users_controller.rb
-- app/controllers/ishapi/venues_controller.rb
 - app/controllers/ishapi/videos_controller.rb
 - app/helpers/ishapi/application_helper.rb
 - app/jobs/ishapi/application_job.rb
 - app/mailers/ishapi/application_mailer.rb
 - app/mailers/ishapi/confirmations_mailer.rb
 - app/models/ishapi/ability.rb
-- app/models/tmp_user.rb
 - app/views/ishapi/addresses/_show.jbuilder
 - app/views/ishapi/application/_meta.jbuilder
 - app/views/ishapi/application/_pagination.jbuilder
-- app/views/ishapi/articles/_form.html.erb
-- app/views/ishapi/articles/edit.html.erb
-- app/views/ishapi/articles/index.html.erb
-- app/views/ishapi/articles/new.html.erb
-- app/views/ishapi/articles/show.html.erb
-- app/views/ishapi/cities/_index.jbuilder
-- app/views/ishapi/cities/features.jbuilder
-- app/views/ishapi/cities/index.jbuilder
-- app/views/ishapi/cities/show.jbuilder
-- app/views/ishapi/events/_index.jbuilder
-- app/views/ishapi/events/show.jbuilder
-- app/views/ishapi/features/_index.jbuilder
 - app/views/ishapi/galleries/_index.jbuilder
 - app/views/ishapi/galleries/_show.jbuilder
 - app/views/ishapi/galleries/index.jbuilder
@@ -343,21 +322,13 @@ files:
 - app/views/ishapi/reports/_index.jbuilder
 - app/views/ishapi/reports/index.jbuilder
 - app/views/ishapi/reports/show.jbuilder
-- app/views/ishapi/sites/show.jbuilder
 - app/views/ishapi/stock_watches/index.jbuilder
-- app/views/ishapi/tags/_index.jbuilder
-- app/views/ishapi/tags/_widget.jbuilder
-- app/views/ishapi/tags/index.jbuilder
-- app/views/ishapi/tags/show.jbuilder
+- app/views/ishapi/user_profiles/_account.jbuilder
+- app/views/ishapi/user_profiles/_index.jbuilder
+- app/views/ishapi/user_profiles/account.jbuilder
+- app/views/ishapi/user_profiles/login.jbuilder
 - app/views/ishapi/user_profiles/show.jbuilder
-- app/views/ishapi/users/_account.jbuilder
-- app/views/ishapi/users/_index.jbuilder
-- app/views/ishapi/users/account.jbuilder
-- app/views/ishapi/users/login.jbuilder
-- app/views/ishapi/users/show.jbuilder
-- app/views/ishapi/venues/_index.jbuilder
-- app/views/ishapi/venues/index.jbuilder
-- app/views/ishapi/venues/show.jbuilder
+- app/views/ishapi/user_profiles/show.jbuilder-bk
 - app/views/ishapi/videos/_index.jbuilder
 - app/views/ishapi/videos/_show.jbuilder
 - app/views/ishapi/videos/index.jbuilder

data/app/controllers/ishapi/application_controller.rb-trash

@@ -1,275 +0,0 @@
-module Ishapi
-  class ApplicationController < ActionController::Base
-    after_action :append_long_term_token, except: [ :long_term_token, :test ]
-
-    protect_from_forgery :prepend => true, :with => :exception
-    layout :false
-
-    check_authorization except: [ :long_term_token ]
-    skip_before_action :verify_authenticity_token
-
-    def test
-    end
-
-    def long_term_token
-      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&" +
-        "client_id=#{FB[params['domain']][:app]}&client_secret=#{FB[params['domain']][:secret]}&" +
-        "fb_exchange_token=#{accessToken}"
-      j = JSON.parse response.body
-      @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
-
-      # send the jwt to client
-      @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
-
-    def home
-      authorize! :welcome_home, Ishapi
-      render :json => { :status => :ok, :message => 'Ishapi::ApiController.home',
-                        :n_reports => Report.count, :n_cities => City.count }
-    end
-
-    #
-    # private
-    #
-    private
-
-    def append_long_term_token
-      if @long_term_token
-        response.body = JSON.parse(response.body).merge({ long_term_token: @long_term_token }).to_json
-      end
-    end
-
-    ## Hard check by default; craps out if accessToken is missing
-    def check_long_term_token soft=false
-      accessToken   = request.headers[:accessToken]
-      accessToken ||= params[:accessToken]
-      if accessToken
-        @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
-        raise '98& - no profile' unless @profile
-      else
-        if soft
-          return
-        else
-          raise 'no access token'
-        end
-      end
-    end
-
-    ## Does not crap out if accessToken is missing
-    def soft_check_long_term_token
-      check_long_term_token soft=true
-    end
-
-    def check_multiprofile provider = 'google'
-      if 'google' == provider
-        # client_secrets = ::Google::APIClient::ClientSecrets.load
-        # accessToken = params[:accessToken]
-        # authorization = ::Google::Auth.get_application_default
-        # result = authorization.apply({ accessToken: params[:accessToken] })
-        # puts! result, 'googleauth result'
-
-        decoded_token = JWT.decode params[:idToken], nil, false
-
-        @current_user = User.find_by email: decoded_token[0]['email']
-
-      elsif 'facebook' == provider
-        # accessToken ||= params[:fb_long_access_token]
-
-        accessToken   = request.headers[:accessToken]
-        accessToken ||= params[:accessToken]
-        if accessToken
-
-          #
-          # long-term token
-          #
-          params['domain'] = 'tgm.piousbox.com'
-          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
-          @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
-          @current_user   ||= User.create! email: @me['email'], password: SecureRandom.urlsafe_base64
-
-          @current_profile = @current_user.profile
-          if !@current_profile
-            begin
-              g = Gallery.find '5e1495e2d697f768ad0779eb'
-            rescue Mongoid::Errors::DocumentNotFound => e
-              g = Gallery.create id: '5e1495e2d697f768ad0779eb'
-            end
-            @current_profile = IshModels::UserProfile.create user: @current_user, name: @me['email'], email: @me['email']
-            test_newsitem = Newsitem.new gallery_id: '5e1495e2d697f768ad0779eb'
-            @current_profile.newsitems << test_newsitem
-            @current_profile.save
-          end
-          @current_profile.update fb_long_access_token: @long_term_token
-        else
-          @current_user     = current_user  if Rails.env.test?
-        end
-
-      elsif 'jwt' == provider
-        decoded = decode(params[:jwt_token])
-        @current_user = User.find decoded['user_id']
-        puts! @current_user, '@current_user from decoded'
-      else
-        raise "ww1 - not implemented"
-      end
-
-      sign_in @current_user, scope: :user
-      puts! current_user, 'did I sign in?'
-      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
-    def check_profile
-      # return check_multiprofile 'google'
-      # return check_multiprofile 'facebook'
-      return check_multiprofile 'jwt'
-
-      accessToken   = request.headers[:accessToken]
-      accessToken ||= params[:fb_long_access_token]
-      accessToken ||= params[:accessToken]
-      if accessToken
-        @graph            = Koala::Facebook::API.new( accessToken )
-        @me               = @graph.get_object( 'me', :fields => 'email' )
-        @current_user     = User.find_by :email => @me['email']
-      else
-        @current_user     = current_user  if Rails.env.test?
-      end
-      @current_profile  = @current_user.profile
-      @current_order    = @current_profile.current_order
-      # orders.where( :submitted_at => nil ).first || ::CoTailors::Order.create( :profile_id => @current_profile.id )
-
-      ## for sedux
-      sign_in( @current_user )
-    end
-
-    def set_profile
-      accessToken   = request.headers[:accessToken]
-      accessToken ||= params[:fb_long_access_token]
-      accessToken ||= params[:accessToken]
-
-      # params[:domain] ||= '_default'
-
-      if accessToken
-        begin
-          @graph            = Koala::Facebook::API.new( accessToken )
-          @me               = @graph.get_object( 'me', :fields => 'email' )
-          @current_user     = User.find_or_create_by :email => @me['email']
-          @oauth            = Koala::Facebook::OAuth.new( FB[params['domain']][:app], FB[params['domain']][:secret] )
-          get_token         = get_long_token( accessToken )
-          @long_lived_token = get_token['access_token']
-
-          begin
-            @current_profile = IshModels::UserProfile.find_by :email => @me['email']
-            @current_profile.update_attributes({ :fb_access_token      => @long_lived_token,
-                                         :fb_long_access_token => @long_lived_token,
-                                         :fb_expires_in        => get_token['expires_in']
-                                       })
-          rescue Mongoid::Errors::DocumentNotFound
-            @current_profile = IshModels::UserProfile.create :user => @current_user, :email => @me['email'],
-                                                             :fb_access_token       => @long_lived_token,
-                                                             :fb_long_access_token  => @long_lived_token,
-                                                             :fb_expires_in         => get_token['expires_in'],
-                                                             :fb_id                 => params[:id],
-                                                             :name                  => params[:name],
-                                                             :signed_request        => params[:signedRequest]
-          end
-          @current_user.reload
-        rescue Koala::Facebook::AuthenticationError => e
-          render :json => { :status => :not_ok, :errors => "Probably expired token: #{accessToken}" }
-          return
-        end
-      else
-        @current_user = current_user if Rails.env.test?
-      end
-      @current_profile = @current_user.profile
-      @current_order   = @current_profile.current_order
-      # orders.where( :submitted_at => nil ).first || ::CoTailors::Order.new( :profile_id => @current_profile.id )
-    end
-
-    def get_long_token accessToken
-      url = "https://graph.facebook.com/oauth/access_token?grant_type=fb_exchange_token&" +
-            "client_id=#{FB[params['domain']][:app]}&client_secret=#{FB[params['domain']][:secret]}&fb_exchange_token=#{accessToken}"
-      result = HTTParty.get url
-      token  = JSON.parse result.body
-      return token # ['access_token']
-    end
-
-    def current_ability
-      # @current_user ||= User.new({ profile: ::IshModels::UserProfile.new })
-      @current_ability ||= Ishapi::Ability.new( current_user )
-    end
-
-    def puts! a, b=''
-      puts "+++ +++ #{b}"
-      puts a.inspect
-    end
-
-    # jwt
-    def check_jwt
-      begin
-        decoded = decode(params[:jwt_token])
-        @current_user = User.find decoded['user_id']
-      rescue JWT::ExpiredSignature
-        Rails.logger.info("JWT::ExpiredSignature")
-      rescue JWT::DecodeError
-        Rails.logger.info("JWT::DecodeError")
-      end
-      # @current_user ||= User.new
-      current_ability
-    end
-
-    # jwt
-    def encode(payload, exp = 2.hours.from_now)
-      payload[:exp] = exp.to_i
-      JWT.encode(payload, Rails.application.secrets.secret_key_base.to_s)
-    end
-
-    # jwt
-    def decode(token)
-      decoded = JWT.decode(token, Rails.application.secrets.secret_key_base.to_s)[0]
-      HashWithIndifferentAccess.new decoded
-    end
-
-  end
-end

data/app/controllers/ishapi/articles_controller.rb

@@ -1,62 +0,0 @@
-require_dependency "ishapi/application_controller"
-
-module Ishapi
-  class ArticlesController < ApplicationController
-    before_action :set_article, only: [:show, :edit, :update, :destroy]
-
-    # GET /articles
-    def index
-      @articles = Article.all
-    end
-
-    # GET /articles/1
-    def show
-    end
-
-    # GET /articles/new
-    def new
-      @article = Article.new
-    end
-
-    # GET /articles/1/edit
-    def edit
-    end
-
-    # POST /articles
-    def create
-      @article = Article.new(article_params)
-
-      if @article.save
-        redirect_to @article, notice: 'Article was successfully created.'
-      else
-        render :new
-      end
-    end
-
-    # PATCH/PUT /articles/1
-    def update
-      if @article.update(article_params)
-        redirect_to @article, notice: 'Article was successfully updated.'
-      else
-        render :edit
-      end
-    end
-
-    # DELETE /articles/1
-    def destroy
-      @article.destroy
-      redirect_to articles_url, notice: 'Article was successfully destroyed.'
-    end
-
-    private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_article
-        @article = Article.find(params[:id])
-      end
-
-      # Only allow a trusted parameter "white list" through.
-      def article_params
-        params.require(:article).permit(:title, :text)
-      end
-  end
-end

data/app/controllers/ishapi/cities_controller.rb

@@ -1,35 +0,0 @@
-require_dependency "ishapi/application_controller"
-
-module Ishapi
-  class CitiesController < Ishapi::ApplicationController
-    protect_from_forgery :prepend => true, :with => :exception
-    layout :false
-
-    check_authorization
-    skip_before_action :verify_authenticity_token
-    before_action :set_current_ability
-
-    def index
-      authorize! :index, City
-      @cities = City.all
-    end
-
-    def features
-      authorize! :index, City
-      @cities = City.where( :is_feature => true )
-    end
-
-    def show
-      @city = City.find_by :cityname => params[:cityname]
-      authorize! :show, @city
-    end
-
-
-    private
-
-    def set_current_ability
-      @current_ability ||= ::Ishapi::Ability.new( User.new )
-    end
-
-  end
-end

data/app/controllers/ishapi/events_controller.rb

@@ -1,21 +0,0 @@
-require_dependency "ishapi/application_controller"
-module Ishapi
-  class EventsController < ApplicationController
-
-    def index
-      @events = Event.all
-      authorize! :index, Event
-      if params[:cityname]
-        city = City.find_by :cityname => params[:cityname]
-        @events = @events.where( :city => city )
-      end
-      @events = @events.page( params[:events_page] ).per( 10 )
-    end
-
-    def show
-      @event = ::Event.unscoped.find_by :eventname => params[:eventname]
-      authorize! :show, @event
-    end
-
-  end
-end

data/app/controllers/ishapi/measurements_controller.rb

@@ -1,26 +0,0 @@
-require_dependency "ishapi/application_controller"
-
-module Ishapi
-  class MeasurementsController < ApplicationController
-    before_action :check_profile, :only => [ :update ]
-
-    def update
-      authorize! :update_measurements, CoTailors::Order
-      flag = @current_profile.measurement.update_attributes params[:measurement].permit( CoTailors::Order::MEASUREMENT_PARAMS )
-
-      # byebug
-
-      if flag
-        render :json => { :status => :ok }
-      else
-        render :json => { :status => :not_ok, :error => @current_profile.measurement.errors.messages }
-      end
-    end
-
-    #
-    # private
-    #
-    private
-
-  end
-end

data/app/controllers/ishapi/sites_controller.rb

@@ -1,55 +0,0 @@
-require_dependency "ishapi/application_controller"
-
-module Ishapi
-  class SitesController < ApplicationController
-
-    before_action :check_profile, only: %i| show |
-
-    def index
-      authorize! :index, ::Site
-      @sites = ::Site.all
-    end
-
-    def show
-      if params[:domain].include?(".json")
-        domain = params[:domain][0...-5]
-      else
-        domain = params[:domain]
-      end
-      @site = ::Site.find_by(domain: domain, lang: :en)
-      authorize! :show, @site
-
-      if @site.is_private
-        if !params[:accessToken]
-          render :json => { :status => :unauthorized}, :status => :unauthorized
-          return
-        end
-        access_token = params[:accessToken]
-        @graph = Koala::Facebook::API.new( access_token, ::FB[@site.domain][:secret] )
-        @profile = @graph.get_object "me", :fields => 'email'
-        if @site.private_user_emails.include?( @profile['email'] )
-          ;
-        else
-          render :json => { :status => :unauthorized}, :status => :unauthorized
-          render :status => :unauthorized
-          return
-        end
-      end
-
-      @galleries    = @site.galleries.limit( 10 ) # @TODO: paginate
-      @newsitems    = @site.newsitems.limit( @site.newsitems_per_page ) # @TODO: paginate
-      @reports      = @site.reports.limit( 10 ) # @TODO: paginate
-      @langs        = ::Site.where( :domain => domain ).map( &:lang )
-      @feature_tags = @site.tags.where( :is_feature => true )
-    end
-
-    private
-
-    # # jwt
-    # def decode(token)
-    #   decoded = JWT.decode(token, Rails.application.secrets.secret_key_base.to_s)[0]
-    #   HashWithIndifferentAccess.new decoded
-    # end
-
-  end
-end

data/app/controllers/ishapi/tags_controller.rb

@@ -1,24 +0,0 @@
-require_dependency "ishapi/application_controller"
-module Ishapi
-  class TagsController < ApplicationController
-
-    def index
-      authorize! :index, Tag
-      @tags = Tag.all
-      if params[:domain]
-        @site = Site.find_by( :domain => params[:domain], :lang => :en )
-        @tags = @tags.where( :site => @site )
-      end
-    end
-
-    def show
-      begin
-        @tag = Tag.find_by( slug: params[:slug] )
-      rescue Mongoid::Errors::DocumentNotFound
-        @tag = Tag.find params[:slug]
-      end
-      authorize! :show, @tag
-    end
-
-  end
-end