Merge branch 'ginjo-master' into auth-hash-fixes

.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 *.gem
 *.rbc
 .bundle
@@ -6,15 +7,16 @@
 Gemfile.lock
 InstalledFiles
 _yardoc
-coverage
+coverage/
 doc/
+rdoc/
+ydoc/
 lib/bundler/man
-pkg
-rdoc
+pkg/
 spec/reports
-test/tmp
-test/version_tmp
 tmp
 .idea/
 .ruby-version
 .ruby-gemset
+.gitchangelog.rc
+empty*

.rdoc_options

@@ -0,0 +1,33 @@
+# This is a yaml file of rdoc options
+#
+#
+--- !ruby/object:RDoc::Options
+encoding: UTF-8
+static_path: []
+rdoc_include:
+- "."
+- "/OmniAuthSlack"
+charset: UTF-8
+exclude: 
+- "vendor/*"
+hyperlink_all: false
+line_numbers: false
+locale: 
+locale_dir: locale
+locale_name: 
+main_page: 
+#markup: rdoc
+markup: markdown
+output_decoration: true
+page_dir: 
+show_hash: false
+tab_width: 8
+template_stylesheets: []
+title: 
+visibility: :protected
+webcvs: 
+#files:
+#- "lib/**/*.rb"
+#- "lib/**/*.erb"
+op_dir: rdoc
+

.yardopts

@@ -0,0 +1,14 @@
+# See https://rubydoc.info/gems/yard/YARD/CLI/Yardoc
+# See https://gist.github.com/nesquena/1406718
+# See https://github.com/github/markup
+
+--output ydoc
+--plugin tomdoc
+--no-cache
+--exclude vendor\/.*
+--markup-provider=redcarpet
+--markup=markdown
+
+lib/**/*.rb
+lib/**/*.erb -
+README.md CHANGELOG.md LICENSE.txt

CHANGELOG.md

@@ -0,0 +1,90 @@
+## v2.5.0
+
+* Added Slack v2 API support (oauth flow, scopes, tokens).
+
+* Removed additional API calls from callback phase.
+
+* Removed mapping of specific access-token fields to auth-hash `info` section.
+
+* Implemented deep-trace logging, activated with `ENV['OMNIAUTH_SLACK_DEBUG']=true`
+
+* Improved `AccessToken#has_scope?` functionality.
+
+* Added optional `OmniAuth::Slack::VerifySlackSignature` middleware (experimental).
+
+* Numerous code improvements and debugging.
+
+
+## v2.4.1 (2018-09-18)
+
+* Set `client_options[:auth_scheme]` to `:basic_auth`, as OAuth2 gem does not yet make this the default. [wbr]
+
+* Stop using `:setup` option to manipulate site uri subdomain. [wbr]
+
+* Override `client` method to manipulate site uri subdomain. [wbr]
+
+* Allow `apps.permissions.users.list` call to be excluded by user. [wbr]
+
+* Fix gemspec dep for omniauth-oauth2. [wbr]
+
+* Add experimental class method `ad_hoc_client`. [wbr]
+
+
+## v2.4.0 (2018-08-28)
+
+Initial release of ginjo-omniauth-slack
+
+* Update gemspec dependencies.
+
+* Add/fix AuthHash `extra['scopes_requested']`. [wbr]
+
+* Refactor building of AuthHash to dynamically call additional API requests if necessary, scope permitting. [wbr]
+
+* Add potential `bots.info` call, if bots info is not included in authorization response. [wbr]
+
+* Add option to preload all possible user/team/bot data, using threads, after initial authorization token is received. [wbr]
+
+* Use a method-specific mutex/semaphore for each API-call method when utilizing threads. [wbr]
+
+* Add options to include or exclude specific API calls. [wbr]
+
+* Ensure jruby compatibility. [wbr]
+
+* Initial support for `additional_data` option, allowing additional API calls during callback phase. [wbr]
+
+* Add support for `redirect_uri` option (covers PR https://github.com/kmrshntr/omniauth-slack/pull/39). [wbr]
+
+* Initial support for Workspace apps and tokens. [wbr]
+
+* Support setting slack subdomain at runtime with `team_domain` option. [wbr]
+
+* Add token scopes to AuthHash `credentials` hash. [wbr]
+
+* Append AuthHash `extra['raw_info']` section with full response of all API requests. [wbr]
+
+* Respect `skip_info` option. [wbr]
+
+* Don't insert `NA` in empty AuthHash fields, leave them as nil. [wbr]
+
+* Add test coverage for new functionality. [wbr]
+
+
+### Additional changes logged between 2.3.0 release and ginjo fork/refactor
+
+The specifics of these commits may or may not be relevant in the ginjo fork, but their functionality is covered in one way or another.
+
+* Merge pull request #51 from vadim7j7/fix-redirect_uri. [Shintaro Kimura]
+
+* Merge pull request #50 from jonhue/master. [Shintaro Kimura]
+
+* Rubygems via SSL. [jonhue]
+
+* Fix #46 - Bump dependency version. [jonhue]
+
+* Merge pull request #48 from jonhue/master. [Shintaro Kimura]
+
+* Merge pull request #44 from pwnall/expose_identity. [Shintaro Kimura]
+
+* Expose users.identity information in omniauth_hash.extra. [Victor Costan]
+
+

Gemfile

@@ -1,4 +1,8 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in omniauth-slack.gemspec
+# The gem's dependencies are specified in omniauth-slack.gemspec
 gemspec
+
+# Some installations may need oauth2 gem v1.4.4+ to operate
+# correctly with Slack v2 user tokens.
+#gem 'oauth2', '>= 1.4.4'