slack-ruby-bot-server 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d96988aebe8c1dadd75c95e086ad63f5aaa81a8c93ecb1a92ae2f6a1908f6b6d
-  data.tar.gz: a1519cf75e0afadc610fc92b975613d7817c5a8cf243f849c6ecb9587e504df0
+  metadata.gz: 4f81d3aefa974e927adeaa66b98092695463ff4f4dc8d1c0294a0efb7c824c01
+  data.tar.gz: 17731a13443a9c2cdc4e8bfa0183501c07395c670a04b4fa45efdaec503cd30e
 SHA512:
-  metadata.gz: e52881e9b3faa4754a4c582eb9269a6b9eacf0f3f80f4dc20d7332e0d9304d2580b47185409ace983422f6e800bd2ae9bed00d3829eb457c4299eee5294630c3
-  data.tar.gz: 91a903e372af38353a914d61f04d1e7016e1e25edf3f9b41afeee523279c1b5c29fefb23ec8d1acc1bb6fdaaf8b6cd0ef4d1c6a2b2f1ac9707ac036a22f4881e
+  metadata.gz: d2f99691dda8529a626456196f0359fd0a16e5ee28c831e23f7fc061038fb95b34b9bb0dc10cba562490c2d2b8b84bf23530d6d2e489e7747100e360d7fef8f9
+  data.tar.gz: ecb8a80e8c191111daab48367d7f9d2afa0a9ee0618d9ad339484af25e6a80cf36af9c047295a626b43403e94514343b19a383b7ecdb97d3875133fec8ab669f

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 ### 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): Add support for OAuth v2 - [@dblock](https://github.com/dblock).
+* [#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)
 

data/README.md

@@ -38,7 +38,7 @@ A library that contains a web server and a RESTful [Grape](http://github.com/rub
 
 ## Stable Release
 
-You're reading the documentation for the **stable** release of slack-ruby-bot-server. 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.
 
 ## Make Your Own
 
@@ -272,7 +272,7 @@ end
 
 ### Access Tokens
 
-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). 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.
+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
 

data/UPGRADING.md

@@ -1,6 +1,28 @@
 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

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

@@ -54,8 +54,10 @@ module SlackRubyBotServer
             bot_user_id = nil
             team_id = nil
             team_name = nil
+            oauth_scope = nil
+            oauth_version = SlackRubyBotServer::Config.oauth_version
 
-            case SlackRubyBotServer::Config.oauth_version
+            case oauth_version
             when :v2
               access_token = rc.access_token
               token = rc.access_token
@@ -63,6 +65,7 @@ module SlackRubyBotServer
               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)
@@ -71,15 +74,19 @@ module SlackRubyBotServer
               bot_user_id = bot ? bot.bot_user_id : nil
               team_id = rc.team_id
               team_name = rc.team_name
+              oauth_scope = rc.scope
             end
 
             team = Team.where(token: token).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
@@ -91,6 +98,8 @@ module SlackRubyBotServer
             else
               team = Team.create!(
                 token: token,
+                oauth_version: oauth_version,
+                oauth_scope: oauth_scope,
                 team_id: team_id,
                 name: team_name,
                 activated_user_id: user_id,

data/lib/slack-ruby-bot-server/config/database_adapters/activerecord.rb

@@ -18,6 +18,8 @@ module SlackRubyBotServer
         t.string :name
         t.string :domain
         t.string :token
+        t.string :oauth_scope
+        t.string :oauth_version, default: 'v1', null: false
         t.string :bot_user_id
         t.string :activated_user_id
         t.string :activated_user_access_token

data/lib/slack-ruby-bot-server/models/team/mongoid.rb

@@ -8,6 +8,8 @@ class Team
   field :name, type: String
   field :domain, type: String
   field :token, type: String
+  field :oauth_scope, type: String
+  field :oauth_version, type: String, default: 'v1'
   field :active, type: Boolean, default: true
   field :bot_user_id, type: String
   field :activated_user_id, type: String

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

@@ -1,3 +1,3 @@
 module SlackRubyBotServer
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot-server
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2020-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async