motor-admin 0.1.58 → 0.1.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98eed032de058a25fc5951c40afac9faeedd33ad66299ab381f15527e122aeeb
-  data.tar.gz: 4797ba6520bf3614ced8ea7aa800145f2ee7c35934820c5ae623dfe19c007a45
+  metadata.gz: 5d709fb5b88f56a20cb9c2f906f3540b53278e04becc96598556dba70a0dcb4f
+  data.tar.gz: 5ffca9ae9451e2aa373957116c1b9b6607f5aba3bc1fa1cee555682c1a2987be
 SHA512:
-  metadata.gz: 7d966ae337a44f486a56f0dcb741d06787af84e67e4a4f5c5f750796b6a8b7979e9685ec9485854e34d994477ddcfdbc55882d9efc0dd26b356f8bbfe66bb0dd
-  data.tar.gz: 82e3f0b57ef8aa4902a36da9a8d94814f3d42f5b18cd73d70a95e59d69b5737d8652505bf3b6468629b51fef06c55e55b3ab03840838db8b1222edbc9ef9a3df
+  metadata.gz: 944babec34990e1889a52e76f652ca725dda31f4bcbb75aefc47cb715beca9a1a6127d6c5aa1e70437beafdf6a0c9cfaaaf3cf29a901524980812e23134cefaa
+  data.tar.gz: c79c99d0491e3c02c05296f0ace0ace54bbeeef1cd11f927b49f5edd814503f3e5f0f5a017c184e97bbce9a4b02b7279db36333a8b3fb796fb6125f283e8604a

data/README.md

@@ -93,7 +93,7 @@ Intelligence search can be opened via the top right corner button or using <kbd>
 
 ### Authorization
 
-Motor Admin allows to set row-level and column-level permissions via [cancan](https://github.com/CanCanCommunity/cancancan) gem. Admin UI permissions should be defined in `app/models/motor/ability.rb` file in `Motor::Ability` class. See [Motor Admin guide](https://github.com/omohokcoj/motor-admin/blob/master/guides/defining_prmissions.md) and [CanCan documentation](https://github.com/CanCanCommunity/cancancan/blob/develop/docs/Defining-Abilities.md) to learn how to define user permissions.
+Motor Admin allows to set row-level and column-level permissions via [cancan](https://github.com/CanCanCommunity/cancancan) gem. Admin UI permissions should be defined in `app/models/motor/ability.rb` file in `Motor::Ability` class. See [Motor Admin guide](https://github.com/omohokcoj/motor-admin/blob/master/guides/defining_permissions.md) and [CanCan documentation](https://github.com/CanCanCommunity/cancancan/blob/develop/docs/Defining-Abilities.md) to learn how to define user permissions.
 
 ### Optimized for Mobile
 

data/app/controllers/motor/auth_tokens_controller.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Motor
+  class AuthTokensController < ApiBaseController
+    GENERIC_TOKEN_TTL = 2.hours
+
+    skip_authorization_check
+
+    def create
+      return render json: {} unless current_user
+
+      if defined?(Devise::JWT)
+        respond_with_devise_jwt
+      elsif defined?(JWT)
+        respond_with_generic_jwt
+      else
+        render json: {}
+      end
+    end
+
+    private
+
+    def respond_with_devise_jwt
+      warden.set_user(current_user)
+
+      render json: { token: request.env['warden-jwt_auth.token'] }
+    end
+
+    def respond_with_generic_jwt
+      payload = { uid: current_user.id, exp: GENERIC_TOKEN_TTL.from_now.to_i }
+      token = JWT.encode(payload, Rails.application.secrets.secret_key_base)
+
+      render json: { token: token }
+    end
+  end
+end

data/app/controllers/motor/icons_controller.rb

@@ -2,6 +2,8 @@
 
 module Motor
   class IconsController < ApiBaseController
+    skip_authorization_check
+
     CACHE_STORE = ActiveSupport::Cache::MemoryStore.new
 
     def index

data/app/controllers/motor/resource_methods_controller.rb

@@ -2,6 +2,8 @@
 
 module Motor
   class ResourceMethodsController < ApiBaseController
+    skip_authorization_check
+
     before_action :authorize_resource
 
     def show

data/config/routes.rb

@@ -5,6 +5,7 @@ Motor::Admin.routes.draw do
     scope 'api', as: :api do
       resources :run_queries, only: %i[show create]
       resources :send_alerts, only: %i[create]
+      resources :auth_tokens, only: %i[create]
       resources :queries, only: %i[index show create update destroy]
       resources :tags, only: %i[index]
       resources :configs, only: %i[index create]

data/lib/motor/admin.rb

@@ -65,6 +65,18 @@ module Motor
       end
     end
 
+    initializer 'warden.configure.dispatch_requests' do
+      next unless defined?(Warden::JWTAuth)
+
+      config.after_initialize do
+        Warden::JWTAuth.configure do |config|
+          config.dispatch_requests += [
+            ['POST', /\A#{Regexp.escape(Motor::Admin.routes.url_helpers.motor_api_auth_tokens_path)}\z/]
+          ]
+        end
+      end
+    end
+
     initializer 'motor.active_storage.extensions' do
       config.after_initialize do
         next unless defined?(ActiveStorage::Engine)

data/lib/motor/build_schema/find_icon.rb

@@ -99,7 +99,6 @@ module Motor
       'customer' => 'users',
       'client' => 'users',
       'ticket' => 'ticket',
-      'event' => 'event',
       'contact' => 'users',
       'member' => 'users',
       'admin' => 'user-check',

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.1.58'
+  VERSION = '0.1.60'
 end

data/ui/dist/manifest.json

@@ -2068,11 +2068,11 @@
   "mail-opened.svg": "icons/mail-opened.svg",
   "mail.svg": "icons/mail.svg",
   "mailbox.svg": "icons/mailbox.svg",
-  "main-ba741735a93c9314bbfa.css.gz": "main-ba741735a93c9314bbfa.css.gz",
-  "main-ba741735a93c9314bbfa.js.LICENSE.txt": "main-ba741735a93c9314bbfa.js.LICENSE.txt",
-  "main-ba741735a93c9314bbfa.js.gz": "main-ba741735a93c9314bbfa.js.gz",
-  "main.css": "main-ba741735a93c9314bbfa.css",
-  "main.js": "main-ba741735a93c9314bbfa.js",
+  "main-96c4a62d2fb789ab1080.css.gz": "main-96c4a62d2fb789ab1080.css.gz",
+  "main-96c4a62d2fb789ab1080.js.LICENSE.txt": "main-96c4a62d2fb789ab1080.js.LICENSE.txt",
+  "main-96c4a62d2fb789ab1080.js.gz": "main-96c4a62d2fb789ab1080.js.gz",
+  "main.css": "main-96c4a62d2fb789ab1080.css",
+  "main.js": "main-96c4a62d2fb789ab1080.js",
   "man.svg": "icons/man.svg",
   "manual-gearbox.svg": "icons/manual-gearbox.svg",
   "map-2.svg": "icons/map-2.svg",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.58
+  version: 0.1.60
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-13 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -131,6 +131,7 @@ files:
 - app/controllers/motor/application_controller.rb
 - app/controllers/motor/assets_controller.rb
 - app/controllers/motor/audits_controller.rb
+- app/controllers/motor/auth_tokens_controller.rb
 - app/controllers/motor/configs_controller.rb
 - app/controllers/motor/dashboards_controller.rb
 - app/controllers/motor/data_controller.rb
@@ -140,7 +141,6 @@ files:
 - app/controllers/motor/resource_methods_controller.rb
 - app/controllers/motor/resources_controller.rb
 - app/controllers/motor/run_queries_controller.rb
-- app/controllers/motor/schemas_controller.rb
 - app/controllers/motor/send_alerts_controller.rb
 - app/controllers/motor/tags_controller.rb
 - app/controllers/motor/ui_controller.rb
@@ -1490,8 +1490,8 @@ files:
 - ui/dist/icons/zoom-money.svg.gz
 - ui/dist/icons/zoom-out.svg.gz
 - ui/dist/icons/zoom-question.svg.gz
-- ui/dist/main-ba741735a93c9314bbfa.css.gz
-- ui/dist/main-ba741735a93c9314bbfa.js.gz
+- ui/dist/main-96c4a62d2fb789ab1080.css.gz
+- ui/dist/main-96c4a62d2fb789ab1080.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses:

data/app/controllers/motor/schemas_controller.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Motor
-  class SchemasController < ApiBaseController
-    def show
-      render json: Motor::BuildSchema.call
-    end
-
-    def update; end
-  end
-end