ishapi 0.1.8.145 → 0.1.8.149

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f0fad3c980c7518b84af9b012e1f9e38bdb857acb62628d0d642436b9e6b8a7
-  data.tar.gz: dc425ab3037bff825d77171afd9b4ad3e844d6df9783a5df303e36ac67677bd0
+  metadata.gz: 9cd7a53ae8d95d217a973a346a43735501330d08ff96705fe24ebf42014a10ba
+  data.tar.gz: 1d85e34875c2f3c3b026e92eda83e21d4a4409aada61d57cbd9bf3c547c08c02
 SHA512:
-  metadata.gz: c50270ea8baf769301620c64caab386ca556c35ae7f81221518104cb2a0ebd94d5be3aad0786724aae98b91dc902dc4a6b1bc383d1fe2c5d2ab7207eb076b6e5
-  data.tar.gz: 174b6dcd1bcb7e0a6159b223aaf15d439af32f1484ed4b612c9cdb732863ee2f22fb6903341c4cb213b28372ed701a3db8f19ad406aa117fd843d1fed1d759a6
+  metadata.gz: 629a76c8e71f990c024cc5968ab41572216d852c73ababc8101327e74dceb998a28a3a480c8a9d657aa4c8cbe531400b8859830e0d8a5ca853fa2510cd36ee9b
+  data.tar.gz: 89da2fef64a91d1560b6a76da8403573ad43978fe22da94a4385c014e74ed5aa36da38a58380f0a00397d97ace7062756eee3473611a8eef1e0aa915943510c6

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

@@ -0,0 +1,34 @@
+#
+# ishapi / maps / _show
+#
+
+this_key = [ map, params.permit! ]
+json.cache! this_key do
+  json.map do
+    json.id          map.id.to_s
+    json.slug        map.slug
+    json.parent_slug map.parent_slug
+    json.description map.description
+    json.w           map.w
+    json.h           map.h
+    json.img_path    map.img_path
+    json.updated_at  map.updated_at
+
+    json.markers do
+      json.array! map.markers do |marker|
+        json.name marker.name
+        json.slug marker.slug
+        json.x    marker.x
+        json.y    marker.y
+        json.w    marker.w
+        json.h    marker.h
+        json.img_path marker.img_path
+        json.title_img_path marker.title_img_path
+        json.item_type marker.item_type
+      end
+    end
+
+  end
+end
+
+

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

@@ -14,6 +14,10 @@ json.cache! this_key do
     json.img_path    @map.img_path
     json.updated_at  @map.updated_at
 
+    if @map.map
+      json.partial! 'ishapi/maps/show', map: @map.map
+    end
+
     json.breadcrumbs do
       json.array! @map.breadcrumbs do |b|
         json.name b[: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.145
+  version: 0.1.8.149
 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
@@ -247,6 +247,7 @@ files:
 - app/views/ishapi/galleries/show.jbuilder
 - app/views/ishapi/galleries/show_premium_locked.jbuilder
 - app/views/ishapi/galleries/show_premium_unlocked.jbuilder
+- app/views/ishapi/maps/_show.jbuilder
 - app/views/ishapi/maps/index.jbuilder
 - app/views/ishapi/maps/show.jbuilder
 - app/views/ishapi/measurements/_show.jbuilder