From 43bb6116b075815d4ae9883d26a823de257b19f8 Mon Sep 17 00:00:00 2001
From: wass3r <wasser@gmail.com>
Date: Sat, 3 Apr 2021 16:23:55 -0500
Subject: [PATCH] fix: workspace token mentions

---
 .env.example               |  2 +-
 remote/slack/helper.go     | 12 ++++++------
 utils/access_check_test.go |  1 -
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.env.example b/.env.example
index c066d40c..159a86c7 100644
--- a/.env.example
+++ b/.env.example
@@ -1,2 +1,2 @@
 SLACK_TOKEN=
-SLACK_WORKSPACE_TOKEN=
\ No newline at end of file
+SLACK_SIGNING_SECRET=
\ No newline at end of file
diff --git a/remote/slack/helper.go b/remote/slack/helper.go
index e85877d3..93e37684 100644
--- a/remote/slack/helper.go
+++ b/remote/slack/helper.go
@@ -458,17 +458,17 @@ func populateBotUsers(slackUsers []slack.User, bot *models.Bot) {
 // populateUserGroups populates slack user groups
 func populateUserGroups(bot *models.Bot) {
 	userGroups := make(map[string]string)
-	wsAPI := slack.New(bot.SlackToken)
-	ugroups, err := wsAPI.GetUserGroups()
+	api := slack.New(bot.SlackToken)
+
+	ugroups, err := api.GetUserGroups()
 	if err != nil {
-		bot.Log.Debugf("Unable to retrieve usergroups: %s", err.Error())
-		bot.Log.Debug("Please double check your Slack Workspace token")
+		bot.Log.Debugf("unable to retrieve usergroups: %s - confirm you have usergroups:read permission set", err.Error())
 	}
+
 	for _, usergroup := range ugroups {
 		userGroups[usergroup.Handle] = usergroup.ID
 	}
-	// we don't need API anymore
-	wsAPI = nil
+
 	bot.UserGroups = userGroups
 }
 
diff --git a/utils/access_check_test.go b/utils/access_check_test.go
index 714ae3a5..b3990246 100644
--- a/utils/access_check_test.go
+++ b/utils/access_check_test.go
@@ -37,7 +37,6 @@ func TestCanTrigger(t *testing.T) {
 		{"User not in ignore list", args{"jane.doe", "F123456", models.Rule{IgnoreUsers: []string{"john.doe", "jack.jill"}}, testBot}, true},
 		{"User is allowed but ignored", args{"jane.doe", "F123456", models.Rule{AllowUsers: []string{"jane.doe"}, IgnoreUsers: []string{"jane.doe", "jack.jill"}}, testBot}, false},
 		{"User is not allowed and ignored", args{"john.doe", "F123456", models.Rule{AllowUsers: []string{"jane.doe"}, IgnoreUsers: []string{"john.doe", "jack.jill"}}, testBot}, false},
-		{"Group - Workspace Token not supplied", args{"jane.doe", "F123456", models.Rule{AllowUserGroups: []string{"admins"}}, testBot}, false},
 		{"Group - Discord - Not supported", args{"jane.doe", "F123456", models.Rule{AllowUserGroups: []string{"admins"}}, discordBot}, false},
 		{"Group - Chat network not supported", args{"jane.doe", "F123456", models.Rule{AllowUserGroups: []string{"admins"}}, strangeBot}, false},
 		// TODO: figure out how to test this below: