From 7aaa46597b951792602c2fe07f8e56fcffd00563 Mon Sep 17 00:00:00 2001 From: Andrew Gauger Date: Tue, 6 Jul 2021 15:45:21 -0700 Subject: [PATCH] rails main --- Gemfile | 7 +- Gemfile.lock | 177 +++++++++++++++++-------------- app/jobs/broadcast_alerts_job.rb | 2 +- 3 files changed, 100 insertions(+), 86 deletions(-) diff --git a/Gemfile b/Gemfile index 48c03ab..f561dd6 100755 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,9 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 6.0.1' +# Bundle edge Rails instead: +gem 'rails', github: 'rails/rails', branch: :main +#`gem 'rails', '~> 6.0.1' # Use sqlite3 as the database for Active Record gem 'sqlite3', '~> 1.4' # Use Puma as the app server @@ -25,7 +26,7 @@ gem 'jbuilder', '~> 2.7' # Devise based, two factor LDAP authentication gem 'dotenv-rails' -gem 'devise' +gem 'devise', github: 'ghiculescu/devise', branch: 'patch-2' gem 'devise_ldap_authenticatable' gem 'net-ldap' gem 'two_factor_authentication' diff --git a/Gemfile.lock b/Gemfile.lock index 805b9fc..490976b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,65 +7,108 @@ GIT faraday (< 1.0) faraday_middleware (< 1.0) -GEM - remote: https://rubygems.org/ +GIT + remote: https://github.com/ghiculescu/devise.git + revision: e37ea6a0143b9b8a3477b1ed397d8a22ad317a61 + branch: patch-2 specs: - actioncable (6.0.4) - actionpack (= 6.0.4) + devise (4.7.3) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0) + responders + warden (~> 1.2.3) + +GIT + remote: https://github.com/rails/rails.git + revision: 9f33178a2dac12d73ab7b03ab8ff61deeafb5a86 + branch: main + specs: + actioncable (7.0.0.alpha) + actionpack (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.4) - actionpack (= 6.0.4) - activejob (= 6.0.4) - activerecord (= 6.0.4) - activestorage (= 6.0.4) - activesupport (= 6.0.4) + actionmailbox (7.0.0.alpha) + actionpack (= 7.0.0.alpha) + activejob (= 7.0.0.alpha) + activerecord (= 7.0.0.alpha) + activestorage (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) mail (>= 2.7.1) - actionmailer (6.0.4) - actionpack (= 6.0.4) - actionview (= 6.0.4) - activejob (= 6.0.4) + actionmailer (7.0.0.alpha) + actionpack (= 7.0.0.alpha) + actionview (= 7.0.0.alpha) + activejob (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.4) - actionview (= 6.0.4) - activesupport (= 6.0.4) - rack (~> 2.0, >= 2.0.8) + actionpack (7.0.0.alpha) + actionview (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.4) - actionpack (= 6.0.4) - activerecord (= 6.0.4) - activestorage (= 6.0.4) - activesupport (= 6.0.4) + actiontext (7.0.0.alpha) + actionpack (= 7.0.0.alpha) + activerecord (= 7.0.0.alpha) + activestorage (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) nokogiri (>= 1.8.5) - actionview (6.0.4) - activesupport (= 6.0.4) + actionview (7.0.0.alpha) + activesupport (= 7.0.0.alpha) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.4) - activesupport (= 6.0.4) + activejob (7.0.0.alpha) + activesupport (= 7.0.0.alpha) globalid (>= 0.3.6) - activemodel (6.0.4) - activesupport (= 6.0.4) - activerecord (6.0.4) - activemodel (= 6.0.4) - activesupport (= 6.0.4) - activestorage (6.0.4) - actionpack (= 6.0.4) - activejob (= 6.0.4) - activerecord (= 6.0.4) + activemodel (7.0.0.alpha) + activesupport (= 7.0.0.alpha) + activerecord (7.0.0.alpha) + activemodel (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) + activestorage (7.0.0.alpha) + actionpack (= 7.0.0.alpha) + activejob (= 7.0.0.alpha) + activerecord (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) marcel (~> 1.0.0) - activesupport (6.0.4) + mini_mime (>= 1.1.0) + activesupport (7.0.0.alpha) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) - addressable (2.7.0) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + rails (7.0.0.alpha) + actioncable (= 7.0.0.alpha) + actionmailbox (= 7.0.0.alpha) + actionmailer (= 7.0.0.alpha) + actionpack (= 7.0.0.alpha) + actiontext (= 7.0.0.alpha) + actionview (= 7.0.0.alpha) + activejob (= 7.0.0.alpha) + activemodel (= 7.0.0.alpha) + activerecord (= 7.0.0.alpha) + activestorage (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) + bundler (>= 1.15.0) + railties (= 7.0.0.alpha) + sprockets-rails (>= 2.0.0) + railties (7.0.0.alpha) + actionpack (= 7.0.0.alpha) + activesupport (= 7.0.0.alpha) + method_source + rake (>= 0.13) + thor (~> 1.0) + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) babel-source (5.8.35) babel-transpiler (0.7.0) @@ -89,12 +132,6 @@ GEM concurrent-ruby (1.1.9) connection_pool (2.2.5) crass (1.0.6) - devise (4.8.0) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0) - responders - warden (~> 1.2.3) devise_ldap_authenticatable (0.8.7) devise (>= 3.4.1) net-ldap (>= 0.16.0) @@ -125,10 +162,9 @@ GEM concurrent-ruby (~> 1.0) jbuilder (2.11.2) activesupport (>= 5.0.0) - listen (3.1.5) + listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) loofah (2.10.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -138,7 +174,7 @@ GEM method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0225) + mime-types-data (3.2021.0704) mini_mime (1.1.0) mini_portile2 (2.5.3) minitest (5.14.4) @@ -162,33 +198,12 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.4) - actioncable (= 6.0.4) - actionmailbox (= 6.0.4) - actionmailer (= 6.0.4) - actionpack (= 6.0.4) - actiontext (= 6.0.4) - actionview (= 6.0.4) - activejob (= 6.0.4) - activemodel (= 6.0.4) - activerecord (= 6.0.4) - activestorage (= 6.0.4) - activesupport (= 6.0.4) - bundler (>= 1.3.0) - railties (= 6.0.4) - sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.4) - actionpack (= 6.0.4) - activesupport (= 6.0.4) - method_source - rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) - rake (13.0.3) + rake (13.0.4) randexp (0.1.7) rb-fsevent (0.11.0) rb-inotify (0.10.1) @@ -205,8 +220,7 @@ GEM actionpack (>= 5.0) railties (>= 5.0) rotp (6.2.0) - ruby_dep (1.5.0) - rubyzip (2.3.0) + rubyzip (2.3.2) rufus-scheduler (3.7.0) fugit (~> 1.1, >= 1.1.6) sass-rails (6.0.0) @@ -222,7 +236,7 @@ GEM selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - sequel (5.45.0) + sequel (5.46.0) sidekiq (6.2.1) connection_pool (>= 2.2.2) rack (~> 2.0) @@ -251,7 +265,6 @@ GEM synnex (0.1.8) httparty thor (1.1.0) - thread_safe (0.3.6) thwait (0.2.0) e2mmap tilt (2.0.10) @@ -265,8 +278,8 @@ GEM rails (>= 3.1.1) randexp rotp (>= 4.0.0) - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) warden (1.2.9) rack (>= 2.0.9) web-console (4.1.0) @@ -296,7 +309,7 @@ DEPENDENCIES bootsnap (>= 1.4.2) byebug capybara (>= 2.15) - devise + devise! devise_ldap_authenticatable dotenv-rails jbuilder (~> 2.7) @@ -305,7 +318,7 @@ DEPENDENCIES net-ldap netaddr puma (~> 4.3) - rails (~> 6.0.1) + rails! react-rails redis sass-rails (>= 6) @@ -327,4 +340,4 @@ DEPENDENCIES webpacker (~> 4.0) BUNDLED WITH - 2.1.4 + 2.2.3 diff --git a/app/jobs/broadcast_alerts_job.rb b/app/jobs/broadcast_alerts_job.rb index 9c08f70..c942a76 100755 --- a/app/jobs/broadcast_alerts_job.rb +++ b/app/jobs/broadcast_alerts_job.rb @@ -5,6 +5,6 @@ class BroadcastAlertsJob < ApplicationJob include KaseyaApi def perform(*args) - ActionCable.server.broadcast 'alerts_channel', message: {kaseya_alerts: KaseyaAlert.new.process_alerts} + ActionCable.server.broadcast 'alerts_channel', {message: {kaseya_alerts: KaseyaAlert.new.process_alerts}} end end