Skip to content

feat: Additional user lists pagination and filtering #27

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

Open
matts-path wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Additional user lists pagination and filtering #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 83 additions & 5 deletions okta/UserCmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package okta

import (
"encoding/json"
"fmt"
"io"

"github.com/okta/okta-cli-client/utils"
Expand Down Expand Up @@ -60,13 +62,42 @@ func init() {
UserCmd.AddCommand(CreateUserCmd)
}

var (
ListUsersq string
ListUsersafter string
ListUserslimit int32
ListUserssearch string
ListUserssortBy string
ListUserssortOrder string
ListUsersgetAll bool
)

func NewListUsersCmd() *cobra.Command {
cmd := &cobra.Command{
Use: "lists",
Long: "List all Users",
RunE: func(cmd *cobra.Command, args []string) error {
req := apiClient.UserAPI.ListUsers(apiClient.GetConfig().Context)

if ListUsersq != "" {
req = req.Q(ListUsersq)
}
if ListUsersafter != "" {
req = req.After(ListUsersafter)
}
if ListUserslimit > 0 {
req = req.Limit(ListUserslimit)
}
if ListUserssearch != "" {
req = req.Search(ListUserssearch)
}
if ListUserssortBy != "" {
req = req.SortBy(ListUserssortBy)
}
if ListUserssortOrder != "" {
req = req.SortOrder(ListUserssortOrder)
}

resp, err := req.Execute()
if err != nil {
if resp != nil && resp.Body != nil {
Expand All @@ -77,16 +108,63 @@ func NewListUsersCmd() *cobra.Command {
}
return err
}
d, err := io.ReadAll(resp.Body)
if err != nil {
return err

// If --all flag is set, fetch all pages and combine results
if ListUsersgetAll {
var allUsers []interface{}

// Read first page
d, err := io.ReadAll(resp.Body)
if err != nil {
return err
}

if len(d) > 0 {
var firstPageUsers []interface{}
err = json.Unmarshal(d, &firstPageUsers)
if err != nil {
return fmt.Errorf("error unmarshaling first page: %v", err)
}
allUsers = append(allUsers, firstPageUsers...)
}

// Continue with pagination
for resp.HasNextPage() {
var pageUsers []interface{}
resp, err = resp.Next(&pageUsers)
if err != nil {
return fmt.Errorf("error getting next page: %v", err)
}
allUsers = append(allUsers, pageUsers...)
}

// Output all users as a single JSON array
allUsersJSON, err := json.MarshalIndent(allUsers, "", " ")
if err != nil {
return fmt.Errorf("error marshaling all users: %v", err)
}
fmt.Println(string(allUsersJSON))
} else {
// For single page requests, just read and print
d, err := io.ReadAll(resp.Body)
if err != nil {
return err
}
utils.PrettyPrintByte(d)
}
utils.PrettyPrintByte(d)
// cmd.Println(string(d))

return nil
},
}

cmd.Flags().StringVarP(&ListUsersq, "q", "", "", "Finds a user that matches firstName, lastName, and email properties")
cmd.Flags().StringVarP(&ListUsersafter, "after", "", "", "The cursor to use for pagination")
cmd.Flags().Int32VarP(&ListUserslimit, "limit", "", 0, "Specifies the number of results returned")
cmd.Flags().StringVarP(&ListUserssearch, "search", "", "", "Searches for users with a supported filtering expression")
cmd.Flags().StringVarP(&ListUserssortBy, "sort-by", "", "", "Sort by property")
cmd.Flags().StringVarP(&ListUserssortOrder, "sort-order", "", "", "Sort order (asc/desc)")
cmd.Flags().BoolVarP(&ListUsersgetAll, "all", "", false, "Fetch all users across all pages (use with caution for large datasets)")

return cmd
}

Expand Down