ishapi 0.1.8.143 → 0.1.8.147

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 021f74439ddc6f123f3f7b33d5d444a27dab186b2ec4a522041eca80667d1e63
-  data.tar.gz: 5745dcdf642671f2abe7dab138edbd05955c56c05f916388df2f65edb378528d
+  metadata.gz: 37a74ed060c1c14807a40188d3cb99e1a7b67910a88dfc8ab4a97ad01f4eb11c
+  data.tar.gz: 5c3529a4f9b79117cb4d5c45e92a0d24f4194717f64fe8c2c2f71e3e13543ebb
 SHA512:
-  metadata.gz: 713eca65e6c3639a5469bce0a9b8db7d3b204f9a73e414be676ec25a0dcf9f3189d0ed09720be9dccda14533dc0040c6ed546c74649b8180626adeb68fcf4a98
-  data.tar.gz: 759d8ba2374e9938af198c592ad5eb174e08431146b65956f9c9d79ee8998c0d8d184da41e0606c6955c37dfcda330e55de82fd5feb6c9fa04a2914e50a5b2b7
+  metadata.gz: 19ecdf1027c55c91fdc1526fcc7f0fb1d80e47c60d802b01733ab6ba9cd7de0a9eb8f4a31b5dc857758a0f7abf531cebc190c6c8556ae31d20c91e9ad65b5c17
+  data.tar.gz: 040f38f5013b4ee85b9385b746a4ce01464613e1c1c2ea315099fc69b7b2fb4d6380dc343e5cf0ad14dc07ca854a000a792182280c3bcaea30fc1c5cf4091bbb

data/app/controllers/ishapi/application_controller.rb

@@ -34,10 +34,10 @@ module Ishapi
       begin
         decoded = decode(params[:jwt_token])
         @current_user = User.find decoded['user_id']
-      rescue JWT::ExpiredSignature => e
+      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/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.143
+  version: 0.1.8.147
 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