ishapi 0.1.8.145 → 0.1.8.146

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f0fad3c980c7518b84af9b012e1f9e38bdb857acb62628d0d642436b9e6b8a7
-  data.tar.gz: dc425ab3037bff825d77171afd9b4ad3e844d6df9783a5df303e36ac67677bd0
+  metadata.gz: 7daed337d478761f910b4330f860a5c730a858dc50cf75272ef05ff6609459ef
+  data.tar.gz: 63ca6a01982f267a5cc411b32a0a949abb3d97ff5a2cdd43454b2a301607d8cd
 SHA512:
-  metadata.gz: c50270ea8baf769301620c64caab386ca556c35ae7f81221518104cb2a0ebd94d5be3aad0786724aae98b91dc902dc4a6b1bc383d1fe2c5d2ab7207eb076b6e5
-  data.tar.gz: 174b6dcd1bcb7e0a6159b223aaf15d439af32f1484ed4b612c9cdb732863ee2f22fb6903341c4cb213b28372ed701a3db8f19ad406aa117fd843d1fed1d759a6
+  metadata.gz: 23e0af13c63e3ad5f24621cfd93f680f946bdebadc10d8bc2e5ed41a962c2c901237d839ae3f27a19ca01ede1e5cd73fe84649962247168db1127768c52dfb40
+  data.tar.gz: 1a0d67e6ff177b1d474538e4fb9a2770fb3f14872355a9ddba3b1cadeb69feaa644d3e3aa78b2d7e6fce1685e26bee74f9e6fd3f5c0551b576cdf9c71d2141b5

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