slack-ruby-bot-server-rtm 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5824cb54023d4ee24f318fe9b455cd4ccc3b450ecaec0ccc893223517e823d87
-  data.tar.gz: aca8db91d16aeb611f25bb0784deab2072fbcb777c32b155c6fa8a9bdf8afb31
+  metadata.gz: '0994639f48c3a767e5fbc7fd32ad3562b10c441bd9501c281e2fb319ac9f6b1d'
+  data.tar.gz: c3a15360020d5c583c51d62638a1173242f90436688ce42449ed1c8252078999
 SHA512:
-  metadata.gz: 9ab696238cbe2b831efc55fc705d3b4d2e06b5e4594fbd5a2694b1bfb4faf8a3415b7292ffdf3bd223ef880f465e7ad6d29137920d6190976a214ec727ea284c
-  data.tar.gz: a84c2a77ee1007efeee7114145d539ba8183b43ca38b4650ca5c0a6f422826a973c4b75e47ecb47347e36b46bb014cf1fb4c70948ec6125b690145487db1cb28
+  metadata.gz: 6120ad611f46756377074d921b58c0d96e6d9d6e5939e6f53c01c09ed82803271d4cd9491a337f36130e7a59fbf130d64655b813724cde8151cf4597c99857b0
+  data.tar.gz: dab2bb5ef2aef7e94701667f169f4d8a185f6921ade0a5391e3e177f36cd4976d813558e07237dd911737d3e4aa2a9b681b33e2830ac0ff97836f8a91488d744

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-11-14 17:59:41 -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

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ### Changelog
 
+#### 0.2.0 (2020/11/27)
+
+* [#1](https://github.com/slack-ruby/slack-ruby-bot-server-rtm/pull/1): Only start OAuth v1 teams with a bot token - [@dblock](https://github.com/dblock).
+
 #### 0.1.1 (2020/11/15)
 
 * Fix: error `private method 'run_callbacks' called for #<SlackRubyBotServer::Service>` - [@dblock](https://github.com/dblock).

data/README.md

@@ -2,9 +2,21 @@ Slack Ruby Bot Server RealTime (RTM) Extension
 ==============================================
 
 [![Gem Version](https://badge.fury.io/rb/slack-ruby-bot-server-rtm.svg)](https://badge.fury.io/rb/slack-ruby-bot-server-rtm)
-[![Build Status](https://travis-ci.org/slack-ruby/slack-ruby-bot-server-rtm.svg?branch=master)](https://travis-ci.org/slack-ruby/slack-ruby-bot-server-rtm)
+[![Build Status](https://travis-ci.org/slack-ruby/slack-ruby-bot-server-rtm.svg?branch=main)](https://travis-ci.org/slack-ruby/slack-ruby-bot-server-rtm)
 
-An extension to [slack-ruby-bot-server](https://github.com/slack-ruby/slack-ruby-bot-server) that makes it easy to implement Slack RTM bots.
+# Table of Contents
+
+- [Introduction](#introduction)
+- [Samples](#samples)
+- [Usage](#usage)
+  - [Gemfile](#gemfile)
+  - [Configure](#configure)
+    - [Server Class](#server-class)
+- [Copyright & License](#copyright--license)
+
+### Introduction
+
+This library is an extension to [slack-ruby-bot-server](https://github.com/slack-ruby/slack-ruby-bot-server) that makes it easy to implement Slack RTM bots.
 
 ### Samples
 

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

@@ -5,6 +5,8 @@ SlackRubyBotServer.configure do |config|
 end
 
 SlackRubyBotServer::Config.service_class.instance.on :starting do |team, _error, options|
+  next if team.respond_to?(:oauth_version) && team.oauth_version != 'v1'
+
   SlackRubyBotServer::Config.service_class.instance.logger.info "Starting real-time team #{team}."
   options = { team: team }
   server = SlackRubyBotServer::RealTime::Config.server_class.new(options)
@@ -26,6 +28,6 @@ SlackRubyBotServer::Config.service_class.instance.on :stopped do |team, _error,
 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

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

@@ -23,9 +23,13 @@ module SlackRubyBotServer
       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)."

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

@@ -2,6 +2,6 @@
 
 module SlackRubyBotServer
   module RealTime
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

data/sample_apps/sample_app_activerecord/db/migrate/20201125164500_add_oauth_fields.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddOauthFields < ActiveRecord::Migration[5.0]
+  def change
+    add_column :teams, :oauth_scope, :string
+    add_column :teams, :oauth_version, :string, default: 'v1', null: false
+  end
+end

data/sample_apps/sample_app_activerecord/db/schema.rb

@@ -12,7 +12,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20_190_323_181_453) do
+ActiveRecord::Schema.define(version: 20_201_125_164_500) do
   # These are extensions that must be enabled in order to support this database
   enable_extension 'plpgsql'
 
@@ -22,10 +22,12 @@ ActiveRecord::Schema.define(version: 20_190_323_181_453) do
     t.boolean  'active', default: true
     t.string   'domain'
     t.string   'token'
-    t.datetime 'created_at',                                 null: false
-    t.datetime 'updated_at',                                 null: false
+    t.datetime 'created_at', null: false
+    t.datetime 'updated_at', null: false
     t.string   'bot_user_id'
     t.string   'activated_user_id'
     t.string   'activated_user_access_token'
+    t.string   'oauth_scope'
+    t.string   'oauth_version', default: 'v1', null: false
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot-server-rtm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-15 00:00:00.000000000 Z
+date: 2020-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-websocket
@@ -96,6 +96,7 @@ files:
 - sample_apps/sample_app_activerecord/config/postgresql.yml
 - sample_apps/sample_app_activerecord/db/migrate/20170307164946_create_teams_table.rb
 - sample_apps/sample_app_activerecord/db/migrate/20190323181453_add_activated_fields.rb
+- sample_apps/sample_app_activerecord/db/migrate/20201125164500_add_oauth_fields.rb
 - sample_apps/sample_app_activerecord/db/schema.rb
 - sample_apps/sample_app_activerecord/spec/api/root_spec.rb
 - sample_apps/sample_app_activerecord/spec/commands/help_spec.rb