Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added GetUsersOptionTeamID so that a team ID can be passed in for use #1077

Merged
merged 11 commits into from Jun 14, 2022
Merged

Added GetUsersOptionTeamID so that a team ID can be passed in for use #1077

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7287339
Add .whitesource configuration file
mend-for-github-com[bot] May 18, 2022
f00fbf4
Merge branch 'slack-go:master' into master
antonylucisano Jun 7, 2022
a9160dd
added team ID as an additional option as this is required for Organiz…
antonylucisano Jun 7, 2022
ad04088
Merge pull request #5 from improbable/get-users-additional-option-tea…
antonylucisano Jun 7, 2022
24179ef
added to git ignore
antonylucisano Jun 8, 2022
823e93d
Merge pull request #6 from improbable/ignore-whitesource
antonylucisano Jun 8, 2022
9579c43
Add .whitesource configuration file
mend-for-github-com[bot] Jun 8, 2022
242318e
removed2
antonylucisano Jun 8, 2022
46f2dff
removed from gitignore
antonylucisano Jun 8, 2022
6ad7e3b
removed from gitignore
antonylucisano Jun 8, 2022
9b406dd
camel case
antonylucisano Jun 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 13 additions & 4 deletions users.go
View file
Open in desktop
Expand Up @@ -292,6 +292,13 @@ func GetUsersOptionPresence(n bool) GetUsersOption {
}
}

// GetUsersOptionTeamID include team Id
func GetUsersOptionTeamID(teamId string) GetUsersOption {
return func(p *UserPagination) {
p.teamId = teamId
}
}

func newUserPagination(c *Client, options ...GetUsersOption) (up UserPagination) {
up = UserPagination{
c: c,
Expand All @@ -310,6 +317,7 @@ type UserPagination struct {
Users []User
limit int
presence bool
teamId string
previousResp *ResponseMetadata
c *Client
}
Expand Down Expand Up @@ -344,6 +352,7 @@ func (t UserPagination) Next(ctx context.Context) (_ UserPagination, err error)
"presence": {strconv.FormatBool(t.presence)},
"token": {t.c.token},
"cursor": {t.previousResp.Cursor},
"team_id": {t.teamId},
"include_locale": {strconv.FormatBool(true)},
}

Expand All @@ -364,13 +373,13 @@ func (api *Client) GetUsersPaginated(options ...GetUsersOption) UserPagination {
}

// GetUsers returns the list of users (with their detailed information)
func (api *Client) GetUsers() ([]User, error) {
return api.GetUsersContext(context.Background())
func (api *Client) GetUsers(options ...GetUsersOption) ([]User, error) {
return api.GetUsersContext(context.Background(), options...)
}

// GetUsersContext returns the list of users (with their detailed information) with a custom context
func (api *Client) GetUsersContext(ctx context.Context) (results []User, err error) {
p := api.GetUsersPaginated()
func (api *Client) GetUsersContext(ctx context.Context, options ...GetUsersOption) (results []User, err error) {
p := api.GetUsersPaginated(options...)
for err == nil {
p, err = p.Next(ctx)
if err == nil {
Expand Down