Paginated response

cmd/accounts/accounts_list.go

@@ -10,8 +10,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var page uint64
-var rpp uint64
+var pagination *common.Pagination
 
 var accountsListCmd = &cobra.Command{
 	Use:   "list",
@@ -23,13 +22,13 @@ var accountsListCmd = &cobra.Command{
 func listAccounts(cmd *cobra.Command, args []string) {
 	token := common.RequireAPIToken()
 	params := map[string]interface{}{
-		"page": fmt.Sprintf("%d", page),
-		"rpp":  fmt.Sprintf("%d", rpp),
+		"page": fmt.Sprintf("%d", pagination.Page),
+		"rpp":  fmt.Sprintf("%d", pagination.Rpp),
 	}
 	if common.ApplicationID != "" {
 		params["application_id"] = common.ApplicationID
 	}
-	resp, err := provide.ListAccounts(token, params)
+	results, resp, err := provide.ListAccounts(token, params)
 	if err != nil {
 		log.Printf("Failed to retrieve accounts list; %s", err.Error())
 		os.Exit(1)
@@ -38,18 +37,27 @@ func listAccounts(cmd *cobra.Command, args []string) {
 	// 	log.Printf("Failed to retrieve accounts list; received status: %d", status)
 	// 	os.Exit(1)
 	// }
-	for i := range resp {
-		account := resp[i]
+	pagination.UpdateCountsAndPrintCurrentInterval(resp.TotalCount, len(results))
+	for i := range results {
+		account := results[i]
 		result := fmt.Sprintf("%s\t%s\n", account.ID.String(), account.Address)
 		// TODO-- when account.Name exists... result = fmt.Sprintf("%s\t%s - %s\n", name, account, *account.Address)
 		fmt.Print(result)
 	}
+
+	paginationPrompt := &common.PaginationPrompt{
+		Pagination:  pagination,
+		CurrentStep: "",
+		RunPageCmd:  listAccounts,
+	}
+	common.AutoPromptPagination(cmd, args, paginationPrompt)
 }
 
 func init() {
+	pagination = &common.Pagination{}
 	accountsListCmd.Flags().StringVar(&common.ApplicationID, "application", "", "application identifier to filter accounts")
 	accountsListCmd.Flags().BoolVarP(&optional, "optional", "", false, "List all the optional flags")
 	accountsListCmd.Flags().BoolVarP(&paginate, "paginate", "", false, "List pagination flags")
-	accountsListCmd.Flags().Uint64Var(&page, "page", common.DefaultPage, "page number to retrieve")
-	accountsListCmd.Flags().Uint64Var(&rpp, "rpp", common.DefaultRpp, "number of accounts to retrieve per page")
+	accountsListCmd.Flags().IntVar(&pagination.Page, "page", common.DefaultPage, "page number to retrieve")
+	accountsListCmd.Flags().IntVar(&pagination.Rpp, "rpp", common.DefaultRpp, "number of accounts to retrieve per page")
 }

cmd/accounts/accounts_prompt.go

@@ -48,7 +48,7 @@ func generalPrompt(cmd *cobra.Command, args []string, currentStep string) {
 			fmt.Println("Optional Flags:")
 			common.RequireApplication()
 		}
-		page, rpp = common.PromptPagination(paginate, page, rpp)
+		common.PromptPagination(paginate, pagination)
 		listAccounts(cmd, args)
 	case "":
 		result := common.SelectInput(emptyPromptArgs, emptyPromptLabel)

cmd/api_tokens/api_tokens_list.go

@@ -11,8 +11,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var page uint64
-var rpp uint64
+var pagination *common.Pagination
 
 var apiTokensListCmd = &cobra.Command{
 	Use:   "list",
@@ -24,13 +23,13 @@ var apiTokensListCmd = &cobra.Command{
 func listAPITokens(cmd *cobra.Command, args []string) {
 	token := common.RequireAPIToken()
 	params := map[string]interface{}{
-		"page": fmt.Sprintf("%d", page),
-		"rpp":  fmt.Sprintf("%d", rpp),
+		"page": fmt.Sprintf("%d", pagination.Page),
+		"rpp":  fmt.Sprintf("%d", pagination.Rpp),
 	}
 	if common.ApplicationID != "" {
 		params["application_id"] = common.ApplicationID
 	}
-	resp, err := provide.ListTokens(token, params)
+	results, resp, err := provide.ListTokens(token, params)
 	if err != nil {
 		log.Printf("Failed to retrieve API tokens list; %s", err.Error())
 		os.Exit(1)
@@ -39,17 +38,26 @@ func listAPITokens(cmd *cobra.Command, args []string) {
 	// 	log.Printf("Failed to retrieve API tokens list; received status: %d", status)
 	// 	os.Exit(1)
 	// }
-	for i := range resp {
-		apiToken := resp[i]
+	pagination.UpdateCountsAndPrintCurrentInterval(resp.TotalCount, len(results))
+	for i := range results {
+		apiToken := results[i]
 		result := fmt.Sprintf("%s\t%s\n", apiToken.ID.String(), *apiToken.Token)
 		fmt.Print(result)
 	}
+
+	paginationPrompt := &common.PaginationPrompt{
+		Pagination:  pagination,
+		CurrentStep: "",
+		RunPageCmd:  listAPITokens,
+	}
+	common.AutoPromptPagination(cmd, args, paginationPrompt)
 }
 
 func init() {
+	pagination = &common.Pagination{}
 	apiTokensListCmd.Flags().StringVar(&common.ApplicationID, "application", "", "application identifier to filter API tokens")
 	apiTokensListCmd.Flags().BoolVarP(&optional, "optional", "", false, "List all the optional flags")
 	apiTokensListCmd.Flags().BoolVarP(&paginate, "paginate", "", false, "List pagination flags")
-	apiTokensListCmd.Flags().Uint64Var(&page, "page", common.DefaultPage, "page number to retrieve")
-	apiTokensListCmd.Flags().Uint64Var(&rpp, "rpp", common.DefaultRpp, "number of API tokens to retrieve per page")
+	apiTokensListCmd.Flags().IntVar(&pagination.Page, "page", common.DefaultPage, "page number to retrieve")
+	apiTokensListCmd.Flags().IntVar(&pagination.Rpp, "rpp", common.DefaultRpp, "number of API tokens to retrieve per page")
 }

cmd/api_tokens/api_tokens_prompt.go

@@ -47,7 +47,7 @@ func generalPrompt(cmd *cobra.Command, args []string, currentStep string) {
 		if optional {
 			common.RequireApplication()
 		}
-		page, rpp = common.PromptPagination(paginate, page, rpp)
+		common.PromptPagination(paginate, pagination)
 		listAPITokens(cmd, args)
 	case "":
 		result := common.SelectInput(emptyPromptArgs, emptyPromptLabel)

cmd/applications/application_prompt.go

@@ -56,7 +56,7 @@ func generalPrompt(cmd *cobra.Command, args []string, step string) {
 		common.RequireApplication()
 		fetchApplicationDetails(cmd, args)
 	case promptStepList:
-		page, rpp = common.PromptPagination(paginate, page, rpp)
+		common.PromptPagination(paginate, pagination)
 		listApplications(cmd, args)
 	case "":
 		result := common.SelectInput(emptyPromptArgs, emptyPromptLabel)

cmd/applications/applications_list.go

@@ -11,8 +11,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var page uint64
-var rpp uint64
+var pagination *common.Pagination
 
 var applicationsListCmd = &cobra.Command{
 	Use:   "list",
@@ -24,23 +23,32 @@ var applicationsListCmd = &cobra.Command{
 func listApplications(cmd *cobra.Command, args []string) {
 	token := common.RequireAPIToken()
 	params := map[string]interface{}{
-		"page": fmt.Sprintf("%d", page),
-		"rpp":  fmt.Sprintf("%d", rpp),
+		"page": fmt.Sprintf("%d", pagination.Page),
+		"rpp":  fmt.Sprintf("%d", pagination.Rpp),
 	}
-	applications, err := provide.ListApplications(token, params)
+	applications, resp, err := provide.ListApplications(token, params)
 	if err != nil {
 		log.Printf("Failed to retrieve applications list; %s", err.Error())
 		os.Exit(1)
 	}
+	pagination.UpdateCountsAndPrintCurrentInterval(resp.TotalCount, len(applications))
 	for i := range applications {
 		application := applications[i]
 		result := fmt.Sprintf("%s\t%s\n", application.ID.String(), *application.Name)
 		fmt.Print(result)
 	}
+
+	paginationPrompt := &common.PaginationPrompt{
+		Pagination:  pagination,
+		CurrentStep: "",
+		RunPageCmd:  listApplications,
+	}
+	common.AutoPromptPagination(cmd, args, paginationPrompt)
 }
 
 func init() {
-	applicationsListCmd.Flags().Uint64Var(&page, "page", common.DefaultPage, "page number to retrieve")
-	applicationsListCmd.Flags().Uint64Var(&rpp, "rpp", common.DefaultRpp, "number of applications to retrieve per page")
+	pagination = &common.Pagination{}
+	applicationsListCmd.Flags().IntVar(&pagination.Page, "page", common.DefaultPage, "page number to retrieve")
+	applicationsListCmd.Flags().IntVar(&pagination.Rpp, "rpp", common.DefaultRpp, "number of applications to retrieve per page")
 	applicationsListCmd.Flags().BoolVarP(&paginate, "paginate", "", false, "List pagination flags")
 }

cmd/baseline/participants/participants.go

@@ -20,5 +20,4 @@ func init() {
 	ParticipantsCmd.AddCommand(inviteBaselineWorkgroupParticipantCmd)
 	ParticipantsCmd.AddCommand(listBaselineWorkgroupParticipantsCmd)
 	ParticipantsCmd.Flags().BoolVarP(&Optional, "Optional", "", false, "List all the Optional flags")
-	ParticipantsCmd.Flags().BoolVarP(&paginate, "paginate", "", false, "List pagination flags")
 }

cmd/baseline/participants/participants_invite.go

@@ -27,7 +27,6 @@ var invitorAddress string
 var registryContractAddress string
 var managedTenant bool
 var Optional bool
-var paginate bool
 
 var inviteBaselineWorkgroupParticipantCmd = &cobra.Command{
 	Use:   "invite",
@@ -52,23 +51,23 @@ func inviteParticipantRun(cmd *cobra.Command, args []string) {
 	common.AuthorizeApplicationContext()
 	common.AuthorizeOrganizationContext(false)
 
-	vaults, err := vault.ListVaults(common.OrganizationAccessToken, map[string]interface{}{
+	vaults, _, err := vault.ListVaults(common.OrganizationAccessToken, map[string]interface{}{
 		"organization_id": common.OrganizationID,
 	})
 	if err != nil {
 		log.Printf("failed to resolve vault for organization; %s", err.Error())
 		os.Exit(1)
 	}
 
-	keys, err := vault.ListKeys(common.OrganizationAccessToken, vaults[0].ID.String(), map[string]interface{}{
+	keys, _, err := vault.ListKeys(common.OrganizationAccessToken, vaults[0].ID.String(), map[string]interface{}{
 		"spec": "secp256k1",
 	})
 	if err != nil {
 		log.Printf("failed to resolve secp256k1 key for organization; %s", err.Error())
 		os.Exit(1)
 	}
 
-	contracts, _ := nchain.ListContracts(common.ApplicationAccessToken, map[string]interface{}{
+	contracts, _, _ := nchain.ListContracts(common.ApplicationAccessToken, map[string]interface{}{
 		"type": "organization-registry",
 	})
 	if err != nil {
@@ -115,7 +114,7 @@ func inviteParticipantRun(cmd *cobra.Command, args []string) {
 }
 
 func vendJWT(vaultID string, params map[string]interface{}) string {
-	keys, err := vault.ListKeys(common.OrganizationAccessToken, vaultID, map[string]interface{}{
+	keys, _, err := vault.ListKeys(common.OrganizationAccessToken, vaultID, map[string]interface{}{
 		"spec": "RSA-4096",
 	})
 	if err != nil {

cmd/baseline/participants/participants_list.go

@@ -10,9 +10,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var page uint64
-var rpp uint64
-
 var listBaselineWorkgroupParticipantsCmd = &cobra.Command{
 	Use:   "list",
 	Short: "List workgroup participants",
@@ -28,17 +25,15 @@ func listParticipantsRun(cmd *cobra.Command, args []string) {
 	common.AuthorizeApplicationContext()
 	common.AuthorizeOrganizationContext(false)
 
-	participants, err := ident.ListApplicationOrganizations(common.OrganizationAccessToken, common.ApplicationID, map[string]interface{}{
+	participants, _, err := ident.ListApplicationOrganizations(common.OrganizationAccessToken, common.ApplicationID, map[string]interface{}{
 		"type": "baseline",
-		"page": fmt.Sprintf("%d", page),
-		"rpp":  fmt.Sprintf("%d", rpp),
 	})
 	if err != nil {
 		log.Printf("failed to retrieve baseline workgroup participants; %s", err.Error())
 		os.Exit(1)
 	}
 
-	invitations, err := ident.ListApplicationInvitations(common.ApplicationAccessToken, common.ApplicationID, map[string]interface{}{})
+	invitations, _, err := ident.ListApplicationInvitations(common.ApplicationAccessToken, common.ApplicationID, map[string]interface{}{})
 	if err != nil {
 		// log.Printf("failed to retrieve invited baseline workgroup participants; %s", err.Error())
 		// os.Exit(1)
@@ -78,7 +73,4 @@ func listParticipantsRun(cmd *cobra.Command, args []string) {
 func init() {
 	listBaselineWorkgroupParticipantsCmd.Flags().StringVar(&common.ApplicationID, "workgroup", "", "workgroup identifier")
 	listBaselineWorkgroupParticipantsCmd.Flags().BoolVarP(&Optional, "Optional", "", false, "List all the Optional flags")
-	listBaselineWorkgroupParticipantsCmd.Flags().BoolVarP(&paginate, "paginate", "", false, "List pagination flags")
-	listBaselineWorkgroupParticipantsCmd.Flags().Uint64Var(&page, "page", common.DefaultPage, "page number to retrieve")
-	listBaselineWorkgroupParticipantsCmd.Flags().Uint64Var(&rpp, "rpp", common.DefaultRpp, "number of participants to retrieve per page")
 }

cmd/baseline/participants/participants_prompt.go

@@ -51,7 +51,6 @@ func generalPrompt(cmd *cobra.Command, args []string, step string) {
 				common.RequireApplication()
 			}
 		}
-		page, rpp = common.PromptPagination(paginate, page, rpp)
 		listParticipantsRun(cmd, args)
 	case "":
 		result := common.SelectInput(emptyPromptArgs, emptyPromptLabel)

cmd/baseline/stack/stack_start.go

@@ -442,7 +442,7 @@ func authorizeWorkgroupContext() {
 		os.Exit(1)
 	}
 
-	contracts, err := nchain.ListContracts(workgroupAccessToken, map[string]interface{}{
+	contracts, _, err := nchain.ListContracts(workgroupAccessToken, map[string]interface{}{
 		"type": "organization-registry",
 	})
 	if err != nil {
@@ -553,7 +553,7 @@ func applyFlags() {
 
 	// HACK
 	if jwtSignerPublicKey == "" {
-		keys, err := vault.ListKeys(common.OrganizationAccessToken, common.VaultID, map[string]interface{}{
+		keys, _, err := vault.ListKeys(common.OrganizationAccessToken, common.VaultID, map[string]interface{}{
 			"spec": "RSA-4096",
 		})
 		if err != nil {

cmd/baseline/workflows/messages/send.go

@@ -53,7 +53,7 @@ func sendMessageRun(cmd *cobra.Command, args []string) {
 	if recipients != "" {
 		_recipients := make([]*baseline.Participant, 0)
 		for _, id := range strings.Split(recipients, ",") {
-			orgs, err := ident.ListApplicationOrganizations(common.ApplicationAccessToken, common.ApplicationID, map[string]interface{}{
+			orgs, _, err := ident.ListApplicationOrganizations(common.ApplicationAccessToken, common.ApplicationID, map[string]interface{}{
 				"organization_id": id,
 			})
 			if err != nil {

cmd/baseline/workgroups/workgroup_list.go

@@ -10,8 +10,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var page uint64
-var rpp uint64
+var pagination *common.Pagination
 
 var listBaselineWorkgroupsCmd = &cobra.Command{
 	Use:   "list",
@@ -26,24 +25,33 @@ func listWorkgroups(cmd *cobra.Command, args []string) {
 
 func listWorkgroupsRun(cmd *cobra.Command, args []string) {
 	token := common.RequireAPIToken()
-	applications, err := ident.ListApplications(token, map[string]interface{}{
+	applications, resp, err := ident.ListApplications(token, map[string]interface{}{
 		"type": "baseline",
-		"page": fmt.Sprintf("%d", page),
-		"rpp":  fmt.Sprintf("%d", rpp),
+		"page": fmt.Sprintf("%d", pagination.Page),
+		"rpp":  fmt.Sprintf("%d", pagination.Rpp),
 	})
 	if err != nil {
 		log.Printf("failed to retrieve baseline workgroups; %s", err.Error())
 		os.Exit(1)
 	}
+	pagination.UpdateCountsAndPrintCurrentInterval(resp.TotalCount, len(applications))
 	for i := range applications {
 		workgroup := applications[i]
 		result := fmt.Sprintf("%s\t%s\n", workgroup.ID.String(), *workgroup.Name)
 		fmt.Print(result)
 	}
+
+	paginationPrompt := &common.PaginationPrompt{
+		Pagination:  pagination,
+		CurrentStep: "",
+		RunPageCmd:  listWorkgroupsRun,
+	}
+	common.AutoPromptPagination(cmd, args, paginationPrompt)
 }
 
 func init() {
-	listBaselineWorkgroupsCmd.Flags().Uint64Var(&page, "page", common.DefaultPage, "page number to retrieve")
-	listBaselineWorkgroupsCmd.Flags().Uint64Var(&rpp, "rpp", common.DefaultRpp, "number of baseline workgroups to retrieve per page")
+	pagination = &common.Pagination{}
+	listBaselineWorkgroupsCmd.Flags().IntVar(&pagination.Page, "page", common.DefaultPage, "page number to retrieve")
+	listBaselineWorkgroupsCmd.Flags().IntVar(&pagination.Rpp, "rpp", common.DefaultRpp, "number of baseline workgroups to retrieve per page")
 	listBaselineWorkgroupsCmd.Flags().BoolVarP(&paginate, "paginate", "", false, "List pagination flags")
 }

cmd/baseline/workgroups/workgroups_prompt.go

@@ -36,7 +36,7 @@ func generalPrompt(cmd *cobra.Command, args []string, step string) {
 		}
 		initWorkgroupRun(cmd, args)
 	case promptStepList:
-		page, rpp = common.PromptPagination(paginate, page, rpp)
+		common.PromptPagination(paginate, pagination)
 		listWorkgroupsRun(cmd, args)
 	case promptStepJoin:
 		if Optional {