slack-ruby-bot-server 0.12.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd95fc2a7806d66e49468401dec6f7598ba538d690f79c39a80723b0abd4afc8
-  data.tar.gz: 57d542b3799078c57e29914395d20c92735c9f70025471f7ccb3e422a965c437
+  metadata.gz: 4f81d3aefa974e927adeaa66b98092695463ff4f4dc8d1c0294a0efb7c824c01
+  data.tar.gz: 17731a13443a9c2cdc4e8bfa0183501c07395c670a04b4fa45efdaec503cd30e
 SHA512:
-  metadata.gz: 7725ccdcda4bc790c8f4a28de21797ee8aaefe698e937be0fb2bc665a487e28f3174960db32d772b75ea0137677a1049dc2ef05b8ea49f192dcd40d1b58502f0
-  data.tar.gz: a661c32f29d0685428510700dfed5f3a76614adf924d972cad8bae14570422ab2d131f7db41a28ad378f0c5a0e8c283943ab674e4c70df6d80ed826e12bd126f
+  metadata.gz: d2f99691dda8529a626456196f0359fd0a16e5ee28c831e23f7fc061038fb95b34b9bb0dc10cba562490c2d2b8b84bf23530d6d2e489e7747100e360d7fef8f9
+  data.tar.gz: ecb8a80e8c191111daab48367d7f9d2afa0a9ee0618d9ad339484af25e6a80cf36af9c047295a626b43403e94514343b19a383b7ecdb97d3875133fec8ab669f

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [dblock]

data/.rubocop_todo.yml

@@ -1,20 +1,18 @@
 # 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-11-16 09:56:54 -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
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 3
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: squiggly, active_support, powerpack, unindent
 Layout/HeredocIndentation:
   Exclude:
     - 'lib/slack-ruby-bot-server/info.rb'
-    - 'sample_apps/sample_app_activerecord/commands/help.rb'
-    - 'sample_apps/sample_app_mongoid/commands/help.rb'
 
 # Offense count: 1
 Lint/AmbiguousOperator:
@@ -27,22 +25,19 @@ Lint/NonDeterministicRequireOrder:
   Exclude:
     - 'spec/spec_helper.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
 # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
 Naming/FileName:
   Exclude:
     - 'lib/slack-ruby-bot-server.rb'
-    - 'lib/slack-ruby-bot-server/ext/slack-ruby-bot.rb'
 
-# Offense count: 3
+# Offense count: 1
 # Configuration parameters: ForbiddenDelimiters.
 # ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
   Exclude:
     - 'lib/slack-ruby-bot-server/info.rb'
-    - 'sample_apps/sample_app_activerecord/commands/help.rb'
-    - 'sample_apps/sample_app_mongoid/commands/help.rb'
 
 # Offense count: 3
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.

data/.travis.yml

@@ -31,4 +31,3 @@ before_install:
 
 script:
   - bundle exec rake
-  - BUNDLE_GEMFILE=Gemfile && cd sample_apps/sample_app_$DATABASE_ADAPTER && bundle && bundle exec rake

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 ### Changelog
 
+#### 1.2.0 (2020/11/27)
+
+* [#133](https://github.com/slack-ruby/slack-ruby-bot-server/pull/133): Added `Team#oauth_version` and `#scope` - [@dblock](https://github.com/dblock).
+
+#### 1.1.0 (2020/11/17)
+
+* [#132](https://github.com/slack-ruby/slack-ruby-bot-server/pull/132): Added support for OAuth v2 - [@dblock](https://github.com/dblock).
+
+#### 1.0.0 (2020/11/15)
+
+* [#129](https://github.com/slack-ruby/slack-ruby-bot-server/pull/129): Extracted RealTime components into [slack-ruby-bot-server-rtm](https://github.com/slack-ruby/slack-ruby-bot-server-rtm) - [@dblock](https://github.com/dblock).
+
+#### 0.12.3 (2020/11/14)
+
+* [#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).
+* [#127](https://github.com/slack-ruby/slack-ruby-bot-server/pull/127): Added a Rails bot example link - [@CrazyOptimist](https://github.com/CrazyOptimist).
+
+#### 0.12.2 (2020/7/26)
+
+* [#120](https://github.com/slack-ruby/slack-ruby-bot-server/pull/120): Removed GIFs - [@dblock](https://github.com/dblock).
+* [#121](https://github.com/slack-ruby/slack-ruby-bot-server/pull/121): Added TOC - [@dblock](https://github.com/dblock).
+
 #### 0.12.1 (2020/5/16)
 
 * [#118](https://github.com/slack-ruby/slack-ruby-bot-server/pull/118): Do not fail to start on errors in `Team#purge!` - [@dblock](https://github.com/dblock).

data/DEBUGGING.md

@@ -3,23 +3,3 @@
 ### Locally
 
 You can debug your instance of slack-ruby-bot-server with a built-in `script/console`.
-
-### Silence Mongoid Logger
-
-If Mongoid logging is annoying you.
-
-```ruby
-Mongoid.logger.level = Logger::INFO
-Mongo::Logger.logger.level = Logger::INFO
-```
-
-### Heroku
-
-```
-heroku run script/console --app=...
-
-Running `script/console` attached to terminal... up, run.7593
-
-2.2.1 > Team.count
-=> 3
-```

data/Dangerfile

@@ -1 +1,2 @@
 danger.import_dangerfile(gem: 'slack-ruby-danger')
+toc.check!

data/Gemfile

@@ -38,5 +38,6 @@ group :development, :test do
 end
 
 group :test do
+  gem 'danger-toc', '~> 0.2.0', require: false
   gem 'slack-ruby-danger', '~> 0.1.0', require: false
 end

data/README.md

@@ -7,33 +7,50 @@ Slack Ruby Bot Server
 
 Build a complete Slack bot service with Slack button integration, in Ruby.
 
-If you are not familiar with Slack bots or Slack API concepts, you might want to watch [this video](http://code.dblock.org/2016/03/11/your-first-slack-bot-service-video.html).
+## Table of Contents
 
-A good [open-source demo](https://github.com/dblock/slack-strava) of a service built on top of this library is [Strava integration with Slack](https://slava.playplay.io).
+- [What is this?](#what-is-this)
+- [Stable Release](#stable-release)
+- [Make Your Own](#make-your-own)
+- [Usage](#usage)
+  - [Storage](#storage)
+    - [MongoDB](#mongodb)
+    - [ActiveRecord](#activerecord)
+  - [OAuth Version and Scopes](#oauth-version-and-scopes)
+  - [Slack App](#slack-app)
+  - [API](#api)
+    - [App](#app)
+    - [Service Manager](#service-manager)
+      - [Lifecycle Callbacks](#lifecycle-callbacks)
+      - [Service Timers](#service-timers)
+      - [Extensions](#extensions)
+    - [Service Class](#service-class)
+  - [HTML Templates](#html-templates)
+  - [Access Tokens](#access-tokens)
+- [Sample Bots Using Slack Ruby Bot Server](#sample-bots-using-slack-ruby-bot-server)
+  - [Slack Bots with Granular Permissions](#slack-bots-with-granular-permissions)
+  - [Legacy Slack Bots](#legacy-slack-bots)
+- [Copyright & License](#copyright--license)
 
-### What is this?
+## What is this?
 
-A library that contains a [Grape](http://github.com/ruby-grape/grape) API serving a [Slack Ruby Bot](https://github.com/slack-ruby/slack-ruby-bot) to multiple teams. This gem combines a web server, a RESTful API and multiple instances of [slack-ruby-bot](https://github.com/slack-ruby/slack-ruby-bot). It integrates with the [Slack Platform API](https://medium.com/slack-developer-blog/launch-platform-114754258b91#.od3y71dyo). Your customers can use a Slack button to install the bot.
+A library that contains a web server and a RESTful [Grape](http://github.com/ruby-grape/grape) API serving a Slack bot to multiple teams. Use in conjunction with [slack-ruby-bot-server-events](https://github.com/slack-ruby/slack-ruby-bot-server-events) to build a complete Slack bot service, or [slack-ruby-bot-server-rtm](https://github.com/slack-ruby/slack-ruby-bot-server-rtm) to build a Class RealTime Slack bot. Your customers can use a Slack button to install the bot.
 
-### Stable Release
+## Stable Release
 
-You're reading the documentation for the **next** release of slack-ruby-bot-server. Please see the documentation for the [last stable release, v0.12.0](https://github.com/slack-ruby/slack-ruby-bot-server/blob/v0.12.0/README.md) unless you're integrating with HEAD. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
+You're reading the documentation for the **stable** release of slack-ruby-bot-server, v1.2.0. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
 
-### Try Me
+## Make Your Own
 
-A demo version of the [sample app with mongoid](sample_apps/sample_app_mongoid) is running on Heroku at [slack-ruby-bot-server.herokuapp.com](https://slack-ruby-bot-server.herokuapp.com). Use the _Add to Slack_ button. The bot will join your team as _@slackbotserver_.
+This library alone will only register a new bot, but will not include any bot functionality. To make something useful, we recommend you get started from a [slack-ruby-bot-events-sample](https://github.com/slack-ruby/slack-ruby-bot-server-events-sample) app to bootstrap your project.
 
-![](images/slackbutton.gif)
+## Usage
 
-Once a bot is registered, you can invite to a channel with `/invite @slackbotserver` interact with it. DM "hi" to it, or say "@slackbotserver hi".
+### Storage
 
-![](images/slackbotserver.gif)
+A database is required to store teams.
 
-### Run Your Own
-
-You can use one of the [sample applications](sample_apps) to bootstrap your project and start adding slack command handlers on top of this code. A database is required to store teams.
-
-### MongoDB
+#### MongoDB
 
 Use MongoDB with [Mongoid](https://github.com/mongodb/mongoid) as ODM. Configure the database connection in `mongoid.yml`. Add the `mongoid` gem in your Gemfile.
 
@@ -44,9 +61,7 @@ gem 'mongoid-scroll'
 gem 'slack-ruby-bot-server'
 ```
 
-See the [sample app using Mongoid](sample_apps/sample_app_mongoid) for more information.
-
-### ActiveRecord
+#### ActiveRecord
 
 Use ActiveRecord with, for example, PostgreSQL via [pg](https://github.com/ged/ruby-pg). Configure the database connection in `postgresql.yml`. Add the `activerecord`, `pg`, `otr-activerecord` and `cursor_pagination` gems to your Gemfile.
 
@@ -58,52 +73,49 @@ gem 'otr-activerecord'
 gem 'cursor_pagination'
 ```
 
-See the [sample app using ActiveRecord](sample_apps/sample_app_activerecord) for more information.
+### OAuth Version and Scopes
 
-### Usage
+Configure your app's [OAuth version](https://api.slack.com/authentication/oauth-v2) and [scopes](https://api.slack.com/legacy/oauth-scopes) as needed by your application.
 
-Start with one of the samples above, which contain a couple of custom commands, necessary dependencies and tests, then [create a new Slack App](https://api.slack.com/applications/new).
+```ruby
+SlackRubyBotServer.configure do |config|
+  config.oauth_version = :v2
+  config.oauth_scope = ['channels:read', 'chat:write']
+end
+```
 
-![](images/create-app.png)
+The "Add to Slack" button uses the standard OAuth code grant flow as described in the [Slack docs](https://api.slack.com/docs/oauth#flow). Once clicked, the user is taken through the authorization process at Slack's site. Upon successful completion, a callback containing a temporary code is sent to the redirect URL you specified. The endpoint at that URL contains code that persists the bot token each time a Slack client is instantiated for the specific team.
 
-Follow Slack's instructions, note the app client ID and secret, give the bot a default name, etc. The redirect URL should be the location of your app. For local testing purposes use a public tunneling service such as [ngrok](https://ngrok.com/) to expose local port 9292.
+### Slack App
 
-Within your application, edit your `.env` file and add `SLACK_CLIENT_ID=...` and `SLACK_CLIENT_SECRET=...` in it.
+Create a new Slack App [here](https://api.slack.com/applications/new).
 
-Run `bundle install` and `foreman start` to boot the app. Navigate to [localhost:9292](http://localhost:9292). You should see an "Add to Slack" button. Use it to install the app into your own Slack team.
+![](images/create-app.png)
 
-### OAuth Code Grant
+Follow Slack's instructions, note the app client ID and secret, give the bot a default name, etc.
 
-The "Add to Slack" button uses the standard OAuth code grant flow as described in the [Slack docs](https://api.slack.com/docs/oauth#flow).
+Within your application, edit your `.env` file and add `SLACK_CLIENT_ID=...` and `SLACK_CLIENT_SECRET=...` in it.
 
-The button itself contains a link that looks like this:
+Run `bundle install` and `foreman start` to boot the app.
 
 ```
-https://slack.com/oauth/authorize?scope=bot&client_id=<%= ENV['SLACK_CLIENT_ID'] %>
+$ foreman start
+07:44:47 web.1  | started with pid 59258
+07:44:50 web.1  | * Listening on tcp://0.0.0.0:5000
 ```
 
-Once clicked, the user is taken through the authorization process at Slack's site. Upon successful completion, a callback containing a temporary code is sent to the redirect URL you specified. The endpoint at that URL contains code that looks like this:
+Set the redirect URL in "OAuth & Permissions" be the location of your app. Since you cannot receive notifications on localhost from Slack use a public tunneling service such as [ngrok](https://ngrok.com/) to expose local port 9292 for testing.
 
-```ruby
-# Instantiate a web client
-client = Slack::Web::Client.new
-
-# Request a token using the temporary code
-rc = client.oauth_access(
-  client_id: ENV['SLACK_CLIENT_ID'],
-  client_secret: ENV['SLACK_CLIENT_SECRET'],
-  code: params[:code]
-)
-
-# Pluck the token from the response
-token = rc['bot']['bot_access_token']
+```
+$ ngrok http 5000
+Forwarding https://ddfd97f80615.ngrok.io -> http://localhost:5000
 ```
 
-The token is stored in persistent storage and used each time a Slack client is instantiated for the specific team.
+Navigate to either [localhost:9292](http://localhost:9292) or the ngrok URL above. You should see an "Add to Slack" button. Use it to install the app into your own Slack team.
 
 ### API
 
-This library implements an app, [SlackRubyBotServer::App](lib/slack-ruby-bot-server/app.rb), a service manager, [SlackRubyBotServer::Service](lib/slack-ruby-bot-server/service.rb) that creates multiple instances of a bot server class, [SlackRubyBotServer::Server](lib/slack-ruby-bot-server/server.rb), one per team. It also provides [default HTML templates and JS scripts](public) for Slack integration.
+This library implements an app, [SlackRubyBotServer::App](lib/slack-ruby-bot-server/app.rb) and a service manager, [SlackRubyBotServer::Service](lib/slack-ruby-bot-server/service.rb). It also provides [default HTML templates and JS scripts](public) for Slack integration.
 
 #### App
 
@@ -178,7 +190,7 @@ The [Add to Slack button](https://api.slack.com/docs/slack-button) also allows f
 auth = OpenSSL::HMAC.hexdigest("SHA256", "key", "data")
 ```
 ```html
-<a href="https://slack.com/oauth/authorize?scope=bot&client_id=<%= ENV['SLACK_CLIENT_ID'] %>&state=#{auth)"> ... </a>
+<a href="<%= SlackRubyBotServer::Config.oauth_authorize_url %>?scope=<%= SlackRubyBotServer::Config.oauth_scope_s %>&client_id=<%= ENV['SLACK_CLIENT_ID'] %>&state=#{auth)"> ... </a>
 ```
 ```ruby
 instance = SlackRubyBotServer::Service.instance
@@ -222,28 +234,10 @@ end
 
 A number of extensions use service manager callbacks and service timers to implement useful functionality.
 
+* [slack-ruby-bot-server-events](https://github.com/slack-ruby/slack-ruby-bot-server-events): Easily handle Slack slash commands, interactive buttons and events.
 * [slack-ruby-bot-server-mailchimp](https://github.com/slack-ruby/slack-ruby-bot-server-mailchimp): Subscribes new bot users to a Mailchimp mailing list.
 * [slack-ruby-bot-server-stripe](https://github.com/slack-ruby/slack-ruby-bot-server-stripe): Enables paid bots with trial periods and commerce through Stripe.
-
-#### Server Class
-
-You can override the server class to handle additional events, and configure the service to use it.
-
-```ruby
-class MyServer < SlackRubyBotServer::Server
-  on :hello do |client, data|
-    # connected to Slack
-  end
-
-  on :channel_joined do |client, data|
-    # the bot joined a channel in data.channel['id']
-  end
-end
-
-SlackRubyBotServer.configure do |config|
-  config.server_class = MyServer
-end
-```
+* [slack-ruby-bot-server-rtm](https://github.com/slack-ruby/slack-ruby-bot-server-rtm): Create RTM Slack bots.
 
 #### Service Class
 
@@ -278,15 +272,16 @@ end
 
 ### Access Tokens
 
-By default the implementation of [Team](lib/slack-ruby-bot-server/models/team) stores a `bot_access_token` as `token` that grants a certain amount of privileges to the bot user as described in [Slack OAuth Docs](https://api.slack.com/docs/oauth) along with `activated_user_access_token` that represents the token of the installing user. You may not want a bot user at all, or may require different auth scopes, such as `users.profile:read` to access user profile information via `Slack::Web::Client#users_profile_get`. To change required scopes make the following changes.
+By default the implementation of [Team](lib/slack-ruby-bot-server/models/team) stores the value of the token with all the requested OAuth scopes in both `token` and `activated_user_access_token` (for backwards compatibility), along with `oauth_version` and `oauth_scope`. If a legacy Slack bot integration `bot_access_token` is present, it is stored as `token`, and `activated_user_access_token` is the token that has all the requested OAuth scopes.
+
+## Sample Bots Using Slack Ruby Bot Server
 
-1) Configure your app to require additional scopes in Slack API under _OAuth_, _Permissions_
-2) Change the _Add to Slack_ buttons to require the additional scope, eg. `https://slack.com/oauth/authorize?scope=bot,users.profile:read&client_id=...`
-3) The access token with the requested scopes will be stored as `activated_user_access_token`.
+### Slack Bots with Granular Permissions
 
-You can see a sample implementation in [slack-sup#3a497b](https://github.com/dblock/slack-sup/commit/3a497b436d25d3a7738562655cda64b180ae0096).
+* [slack-ruby-bot-server-events-sample](https://github.com/slack-ruby/slack-ruby-bot-server-events-sample), a generic sample
+* [slack-rails-bot-starter](https://github.com/CrazyOptimist/slack-rails-bot-starter), an all-in-one Rails starter kit
 
-### Example Bots Using Slack Ruby Bot Server
+### Legacy Slack Bots
 
 * [slack-ruby-bot-server-sample](https://github.com/slack-ruby/slack-ruby-bot-server-sample), a generic sample
 * [slack-sup](https://github.com/dblock/slack-sup), see [sup.playplay.io](https://sup.playplay.io)
@@ -297,7 +292,7 @@ You can see a sample implementation in [slack-sup#3a497b](https://github.com/dbl
 * [slack-strava](https://github.com/dblock/slack-strava), see [slava.playplay.io](https://slava.playplay.io)
 * [slack-arena](https://github.com/dblock/slack-arena), see [arena.playplay.io](https://arena.playplay.io)
 
-### Copyright & License
+## Copyright & License
 
 Copyright [Daniel Doubrovkine](http://code.dblock.org) and Contributors, 2015-2020
 

data/UPGRADING.md

@@ -1,6 +1,49 @@
 Upgrading Slack-Ruby-Bot-Server
 ===============================
 
+### Upgrading to >= 1.2.0
+
+#### New Team Fields
+
+The following fields have been added to `Team`.
+
+* `oauth_scope`: Slack OAuth scope
+* `oauth_version`: Slack OAuth version used
+
+No action is required for Mongoid.
+
+If you're using ActiveRecord, create a migration to add these fields.
+
+```ruby
+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
+```
+
+### Upgrading to >= 1.1.0
+
+#### Extracted RealTime (Legacy) Support
+
+New slack apps may no longer access RTM. Classic Slack apps can no longer be submitted to the app directory as of December 4th, 2020. In preparation for these changes slack-ruby-bot-server no longer includes RTM components by default. These have been extracted to a new gem [slack-ruby-bot-server-rtm](https://github.com/slack-ruby/slack-ruby-bot-server-rtm).
+
+To upgrade an existing classic Slack app that uses slack-ruby-bot-server do the following.
+
+1. Add `slack-ruby-bot-server-rtm` as an additional dependency.
+2. Replace any reference to `SlackRubyBotServer::Server` to `SlackRubyBotServer::RealTime::Server`.
+3. Replace any `require 'slack-ruby-bot-server/rspec'` with `require 'slack-ruby-bot-server-rtm/rspec'`.
+4. Use Slack OAuth 1.0 and configure scopes.
+   ```ruby
+   SlackRubyBotServer.configure do |config|
+     config.oauth_version = :v1
+     config.oauth_scope = ['bot']
+   end
+   ```
+
+Existing RTM Slack bots will continue working and be listed in the Slack App Directory. On December 4th, 2020 Slack will no longer accept resubmissions from apps that are not using granular permissions. On November 18, 2021 Slack will start delisting apps that have not migrated to use granular permissions. Use [slack-ruby-bot-server-events](https://github.com/slack-ruby/slack-ruby-bot-server-events) to create a Slack bot with granular permissions. See [migration](https://api.slack.com/authentication/migration) for more details.
+
 ### Upgrading to >= 0.11.0
 
 #### Removed Legacy Migrations

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

@@ -1,10 +1,10 @@
-require 'async/websocket'
+require 'async'
 
+require 'slack-ruby-client'
 require 'grape-swagger'
-require 'slack-ruby-bot'
 
+require_relative 'slack-ruby-bot-server/loggable'
 require_relative 'slack-ruby-bot-server/service'
-require_relative 'slack-ruby-bot-server/server'
 require_relative 'slack-ruby-bot-server/config'
 require_relative 'slack-ruby-bot-server/ext'
 require_relative 'slack-ruby-bot-server/version'

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

@@ -40,33 +40,68 @@ module SlackRubyBotServer
 
             raise 'Missing SLACK_CLIENT_ID or SLACK_CLIENT_SECRET.' unless ENV.key?('SLACK_CLIENT_ID') && ENV.key?('SLACK_CLIENT_SECRET')
 
-            rc = client.oauth_access(
+            options = {
               client_id: ENV['SLACK_CLIENT_ID'],
               client_secret: ENV['SLACK_CLIENT_SECRET'],
               code: params[:code]
-            )
+            }
+
+            rc = client.send(SlackRubyBotServer.config.oauth_access_method, options)
+
+            token = nil
+            access_token = nil
+            user_id = nil
+            bot_user_id = nil
+            team_id = nil
+            team_name = nil
+            oauth_scope = nil
+            oauth_version = SlackRubyBotServer::Config.oauth_version
+
+            case oauth_version
+            when :v2
+              access_token = rc.access_token
+              token = rc.access_token
+              user_id = rc.authed_user&.id
+              bot_user_id = rc.bot_user_id
+              team_id = rc.team&.id
+              team_name = rc.team&.name
+              oauth_scope = rc.scope
+            when :v1
+              access_token = rc.access_token
+              bot = rc.bot if rc.key?(:bot)
+              token = bot ? bot.bot_access_token : access_token
+              user_id = rc.user_id
+              bot_user_id = bot ? bot.bot_user_id : nil
+              team_id = rc.team_id
+              team_name = rc.team_name
+              oauth_scope = rc.scope
+            end
 
-            token = rc['bot']['bot_access_token']
-            bot_user_id = rc['bot']['bot_user_id']
-            user_id = rc['user_id']
-            access_token = rc['access_token']
             team = Team.where(token: token).first
-            team ||= Team.where(team_id: rc['team_id']).first
+            team ||= Team.where(team_id: team_id, oauth_version: oauth_version).first
+            team ||= Team.where(team_id: team_id).first
 
             if team
+              team.ping_if_active!
+
               team.update_attributes!(
+                oauth_version: oauth_version,
+                oauth_scope: oauth_scope,
                 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)
             else
               team = Team.create!(
                 token: token,
-                team_id: rc['team_id'],
-                name: rc['team_name'],
+                oauth_version: oauth_version,
+                oauth_scope: oauth_scope,
+                team_id: team_id,
+                name: team_name,
                 activated_user_id: user_id,
                 activated_user_access_token: access_token,
                 bot_user_id: bot_user_id