ishapi 0.1.8.134 → 0.1.8.139

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9055c8aee254cef203fa0ba8a7c82fd98d7c4b66870342d2286201ef7613dbd
-  data.tar.gz: eee54217f1e118989c390a1e7b73c49284f441504f661f1d4b189da385436720
+  metadata.gz: f859dfaa7176b30b0d716bd2c3e87e8017a0655c1044fe9109385a84758e0abb
+  data.tar.gz: 5b95ae9d56c9dea97b71e1e3a9ee7c5929427d795a37afcdf5ab1674f0ba3383
 SHA512:
-  metadata.gz: 38e5d8e9948fd4c50e4df5045e1a3e8c2e8789b45b6f8697cd7f8b6d966cf48f59869ea73399e596e75457eeca9ea351d0f488e0e8bb9ee6029f0001829e3ca9
-  data.tar.gz: 0e633543d607411b971a437d9ad7f28f603a54754ff667ded394ac046fa9b2b64e4bdb2c0b1a1ae2ff1a8f13f6dc53ee0c284cd8148f7dbe0ba6acae1170bdfb
+  metadata.gz: 7b76b0d87c6442fe686c5bfd5c1b9e8a192806d1db91591935dc8b44978682e6fdcaa854bc05c4f89ec2a574e2ed8545c4495de5469d86695e214f4df1e4de30
+  data.tar.gz: 5c938518321b5e19c416ff292b9b1ee842d0e045fd1fbf14afcd9171bb925e9d34bca2c6018db2b028c5a758589b235f28512a971e28e2deb183015bc0233f94

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

@@ -5,18 +5,13 @@ module Ishapi
     protect_from_forgery :prepend => true, :with => :exception
     layout :false
 
-    # before_action :check_profile, except: [ :test ]
-    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]
 
@@ -31,8 +26,6 @@ module Ishapi
       @me               = @graph.get_object( 'me', :fields => 'email' )
       @current_user     = User.where( :email => @me['email'] ).first
 
-      puts! @current_user, '#long_term_token @current_user'
-
       # send the jwt to client
       @jwt_token = encode(user_id: @current_user.id.to_s)
 
@@ -79,6 +72,7 @@ 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
@@ -136,21 +130,9 @@ module Ishapi
           @current_user     = current_user  if Rails.env.test?
         end
 
-        puts! @current_user, 'current_user'
-        puts! @current_profile, 'current_profile'
-
       elsif 'jwt' == provider
-        begin
-          decoded = decode(params[:jwt_token])
-        rescue JWT::ExpiredSignature
-          # @TODO: refactor [ref-5]
-          @current_user = User.new profile: Profile.new
-          sign_in @current_user, scope: :user
-          set_current_ability
-          return
-        end
+        decoded = decode(params[:jwt_token])
         @current_user = User.find decoded['user_id']
-
       else
         puts! 'check_multiprofile(): no access token'
         raise "ww1 - not implemented"
@@ -158,15 +140,22 @@ module Ishapi
 
       # @TODO: refactor [ref-5]
       sign_in @current_user, scope: :user
-      set_current_ability
+      current_ability
     end
 
-    # same as check_profile but doesn't error out when jwt_token is missing
+
+
+    # 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
-        check_profile
+        begin
+          check_profile
+        rescue JWT::ExpiredSignature
+          Rails.logger.info("JWT::ExpiredSignature")
+          @current_user = User.new profile: Profile.new
+        end
       end
     end
 
@@ -178,10 +167,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]
@@ -253,10 +238,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=''
@@ -264,6 +248,21 @@ module Ishapi
       puts a.inspect
     end
 
+    # jwt
+    def check_jwt
+      begin
+        decoded = decode(params[:jwt_token])
+        puts! decoded, 'decoded'
+        @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

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/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

@@ -8,20 +8,14 @@ module Ishapi
       before_action :check_profile
 
       def account
-        puts! params, 'my 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/models/ishapi/ability.rb

@@ -3,7 +3,6 @@ class Ishapi::Ability
   include ::CanCan::Ability
 
   def initialize user
-
     #
     # signed in user
     #
@@ -18,6 +17,7 @@ class Ishapi::Ability
         true
       end
 
+      can [ :my_index ], Gallery
       can [ :show ], Gallery do |gallery|
         gallery.user_profile == user.profile
       end

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/config/routes.rb

@@ -29,6 +29,7 @@ Ishapi::Engine.routes.draw do
   get 'markers/view/:slug', to: 'maps#show_marker'
   get "/my/account", to: "my/my#account"
   namespace :my do
+    get 'galleries', to: 'galleries#index'
     get 'newsitems', to: 'newsitems#index'
     get  'reports',  to: 'reports#index'
     get  'videos',   to: 'videos#index'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.134
+  version: 0.1.8.139
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-25 00:00:00.000000000 Z
+date: 2021-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -204,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