Skip to content

Commit 70546e6

Browse files
committed
Drop 3rd-party service agents
* Remove third party service agents: - Remove Twilio agents. - Remove Slack agent. - Remove Evernote agent. - Remove S3 agent. - Remove Aftership, Basecamp and Jira agents. * Remove unused gems. * Remove OAuth services used by 3rd party agents. * Fix TLS Check agent message description.
1 parent 3027f94 commit 70546e6

File tree

64 files changed

+44
-3563
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+44
-3563
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99
### Changed
1010
- Replace agent type dropdown with card based selector.
1111

12+
### Removed
13+
Removed third party agents:
14+
- Twilio agents.
15+
- Slack agent.
16+
- Evernote agent.
17+
- S3 agent.
18+
- Aftership agent.
19+
- Basecamp agent.
20+
- Jira agent.
21+
1222

1323
## [0.9.13] - 2021-01-15
1424
### Added

Gemfile

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,7 @@ ruby '>=2.6.0'
55
# Optional libraries. To conserve RAM, comment out any that you don't need,
66
# then run `bundle` and commit the updated Gemfile and Gemfile.lock.
77
# TODO: update
8-
gem 'twilio-ruby', '~> 3.11.5' # TwilioAgent
98
gem 'net-ftp-list', '~> 3.2.8' # FtpsiteAgent
10-
# TODO: update
11-
gem 'slack-notifier', '~> 1.0.0' # SlackAgent
12-
13-
# Evernote agent
14-
gem 'omniauth-evernote', '~> 1.2.1'
15-
gem 'evernote_oauth', '~> 0.2.3'
16-
17-
# S3Agent
18-
# TODO: update
19-
gem 'aws-sdk-core', '~> 2.2.15'
20-
21-
# Basecamp agent
22-
gem 'omniauth-37signals', '~> 1.0.5'
239

2410
gem 'ace-rails-ap', '~> 4.4'
2511
gem 'bootsnap', '>= 1.5.1', require: false
@@ -48,7 +34,6 @@ gem 'liquid', '~> 4.0.3'
4834
gem 'loofah', '~> 2.8.0'
4935
gem 'mini_magick', '~> 4.11.0'
5036
gem 'nokogiri', '~> 1.11.1'
51-
gem 'omniauth', '~> 1.9.1'
5237
gem 'rack-timeout', '~> 0.6.0'
5338
gem 'rails', '~> 6.0.3.4'
5439
gem 'rails-html-sanitizer', '~> 1.3.0'

Gemfile.lock

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ GEM
6262
ast (2.4.0)
6363
autoprefixer-rails (10.0.3.0)
6464
execjs
65-
aws-sdk-core (2.2.37)
66-
jmespath (~> 1.0)
6765
bcrypt (3.1.16)
6866
better_errors (2.7.0)
6967
coderay (>= 1.0.0)
@@ -159,10 +157,6 @@ GEM
159157
ethon (0.12.0)
160158
ffi (>= 1.3.0)
161159
eventmachine (1.2.7)
162-
evernote-thrift (1.25.2)
163-
evernote_oauth (0.2.3)
164-
evernote-thrift
165-
oauth (>= 0.4.1)
166160
execjs (2.7.0)
167161
faraday (0.17.3)
168162
multipart-post (>= 1.2, < 3)
@@ -213,7 +207,6 @@ GEM
213207
guard-compat (~> 1.1)
214208
rspec (>= 2.99.0, < 4.0)
215209
hashdiff (1.0.1)
216-
hashie (3.6.0)
217210
http_parser.rb (0.6.0)
218211
httparty (0.18.1)
219212
mime-types (~> 3.0)
@@ -222,7 +215,6 @@ GEM
222215
concurrent-ruby (~> 1.0)
223216
iniparse (1.5.0)
224217
jaro_winkler (1.5.4)
225-
jmespath (1.4.0)
226218
jquery-datatables (1.10.20)
227219
jquery-rails (4.4.0)
228220
rails-dom-testing (>= 1, < 3)
@@ -298,29 +290,6 @@ GEM
298290
notiffany (0.1.3)
299291
nenv (~> 0.1)
300292
shellany (~> 0.0)
301-
oauth (0.5.4)
302-
oauth2 (1.4.4)
303-
faraday (>= 0.8, < 2.0)
304-
jwt (>= 1.0, < 3.0)
305-
multi_json (~> 1.3)
306-
multi_xml (~> 0.5)
307-
rack (>= 1.2, < 3)
308-
omniauth (1.9.1)
309-
hashie (>= 3.4.6)
310-
rack (>= 1.6.2, < 3)
311-
omniauth-37signals (1.0.5)
312-
omniauth (~> 1.0)
313-
omniauth-oauth2 (~> 1.0)
314-
omniauth-evernote (1.2.1)
315-
evernote-thrift
316-
multi_json (~> 1.0)
317-
omniauth-oauth (~> 1.0)
318-
omniauth-oauth (1.1.0)
319-
oauth
320-
omniauth (~> 1.0)
321-
omniauth-oauth2 (1.6.0)
322-
oauth2 (~> 1.1)
323-
omniauth (~> 1.9)
324293
orm_adapter (0.5.0)
325294
overcommit (0.53.0)
326295
childprocess (>= 0.6.3, < 4)
@@ -471,7 +440,6 @@ GEM
471440
docile (~> 1.1)
472441
simplecov-html (~> 0.11)
473442
simplecov-html (0.12.2)
474-
slack-notifier (1.0.0)
475443
spectrum-rails (1.8.0)
476444
railties (>= 3.1)
477445
sprockets (4.0.2)
@@ -486,10 +454,6 @@ GEM
486454
thread_safe (0.3.6)
487455
tilt (2.0.10)
488456
timecop (0.9.2)
489-
twilio-ruby (3.11.6)
490-
builder (>= 2.1.2)
491-
jwt (>= 0.1.2)
492-
multi_json (>= 1.3.0)
493457
typhoeus (1.4.0)
494458
ethon (>= 0.9.0)
495459
tzinfo (1.2.8)
@@ -523,7 +487,6 @@ PLATFORMS
523487
DEPENDENCIES
524488
ace-rails-ap (~> 4.4)
525489
addressable (~> 2.7.0)
526-
aws-sdk-core (~> 2.2.15)
527490
better_errors (~> 2.7.0)
528491
binding_of_caller (~> 0.8.0)
529492
bootsnap (>= 1.5.1)
@@ -539,7 +502,6 @@ DEPENDENCIES
539502
delorean (~> 2.1.0)
540503
devise (~> 4.7.3)
541504
dotenv (~> 2.7.6)
542-
evernote_oauth (~> 0.2.3)
543505
execjs (~> 2.7.0)
544506
faraday (~> 0.9)
545507
faraday_middleware (~> 0.12.2)
@@ -567,9 +529,6 @@ DEPENDENCIES
567529
mini_racer (~> 0.3.1)
568530
net-ftp-list (~> 3.2.8)
569531
nokogiri (~> 1.11.1)
570-
omniauth (~> 1.9.1)
571-
omniauth-37signals (~> 1.0.5)
572-
omniauth-evernote (~> 1.2.1)
573532
overcommit (~> 0.53.0)
574533
pg (~> 1.2.3)
575534
pry-byebug (~> 3.9.0)
@@ -594,12 +553,10 @@ DEPENDENCIES
594553
select2-rails (~> 3.5.4)
595554
selenium-webdriver (~> 3.142.7)
596555
shoulda-matchers (~> 4.3.0)
597-
slack-notifier (~> 1.0.0)
598556
spectrum-rails (~> 1.8.0)
599557
sprockets (~> 4.0.2)
600558
sqlite3 (~> 1.4.2)
601559
timecop (~> 0.9.2)
602-
twilio-ruby (~> 3.11.5)
603560
typhoeus (~> 1.4.0)
604561
uglifier (~> 4.2.0)
605562
vcr (~> 5.1.0)

app/assets/javascripts/pages/agent-edit-page.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,7 @@
162162
}
163163

164164
if (!firstTime) {
165-
if (json.oauthable) {
166-
$(".oauthable-form").html(json.oauthable);
167-
}
168-
if (json.form_options) {
169-
$(".agent-options").html(json.form_options);
170-
}
165+
if (json.form_options) { $('.agent-options').html(json.form_options); }
171166
}
172167

173168
this.enableDryRunButton();

app/assets/javascripts/pages/services-index-page.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

app/assets/stylesheets/general.scss

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -162,53 +162,10 @@ nav .nav-item .nav-link:focus,
162162
// TODO
163163
}
164164

165-
$service-colors: (
166-
twitter: #55acee,
167-
37signals: #8fc857,
168-
github: #444444,
169-
dropbox: #007EE5,
170-
evernote: #00C85A
171-
);
172-
173-
@mixin services {
174-
@each $service, $color in $service-colors {
175-
&.service-#{$service} {
176-
color: #fff;
177-
background-color: $color;
178-
}
179-
}
180-
}
181-
182-
.btn-service {
183-
position: relative;
184-
padding-left: 40px;
185-
$border-color: rgba(0,0,0,0.2);
186-
border-color: $border-color;
187-
188-
> i:first-child {
189-
position: absolute;
190-
top: 0;
191-
left: 0;
192-
bottom: 0;
193-
width: 32px;
194-
height: 32px;
195-
text-align: center;
196-
line-height: 32px;
197-
font-size: 24px;
198-
border-right: 1px solid $border-color;
199-
}
200-
201-
@include services;
202-
}
203-
204165
h1 .badge {
205166
text-shadow: none;
206167
}
207168

208-
.badge-service {
209-
@include services;
210-
}
211-
212169
.select2-highlighted a {
213170
color: yellow;
214171
text-decoration: underline;

app/concerns/evernote_concern.rb

Lines changed: 0 additions & 48 deletions
This file was deleted.

app/concerns/oauthable.rb

Lines changed: 0 additions & 31 deletions
This file was deleted.

app/controllers/agents_controller.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ def type_details
9191
can_dry_run: @agent.can_dry_run?,
9292
options: @agent.default_options,
9393
description_html: @agent.html_description,
94-
oauthable: render_to_string(partial: 'oauth_dropdown', locals: { agent: @agent }),
9594
form_options: render_to_string(partial: 'options', locals: { agent: @agent })
9695
}
9796
end

app/controllers/application_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def upgrade_warning
3434
def agent_params
3535
return {} unless params[:agent]
3636
@agent_params ||= begin
37-
params[:agent].permit([:memory, :name, :type, :schedule, :disabled, :keep_messages_for, :drop_pending_messages, :service_id,
37+
params[:agent].permit([:memory, :name, :type, :schedule, :disabled, :keep_messages_for, :drop_pending_messages,
3838
source_ids: [], receiver_ids: [], workflow_ids: [], controller_ids: [], control_target_ids: []] + agent_params_options)
3939
end
4040
end

0 commit comments

Comments
 (0)