Merge pull request #602 from kinvolk/minor-fixes

Backend: Allow accessing resources via API using ProductID
flatcar · May 30, 2022 · eaa4ce0 · eaa4ce0
2 parents 7c93b50 + 2f543fe
commit eaa4ce0
Show file tree

Hide file tree

Showing 26 changed files with 1,465 additions and 704 deletions.
diff --git a/backend/api/spec.yaml b/backend/api/spec.yaml
diff --git a/backend/pkg/api/applications.go b/backend/pkg/api/applications.go
@@ -186,12 +186,8 @@ func (api *API) UpdateApp(app *Application) error {
 
 // DeleteApp removes the application identified by the id provided.
 func (api *API) DeleteApp(appID string) error {
-	realAppID, err := api.GetAppID(appID)
-	if err != nil {
-		return err
-	}
 
-	query, _, err := goqu.Delete("application").Where(goqu.C("id").Eq(realAppID)).ToSQL()
+	query, _, err := goqu.Delete("application").Where(goqu.C("id").Eq(appID)).ToSQL()
 	if err != nil {
 		return err
 	}
@@ -213,14 +209,10 @@ func (api *API) DeleteApp(appID string) error {
 
 // GetApp returns the application identified by the id provided.
 func (api *API) GetApp(appID string) (*Application, error) {
-	realAppID, err := api.GetAppID(appID)
-	if err != nil {
-		return nil, err
-	}
 
 	var app Application
 	query, _, err := goqu.From("application").
-		Where(goqu.C("id").Eq(realAppID)).ToSQL()
+		Where(goqu.C("id").Eq(appID)).ToSQL()
 	if err != nil {
 		return nil, err
 	}

diff --git a/backend/pkg/api/applications_test.go b/backend/pkg/api/applications_test.go
@@ -178,7 +178,10 @@ func TestGetApp(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, tApp1.Name, app.Name)
 
-	app, err = a.GetApp(*tApp1.ProductID.Ptr())
+	appID, err := a.GetAppID(*tApp1.ProductID.Ptr())
+	assert.NoError(t, err)
+
+	app, err = a.GetApp(appID)
 	assert.NoError(t, err)
 	assert.Equal(t, tApp1.ProductID, app.ProductID)
 

diff --git a/backend/pkg/api/bindata.go b/backend/pkg/api/bindata.go
diff --git a/backend/pkg/api/db/sample_data.sql b/backend/pkg/api/db/sample_data.sql
@@ -35,7 +35,7 @@ insert into flatcar_action values ('748df5fc-12a5-4dad-a71e-465cc1668048', 'post
 insert into flatcar_action values ('9cd474c5-efa3-4989-9992-58ddb852ed84', 'postinstall', '', '1S9zQCLGjmefYnE/aFcpCjL1NsguHhQGj0UCm5f0M98=', false, false, true, '', '', '', '2019-09-10 23:11:10.913778', '284d295b-518f-4d67-999e-94968d0eed90');
 
 -- Sample application 1
-insert into application (id, name, description, team_id) values ('b6458005-8f40-4627-b33b-be70a718c48e', 'Sample application', 'Just an application to show the capabilities of Nebraska', 'd89342dc-9214-441d-a4af-bdd837a3b239');
+insert into application (id, name, description, team_id, product_id) values ('b6458005-8f40-4627-b33b-be70a718c48e', 'Sample application', 'Just an application to show the capabilities of Nebraska', 'd89342dc-9214-441d-a4af-bdd837a3b239','io.kinvolk.sample');
 insert into package (id, type, url, filename, version, application_id, arch) values ('5195d5a2-5f82-11e5-9d70-feff819cdc9f', 4, 'https://www.kinvolk.io/', 'test_1.0.2', '1.0.2', 'b6458005-8f40-4627-b33b-be70a718c48e', 1);
 insert into package (id, type, url, filename, version, application_id, arch) values ('12697fa4-5f83-11e5-9d70-feff819cdc9f', 4, 'https://www.kinvolk.io/', 'test_1.0.3', '1.0.3', 'b6458005-8f40-4627-b33b-be70a718c48e', 1);
 insert into package (id, type, url, filename, version, application_id, arch) values ('8004bad8-5f97-11e5-9d70-feff819cdc9f', 4, 'https://www.kinvolk.io/', 'test_1.0.4', '1.0.4', 'b6458005-8f40-4627-b33b-be70a718c48e', 1);

diff --git a/backend/pkg/auth/oidc.go b/backend/pkg/auth/oidc.go
@@ -17,6 +17,7 @@ import (
 	"github.com/tidwall/gjson"
 	"golang.org/x/oauth2"
 
+	"github.com/kinvolk/nebraska/backend/pkg/codegen"
 	"github.com/kinvolk/nebraska/backend/pkg/sessions"
 	echosessions "github.com/kinvolk/nebraska/backend/pkg/sessions/echo"
 )
@@ -326,9 +327,7 @@ func (oa *oidcAuth) LoginToken(c echo.Context) error {
 	session.Set("username", oidcToken.Subject)
 	sessionSave(c, session, "login_token")
 
-	return c.JSON(http.StatusOK, map[string]string{
-		"token": oidcTokenResp.AccessToken,
-	})
+	return c.JSON(http.StatusOK, codegen.LoginToken{Token: oidcTokenResp.AccessToken})
 }
 
 // tokenFromRequest extracts token from request header. If Authorization header is not present returns id_token query param .

diff --git a/backend/pkg/codegen/client.gen.go b/backend/pkg/codegen/client.gen.go
diff --git a/backend/pkg/codegen/server.gen.go b/backend/pkg/codegen/server.gen.go
diff --git a/backend/pkg/codegen/spec.gen.go b/backend/pkg/codegen/spec.gen.go
diff --git a/backend/pkg/codegen/types.gen.go b/backend/pkg/codegen/types.gen.go
diff --git a/backend/pkg/handler/activity.go b/backend/pkg/handler/activity.go
@@ -23,8 +23,12 @@ func (h *Handler) PaginateActivity(ctx echo.Context, params codegen.PaginateActi
 	}
 
 	var p api.ActivityQueryParams
-	if params.AppID != nil {
-		p.AppID = *params.AppID
+	if params.AppIDorProductID != nil {
+		appID, err := h.db.GetAppID(*params.AppIDorProductID)
+		if err != nil {
+			return appNotFoundResponse(ctx, *params.AppIDorProductID)
+		}
+		p.AppID = appID
 	}
 	if params.GroupID != nil {
 		p.GroupID = *params.GroupID