Fix Failing Update Client Tests

Signed-off-by: rodneyosodo <blackd0t@protonmail.com>
absmach · Apr 13, 2023 · 70c9a0f · 70c9a0f
1 parent d2c8a3b
commit 70c9a0f
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 13 deletions.
diff --git a/users/clients/api/endpoints.go b/users/clients/api/endpoints.go
@@ -151,7 +151,7 @@ func updateClientTagsEndpoint(svc clients.Service) endpoint.Endpoint {
 
 func updateClientIdentityEndpoint(svc clients.Service) endpoint.Endpoint {
 	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(updateClientCredentialsReq)
+		req := request.(updateClientIdentityReq)
 		if err := req.validate(); err != nil {
 			return nil, err
 		}
@@ -209,7 +209,7 @@ func passwordResetEndpoint(svc clients.Service) endpoint.Endpoint {
 
 func updateClientSecretEndpoint(svc clients.Service) endpoint.Endpoint {
 	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(updateClientCredentialsReq)
+		req := request.(updateClientSecretReq)
 		if err := req.validate(); err != nil {
 			return nil, err
 		}

diff --git a/users/clients/api/requests.go b/users/clients/api/requests.go
@@ -134,15 +134,13 @@ func (req updateClientOwnerReq) validate() error {
 	return nil
 }
 
-type updateClientCredentialsReq struct {
-	token     string
-	id        string
-	Identity  string `json:"identity,omitempty"`
-	OldSecret string `json:"old_secret,omitempty"`
-	NewSecret string `json:"new_secret,omitempty"`
+type updateClientIdentityReq struct {
+	token    string
+	id       string
+	Identity string `json:"identity,omitempty"`
 }
 
-func (req updateClientCredentialsReq) validate() error {
+func (req updateClientIdentityReq) validate() error {
 	if req.token == "" {
 		return apiutil.ErrBearerToken
 	}
@@ -152,6 +150,19 @@ func (req updateClientCredentialsReq) validate() error {
 	return nil
 }
 
+type updateClientSecretReq struct {
+	token     string
+	OldSecret string `json:"old_secret,omitempty"`
+	NewSecret string `json:"new_secret,omitempty"`
+}
+
+func (req updateClientSecretReq) validate() error {
+	if req.token == "" {
+		return apiutil.ErrBearerToken
+	}
+	return nil
+}
+
 type changeClientStatusReq struct {
 	token string
 	id    string

diff --git a/users/clients/api/transport.go b/users/clients/api/transport.go
@@ -61,7 +61,7 @@ func MakeClientsHandler(svc clients.Service, mux *bone.Mux, logger mflog.Logger)
 
 	mux.Patch("/users/secret", kithttp.NewServer(
 		otelkit.EndpointMiddleware(otelkit.WithOperation("update_client_secret"))(updateClientSecretEndpoint(svc)),
-		decodeUpdateClientCredentials,
+		decodeUpdateClientSecret,
 		api.EncodeResponse,
 		opts...,
 	))
@@ -82,7 +82,7 @@ func MakeClientsHandler(svc clients.Service, mux *bone.Mux, logger mflog.Logger)
 
 	mux.Patch("/users/:id/identity", kithttp.NewServer(
 		otelkit.EndpointMiddleware(otelkit.WithOperation("update_client_identity"))(updateClientIdentityEndpoint(svc)),
-		decodeUpdateClientCredentials,
+		decodeUpdateClientIdentity,
 		api.EncodeResponse,
 		opts...,
 	))
@@ -254,11 +254,11 @@ func decodeUpdateClientTags(_ context.Context, r *http.Request) (interface{}, er
 	return req, nil
 }
 
-func decodeUpdateClientCredentials(_ context.Context, r *http.Request) (interface{}, error) {
+func decodeUpdateClientIdentity(_ context.Context, r *http.Request) (interface{}, error) {
 	if !strings.Contains(r.Header.Get("Content-Type"), api.ContentType) {
 		return nil, errors.ErrUnsupportedContentType
 	}
-	req := updateClientCredentialsReq{
+	req := updateClientIdentityReq{
 		token: apiutil.ExtractBearerToken(r),
 		id:    bone.GetValue(r, "id"),
 	}
@@ -269,6 +269,20 @@ func decodeUpdateClientCredentials(_ context.Context, r *http.Request) (interfac
 	return req, nil
 }
 
+func decodeUpdateClientSecret(_ context.Context, r *http.Request) (interface{}, error) {
+	if !strings.Contains(r.Header.Get("Content-Type"), api.ContentType) {
+		return nil, errors.ErrUnsupportedContentType
+	}
+	req := updateClientSecretReq{
+		token: apiutil.ExtractBearerToken(r),
+	}
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		return nil, errors.Wrap(errors.ErrMalformedEntity, err)
+	}
+
+	return req, nil
+}
+
 func decodePasswordResetRequest(_ context.Context, r *http.Request) (interface{}, error) {
 	if !strings.Contains(r.Header.Get("Content-Type"), api.ContentType) {
 		return nil, errors.ErrUnsupportedContentType