ishapi 0.1.8.134 → 0.1.8.135

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9055c8aee254cef203fa0ba8a7c82fd98d7c4b66870342d2286201ef7613dbd
-  data.tar.gz: eee54217f1e118989c390a1e7b73c49284f441504f661f1d4b189da385436720
+  metadata.gz: 7d4ac76a945cecc499cbcd7702b5fa87065bbc551b68681871f8dd8e049d7434
+  data.tar.gz: 27faa2c48c19a47d7b46572c4ce3c7ff052737df6840e3ee22d930f65be37752
 SHA512:
-  metadata.gz: 38e5d8e9948fd4c50e4df5045e1a3e8c2e8789b45b6f8697cd7f8b6d966cf48f59869ea73399e596e75457eeca9ea351d0f488e0e8bb9ee6029f0001829e3ca9
-  data.tar.gz: 0e633543d607411b971a437d9ad7f28f603a54754ff667ded394ac046fa9b2b64e4bdb2c0b1a1ae2ff1a8f13f6dc53ee0c284cd8148f7dbe0ba6acae1170bdfb
+  metadata.gz: 814a536e1e9f406bc707576da08b8265fcb6a72637b97b5ebd077c459943dec930f7172fbdf28469fb59f5d3057d3796f37ff3ad75db312fa9754b6628c5641b
+  data.tar.gz: da987ea35b0a763299fa30997546b3ebbee28229dfef11193f78ba668c1ab195e5742ad4de73fd06346c54a9cd1e698b9d1c1ad40a515c65ad8d669797eaa7fd

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,7 +6,7 @@ module Ishapi
     layout :false
 
     # before_action :check_profile, except: [ :test ]
-    before_action :set_current_ability
+    # before_action :set_current_ability
 
     check_authorization
     skip_before_action :verify_authenticity_token
@@ -56,6 +56,8 @@ module Ishapi
     private
 
     def append_long_term_token
+      puts! nil, 'append_long_term_token'
+
       if @long_term_token
         response.body = JSON.parse(response.body).merge({ long_term_token: @long_term_token }).to_json
       end
@@ -79,6 +81,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
@@ -140,17 +143,9 @@ module Ishapi
         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])
+        puts! decoded, 'decoded'
         @current_user = User.find decoded['user_id']
-
       else
         puts! 'check_multiprofile(): no access token'
         raise "ww1 - not implemented"
@@ -161,6 +156,8 @@ module Ishapi
       set_current_ability
     end
 
+
+
     # same as check_profile but doesn't error out when jwt_token is missing
     def check_profile_optionally
       if !params[:jwt_token]
@@ -264,6 +261,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/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.135
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-25 00:00:00.000000000 Z
+date: 2020-12-31 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