ishapi 0.1.8.144 → 0.1.8.148

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78d87ab29d37b99e613e97cb9376043d53468c74ba0de032735b5a47cec00a4a
-  data.tar.gz: e07cf3e9131ce52984b65da5af9f5982a18df240f62a86ece8d2dd2f04189196
+  metadata.gz: a6b93828545b3f0c63df48d764a930c0ce189a7b6c56d80ad8d71d22c12ff6af
+  data.tar.gz: 16ada34a0d549ced6d4bd3cb7103ddd074dac990bcc382f37ab48fa9753d4502
 SHA512:
-  metadata.gz: 0fbdb5a6e57abd62eb26a7d03926807fbe2409ccb4fcd2b7febc60de417418746d07dfc3b2403fdc7e9deb5d80033b0699395e6f62de84af6126e7276c0babbb
-  data.tar.gz: ff7c42db5da1b75a4dc75206f73d2a78353e3cb0bec30dbed328719c8874fa2f911621bb95c58bd4b905873fd4c79821ccd103041160cad124eb1bec7ff1ede3
+  metadata.gz: 8d950587452e9e0521ea2d5631aa26d7e46929ffe3ba24e31cf1b47c15f4811b089b3e5c67a0c7040ba507f5cc6e47dec914de37b3c90241601f8c5f301857c1
+  data.tar.gz: 0a1776f2adfaad26e1122efe3a38f19d5685ed8daa454512206f67dd9835fefe8b3ddfea921ad75f221647259a086285daabb08b863819b1d0cc93932aca3f66

data/app/controllers/ishapi/application_controller.rb

@@ -37,7 +37,7 @@ module Ishapi
       rescue JWT::ExpiredSignature, JWT::DecodeError => e
         puts! e, 'ee1'
         flash[:notice] = 'You arent logged in, or you have been logged out.'
-        @current_user = User.new
+        # @current_user = User.new
       end
     end
 

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

@@ -8,8 +8,12 @@ module Ishapi
       before_action :check_profile
 
       def account
-        @profile = current_user.profile
+        @profile = current_user&.profile
         authorize! :show, @profile
+      rescue CanCan::AccessDenied
+        render json: {
+          status: :not_ok,
+        }, status: 401
       end
 
       private

data/app/controllers/ishapi/users_controller.rb

@@ -4,6 +4,8 @@ module Ishapi
   class UsersController < ApplicationController
     before_action :set_profile, :only => [ :fb_sign_in, :show ]
 
+    skip_authorization_check only: %i| login |
+
     def fb_sign_in
       authorize! :fb_sign_in, Ishapi
       # render :json => { :status => :ok }
@@ -14,5 +16,25 @@ module Ishapi
       authorize! :fb_sign_in, Ishapi
     end
 
+    def login
+      @current_user = User.where( email: params[:email] ).first
+      if !@current_user
+        render json: { status: :not_ok }, status: 401
+        return
+      end
+      if @current_user.valid_password?(params[:password])
+        # from: application_controller#long_term_token
+
+        # 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
+    end
+
   end
 end

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

@@ -14,6 +14,14 @@ json.cache! this_key do
     json.img_path    @map.img_path
     json.updated_at  @map.updated_at
 
+    json.breadcrumbs do
+      json.array! @map.breadcrumbs do |b|
+        json.name b[:name]
+        json.slug b[:slug]
+        json.link b[:link]
+      end
+    end
+
     json.markers do
       json.array! @markers do |marker|
         json.name marker.name

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

@@ -23,7 +23,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_user&.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
@@ -48,7 +48,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_user&.profile&.has_premium_purchase( item.report )
       end
     end
 

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

@@ -13,8 +13,6 @@ json.cache! key do
   json.subhead     @site.subhead
   json.description @site.description
 
-  json.email @current_user.email
-
   json.is_ads_enabled         @site.is_ads_enabled
   json.play_videos_in_preview @site.play_videos_in_preview
   json.newsitems_per_page     @site.newsitems_per_page

data/config/routes.rb

@@ -66,6 +66,7 @@ Ishapi::Engine.routes.draw do
   post  'users/profile/update', :to => 'users#update'
   get   'users/profile',        :to => 'users#show' # @TODO: only for testing! accessToken must be hidden
   match 'users/long_term_token', to: 'application#long_term_token', via: [ :get, :post ]
+  post  'users/login', to: 'users#login'
 
   get 'venues', :to => 'venues#index'
   get 'venues/view/:venuename', :to => 'venues#show'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.144
+  version: 0.1.8.148
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails