Reactivate a team that was disabled from Slack.

Author: dblock

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-06-16 16:54:39 -0400 using RuboCop version 0.81.0.
+# on 2020-07-17 08:36:05 -0400 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

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 #### 0.12.3 (Next)
 
+* [#123](https://github.com/slack-ruby/slack-ruby-bot-server/pull/123): Reactivate a team that was disabled from Slack - [@dblock](https://github.com/dblock).
 * Your contribution here.
 
 #### 0.12.2 (2020/7/26)

lib/slack-ruby-bot-server/api/endpoints/teams_endpoint.rb

@@ -54,11 +54,14 @@ class TeamsEndpoint < Grape::API
             team ||= Team.where(team_id: rc['team_id']).first
 
             if team
+              team.ping_if_active!
+
               team.update_attributes!(
                 activated_user_id: user_id,
                 activated_user_access_token: access_token,
                 bot_user_id: bot_user_id
               )
+
               raise "Team #{team.name} is already registered." if team.active?
 
               team.activate!(token)

lib/slack-ruby-bot-server/models/team/methods.rb

@@ -38,5 +38,17 @@ def ping!
         presence: client.users_getPresence(user: auth['user_id'])
       }
     end
+
+    def ping_if_active!
+      return unless active?
+
+      ping!
+    rescue Slack::Web::Api::Errors::SlackError => e
+      logger.warn "Active team #{self} ping, #{e.message}."
+      case e.message
+      when 'account_inactive', 'invalid_auth'
+        deactivate!
+      end
+    end
   end
 end

spec/api/endpoints/teams_endpoint_spec.rb

@@ -106,7 +106,24 @@
           expect(team.bot_user_id).to eq 'bot_user_id'
         end.to_not change(Team, :count)
       end
+      it 'reactivates a team deactivated on slack' do
+        expect(SlackRubyBotServer::Service.instance).to receive(:start!)
+        existing_team = Fabricate(:team, token: 'token')
+        expect do
+          expect_any_instance_of(Team).to receive(:ping!) { raise Slack::Web::Api::Errors::SlackError, 'invalid_auth' }
+          team = client.teams._post(code: 'code')
+          expect(team.team_id).to eq existing_team.team_id
+          expect(team.name).to eq existing_team.name
+          expect(team.active).to be true
+          team = Team.find(team.id)
+          expect(team.token).to eq 'token'
+          expect(team.active).to be true
+          expect(team.bot_user_id).to eq 'bot_user_id'
+          expect(team.activated_user_id).to eq 'user_id'
+        end.to_not change(Team, :count)
+      end
       it 'returns a useful error when team already exists' do
+        expect_any_instance_of(Team).to receive(:ping_if_active!)
         existing_team = Fabricate(:team, token: 'token')
         expect { client.teams._post(code: 'code') }.to raise_error Faraday::ClientError do |e|
           json = JSON.parse(e.response[:body])