wip

Author: 5t111111

Gemfile

@@ -11,7 +11,7 @@ gem 'jbuilder', '~> 2.0'
 gem 'jquery-rails'
 gem 'kramdown'
 gem 'materialize-sass'
-gem 'omniauth-slack'
+gem 'omniauth-slack', github: 'kmrshntr/omniauth-slack'
 gem 'pg'
 gem 'puma'
 gem 'react-rails'

Gemfile.lock

@@ -8,6 +8,13 @@ GIT
       minitest-metadata (~> 0.6)
       minitest-rails (= 3.0.0.rc1)
 
+GIT
+  remote: git://github.com/kmrshntr/omniauth-slack.git
+  revision: 8b2371150cf3d892750695cd88118f8b16db9d01
+  specs:
+    omniauth-slack (2.3.0)
+      omniauth-oauth2 (~> 1.3.1)
+
 GIT
   remote: https://github.com/5t111111/tapp.git
   revision: eba500b69d89a184d2382afe117a94a7ce562d37
@@ -157,8 +164,6 @@ GEM
     omniauth-oauth2 (1.3.1)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
-    omniauth-slack (2.3.0)
-      omniauth-oauth2 (~> 1.3.1)
     pg (0.18.4)
     pry (0.10.3)
       coderay (~> 1.1.0)
@@ -292,7 +297,7 @@ DEPENDENCIES
   materialize-sass
   minitest-rails-capybara!
   minitest-stub_any_instance
-  omniauth-slack
+  omniauth-slack!
   pg
   pry-byebug
   puma

app/controllers/sessions_controller.rb

@@ -9,8 +9,6 @@ def new
   def create
     auth = request.env['omniauth.auth']
 
-    binding.pry
-
     unless User.team_member?(auth[:uid])
       return redirect_to login_url, alert: 'Only team member can login'
     end

app/models/concerns/authenticator.rb

@@ -7,8 +7,11 @@ def team_member?(uid)
     end
 
     def fetch_member_uids
+      team_info = Slack::Web::Client.new.team_info
       users_list = Slack::Web::Client.new.users_list
-      users_list.members.reject(&:deleted).map(&:id)
+      users_list.members.reject(&:deleted).map(&:id).map do |uid|
+        "#{uid}-#{team_info.team.id}"
+      end
     end
   end
 end

app/models/user.rb

@@ -6,7 +6,7 @@ class User < ActiveRecord::Base
   class << self
     def find_or_create_from(auth)
       find_or_create_by(provider: auth[:provider], uid: auth[:uid]) do |user|
-        user.nickname = auth[:info][:nickname]
+        user.nickname = auth[:info][:name]
       end
     end
   end

config/initializers/omniauth.rb

@@ -2,7 +2,7 @@
   provider :slack,
            ENV['SLACK_CLIENT_ID'],
            ENV['SLACK_CLIENT_SECRET'],
-           scope: 'identity.basic,identity.team,identity.avatar'
+           scope: 'identity.basic'
 
   on_failure { |env| OmniAuth::FailureEndpoint.new(env).redirect_to_failure }
 end