update tests

solo-io · Nov 19, 2024 · cd35cd3 · cd35cd3
1 parent e1d6821
commit cd35cd3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/internal/cognito/server/handler_test.go b/internal/cognito/server/handler_test.go
@@ -30,6 +30,7 @@ var _ = Describe("Server", func() {
 		mockCognitoClient   *mock_server.MockCognitoClient
 		ctx                 context.Context
 		applicationClientId = "client-internal-id"
+		testToken           = "test"
 	)
 
 	BeforeEach(func() {
@@ -85,6 +86,9 @@ var _ = Describe("Server", func() {
 					Body: &portalv1.CreateOAuthApplicationJSONRequestBody{
 						Id: applicationClientId,
 					},
+					Params: portalv1.CreateOAuthApplicationParams{
+						Token: &testToken,
+					},
 				})
 				Expect(err).NotTo(HaveOccurred())
 				Expect(resp).To(BeAssignableToTypeOf(portalv1.CreateOAuthApplication201JSONResponse{}))
@@ -101,10 +105,9 @@ var _ = Describe("Server", func() {
 			})
 
 			It("returns an error code on empty client id", func() {
-				token := "test"
 				resp, err := s.CreateOAuthApplication(ctx, portalv1.CreateOAuthApplicationRequestObject{
 					Params: portalv1.CreateOAuthApplicationParams{
-						Token: &token,
+						Token: &testToken,
 					},
 					Body: &portalv1.CreateOAuthApplicationJSONRequestBody{
 						Id: "",
@@ -117,6 +120,9 @@ var _ = Describe("Server", func() {
 			It("returns not found code on deletion", func() {
 				resp, err := s.DeleteOAuthApplication(ctx, portalv1.DeleteOAuthApplicationRequestObject{
 					Id: "test-client",
+					Params: portalv1.DeleteOAuthApplicationParams{
+						Token: &testToken,
+					},
 				})
 				Expect(err).NotTo(HaveOccurred())
 				Expect(resp).To(BeAssignableToTypeOf(portalv1.DeleteOAuthApplication404JSONResponse{}))
@@ -156,11 +162,10 @@ var _ = Describe("Server", func() {
 			})
 
 			It("can delete the client", func() {
-				token := "test"
 				resp, err := s.DeleteOAuthApplication(ctx, portalv1.DeleteOAuthApplicationRequestObject{
 					Id: clientId,
 					Params: portalv1.DeleteOAuthApplicationParams{
-						Token: &token,
+						Token: &testToken,
 					},
 				})
 				Expect(err).NotTo(HaveOccurred())

diff --git a/internal/keycloak/server/handler_test.go b/internal/keycloak/server/handler_test.go
@@ -39,6 +39,7 @@ var _ = Describe("Server", func() {
 			Name:   applicationClientId,
 			Secret: applicationClientSecret,
 		}
+		testToken = "test"
 	)
 
 	BeforeEach(func() {
@@ -80,6 +81,9 @@ var _ = Describe("Server", func() {
 					Body: &portalv1.CreateOAuthApplicationJSONRequestBody{
 						Id: applicationClientId,
 					},
+					Params: portalv1.CreateOAuthApplicationParams{
+						Token: &testToken,
+					},
 				})
 				Expect(err).NotTo(HaveOccurred())
 				Expect(resp).To(BeAssignableToTypeOf(portalv1.CreateOAuthApplication201JSONResponse{}))
@@ -100,6 +104,9 @@ var _ = Describe("Server", func() {
 					Body: &portalv1.CreateOAuthApplicationJSONRequestBody{
 						Id: "",
 					},
+					Params: portalv1.CreateOAuthApplicationParams{
+						Token: &testToken,
+					},
 				})
 				Expect(err).NotTo(HaveOccurred())
 				Expect(resp).To(BeAssignableToTypeOf(portalv1.CreateOAuthApplication400JSONResponse{}))
@@ -108,6 +115,9 @@ var _ = Describe("Server", func() {
 			It("returns not found code on deletion", func() {
 				resp, err := s.DeleteOAuthApplication(ctx, portalv1.DeleteOAuthApplicationRequestObject{
 					Id: "non-existing-client",
+					Params: portalv1.DeleteOAuthApplicationParams{
+						Token: &testToken,
+					},
 				})
 				Expect(err).NotTo(HaveOccurred())
 				Expect(resp).To(BeAssignableToTypeOf(portalv1.DeleteOAuthApplication404JSONResponse{}))
@@ -128,6 +138,9 @@ var _ = Describe("Server", func() {
 			It("can delete the client", func() {
 				resp, err := s.DeleteOAuthApplication(ctx, portalv1.DeleteOAuthApplicationRequestObject{
 					Id: applicationClientId,
+					Params: portalv1.DeleteOAuthApplicationParams{
+						Token: &testToken,
+					},
 				})
 				Expect(err).NotTo(HaveOccurred())
 				Expect(resp).To(BeAssignableToTypeOf(portalv1.DeleteOAuthApplication204Response{}))

diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -37,7 +37,7 @@ var _ = Describe("E2e", Ordered, func() {
 			Method:  "POST",
 			Data:    fmt.Sprintf(`{"id": "%s"}`, internalClientId),
 			App:     "curl",
-			Headers: []string{"Content-Type: application/json", "token: test"},
+			Headers: []string{"Content-Type: application/json"},
 		}
 
 		out, err := curlFromPod.Execute()
@@ -59,7 +59,6 @@ var _ = Describe("E2e", Ordered, func() {
 			Method:  "DELETE",
 			Verbose: true,
 			App:     "curl",
-			Headers: []string{"token: test"},
 		}
 
 		out, err := curlFromPod.Execute()