fix: paginate application list and reuse existing API keys (#208)

Author: LorrisSaintGenez

api/dashboard/client.go

@@ -204,39 +204,50 @@ func (c *Client) RevokeToken(token string) error {
 	return nil
 }
 
-// ListApplications returns all applications for the authenticated user.
+// ListApplications returns all applications for the authenticated user,
+// following pagination to fetch every page.
 func (c *Client) ListApplications(accessToken string) ([]Application, error) {
-	req, err := http.NewRequest(http.MethodGet, c.APIURL+"/1/applications", nil)
-	if err != nil {
-		return nil, err
-	}
-	c.setAPIHeaders(req, accessToken)
+	var allApps []Application
+	page := 1
+
+	for {
+		endpoint := fmt.Sprintf("%s/1/applications?page=%d", c.APIURL, page)
+		req, err := http.NewRequest(http.MethodGet, endpoint, nil)
+		if err != nil {
+			return nil, err
+		}
+		c.setAPIHeaders(req, accessToken)
 
-	resp, err := c.client.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("list applications request failed: %w", err)
-	}
-	defer resp.Body.Close()
+		resp, err := c.client.Do(req)
+		if err != nil {
+			return nil, fmt.Errorf("list applications request failed: %w", err)
+		}
+		defer resp.Body.Close()
 
-	if resp.StatusCode == http.StatusUnauthorized {
-		return nil, ErrSessionExpired
-	}
+		if resp.StatusCode == http.StatusUnauthorized {
+			return nil, ErrSessionExpired
+		}
 
-	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("list applications failed with status: %d", resp.StatusCode)
-	}
+		if resp.StatusCode != http.StatusOK {
+			return nil, fmt.Errorf("list applications failed with status: %d", resp.StatusCode)
+		}
 
-	var appsResp ApplicationsResponse
-	if err := json.NewDecoder(resp.Body).Decode(&appsResp); err != nil {
-		return nil, fmt.Errorf("failed to parse applications response: %w", err)
-	}
+		var appsResp ApplicationsResponse
+		if err := json.NewDecoder(resp.Body).Decode(&appsResp); err != nil {
+			return nil, fmt.Errorf("failed to parse applications response: %w", err)
+		}
 
-	apps := make([]Application, len(appsResp.Data))
-	for i := range appsResp.Data {
-		apps[i] = appsResp.Data[i].toApplication()
+		for i := range appsResp.Data {
+			allApps = append(allApps, appsResp.Data[i].toApplication())
+		}
+
+		if appsResp.Meta.CurrentPage >= appsResp.Meta.TotalPages {
+			break
+		}
+		page++
 	}
 
-	return apps, nil
+	return allApps, nil
 }
 
 // GetApplication returns a single application by its ID.

api/dashboard/client_test.go

@@ -133,6 +133,45 @@ func TestListApplications_Success(t *testing.T) {
 	assert.Equal(t, "APP1", apps[0].ID)
 }
 
+func TestListApplications_Paginated(t *testing.T) {
+	mux := http.NewServeMux()
+	callCount := 0
+
+	mux.HandleFunc("/1/applications", func(w http.ResponseWriter, r *http.Request) {
+		callCount++
+		page := r.URL.Query().Get("page")
+
+		switch page {
+		case "2":
+			require.NoError(t, json.NewEncoder(w).Encode(ApplicationsResponse{
+				Data: []ApplicationResource{
+					{ID: "APP3", Type: "application", Attributes: ApplicationAttributes{ApplicationID: "APP3", Name: "Third App"}},
+				},
+				Meta: PaginationMeta{TotalCount: 3, PerPage: 2, CurrentPage: 2, TotalPages: 2},
+			}))
+		default:
+			require.NoError(t, json.NewEncoder(w).Encode(ApplicationsResponse{
+				Data: []ApplicationResource{
+					{ID: "APP1", Type: "application", Attributes: ApplicationAttributes{ApplicationID: "APP1", Name: "First App"}},
+					{ID: "APP2", Type: "application", Attributes: ApplicationAttributes{ApplicationID: "APP2", Name: "Second App"}},
+				},
+				Meta: PaginationMeta{TotalCount: 3, PerPage: 2, CurrentPage: 1, TotalPages: 2},
+			}))
+		}
+	})
+
+	ts, client := newTestClient(mux)
+	defer ts.Close()
+
+	apps, err := client.ListApplications("test-token")
+	require.NoError(t, err)
+	assert.Len(t, apps, 3)
+	assert.Equal(t, "APP1", apps[0].ID)
+	assert.Equal(t, "APP2", apps[1].ID)
+	assert.Equal(t, "APP3", apps[2].ID)
+	assert.Equal(t, 2, callCount)
+}
+
 func TestListApplications_Unauthorized(t *testing.T) {
 	mux := http.NewServeMux()
 	mux.HandleFunc("/1/applications", func(w http.ResponseWriter, r *http.Request) {

api/dashboard/types.go

@@ -42,9 +42,27 @@ type Application struct {
 	APIKey string `json:"api_key,omitempty"`
 }
 
+// PaginationMeta contains page-based pagination metadata.
+type PaginationMeta struct {
+	TotalCount  int `json:"total_count"`
+	PerPage     int `json:"per_page"`
+	CurrentPage int `json:"current_page"`
+	TotalPages  int `json:"total_pages"`
+}
+
+// PaginationLinks contains pagination URLs.
+type PaginationLinks struct {
+	First string `json:"first"`
+	Last  string `json:"last"`
+	Prev  string `json:"prev"`
+	Next  string `json:"next"`
+}
+
 // ApplicationsResponse is the JSON:API response from GET /1/applications.
 type ApplicationsResponse struct {
-	Data []ApplicationResource `json:"data"`
+	Data  []ApplicationResource `json:"data"`
+	Meta  PaginationMeta        `json:"meta"`
+	Links PaginationLinks       `json:"links"`
 }
 
 // SingleApplicationResponse is the JSON:API response from GET /1/application/:id.

pkg/cmd/auth/login/login.go

@@ -123,8 +123,10 @@ func RunOAuthFlow(opts *LoginOptions, signup bool) error {
 		}
 
 		appDetails = app
-		if err := apputil.EnsureAPIKey(opts.IO, client, accessToken, appDetails); err != nil {
-			return err
+		if !reuseExistingAPIKey(opts.Config, appDetails) {
+			if err := apputil.EnsureAPIKey(opts.IO, client, accessToken, appDetails); err != nil {
+				return err
+			}
 		}
 	}
 
@@ -136,6 +138,18 @@ func RunOAuthFlow(opts *LoginOptions, signup bool) error {
 	return apputil.ConfigureProfile(opts.IO, opts.Config, appDetails, profileName, opts.Default)
 }
 
+// reuseExistingAPIKey checks if a local profile already has an API key for
+// the given application. If so, it sets app.APIKey and returns true.
+func reuseExistingAPIKey(cfg config.IConfig, app *dashboard.Application) bool {
+	for _, p := range cfg.ConfiguredProfiles() {
+		if p.ApplicationID == app.ID && p.APIKey != "" {
+			app.APIKey = p.APIKey
+			return true
+		}
+	}
+	return false
+}
+
 func selectApplication(opts *LoginOptions, apps []dashboard.Application, interactive bool) (*dashboard.Application, error) {
 	if opts.AppName != "" {
 		for i := range apps {