Do not deactivate teams that have upgraded oauth v1 to v2.

Author: dblock

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-11-25 13:42:05 -0500 using RuboCop version 0.81.0.
+# on 2020-11-27 15:32:33 -0500 using RuboCop version 0.81.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new

Gemfile

@@ -38,5 +38,3 @@ end
 group :test do
   gem 'slack-ruby-danger', '~> 0.2.0', require: false
 end
-
-gem 'slack-ruby-bot-server', github: 'dblock/slack-ruby-bot-server', branch: 'oauth-version'

lib/slack-ruby-bot-server-rtm/lifecycle.rb

@@ -28,6 +28,6 @@
 end
 
 SlackRubyBotServer::Config.service_class.instance.on :deactivated do |team, _error, _options|
-  SlackRubyBotServer::Config.service_class.instance.logger.info "De-activating real-time team #{team}."
+  SlackRubyBotServer::Config.service_class.instance.logger.info "De-activated real-time team #{team}."
   team.server = nil
 end

lib/slack-ruby-bot-server-rtm/server.rb

@@ -23,9 +23,13 @@ def self.start_server!(team, server, wait = 1)
       rescue StandardError => e
         SlackRubyBotServer::Config.service_class.instance.send(:run_callbacks, :error, team, e)
         case e.message
-        when 'account_inactive', 'invalid_auth' then
-          SlackRubyBotServer::Config.service_class.instance.logger.error "#{team.name}: #{e.message}, team will be deactivated."
-          SlackRubyBotServer::Config.service_class.instance.deactivate! team
+        when 'account_inactive', 'invalid_auth'
+          if team.respond_to?(:oauth_version) && team.oauth_version != 'v1'
+            SlackRubyBotServer::Config.service_class.instance.logger.info "#{team.name}: #{e.message}, team OAuth scope has been upgraded."
+          else
+            SlackRubyBotServer::Config.service_class.instance.logger.error "#{team.name}: #{e.message}, team will be deactivated."
+            SlackRubyBotServer::Config.service_class.instance.deactivate! team
+          end
         else
           wait = e.retry_after if e.is_a?(Slack::Web::Api::Errors::TooManyRequestsError)
           SlackRubyBotServer::Config.service_class.instance.logger.error "#{team.name}: #{e.message}, restarting in #{wait} second(s)."

sample_apps/sample_app_activerecord/Gemfile

@@ -8,7 +8,6 @@ gem 'otr-activerecord', '~> 1.2.1'
 gem 'pg'
 gem 'rack-server-pages'
 gem 'rack-test'
-gem 'slack-ruby-bot-server', github: 'dblock/slack-ruby-bot-server', branch: 'oauth-version'
 gem 'slack-ruby-bot-server-rtm', path: '../../'
 gem 'unicorn'
 

spec/slack-ruby-bot-server-rtm/server_spec.rb

@@ -29,5 +29,6 @@
     pending 'handles account_inactive'
     pending 'handles invalid_auth'
     pending 'handles generic error'
+    pending 'does not deactivate a team that has upgraded oauth from v1 to v2'
   end
 end