From fd848b1e154bdbfc27aab448d888d2c16cc22530 Mon Sep 17 00:00:00 2001
From: Akhilesh Pandey <akhilesh.pandey@harness.io>
Date: Fri, 18 Oct 2024 14:16:16 +0000
Subject: [PATCH] feat: [CODE-2318]: Update error message in case of forbidden
 (#2780)

* feat: [CODE-2318]: update error logic to be translate in controller
* Merge branch 'main' into akp/CODE-2318
* feat: [CODE-2318]: update error logic to be translate in controller
* feat: [CODE-2318]: remove nested error handling
* feat: [CODE-2318]: Update error message in case of forbidden
---
 app/api/controller/principal/search.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/api/controller/principal/search.go b/app/api/controller/principal/search.go
index 101c2c630..a010a785c 100644
--- a/app/api/controller/principal/search.go
+++ b/app/api/controller/principal/search.go
@@ -16,6 +16,7 @@ package principal
 
 import (
 	"context"
+	"errors"
 	"net/http"
 
 	apiauth "github.com/harness/gitness/app/api/auth"
@@ -41,7 +42,7 @@ func (c controller) List(
 		)
 	}
 
-	if err := apiauth.Check(
+	err := apiauth.Check(
 		ctx,
 		c.authorizer,
 		session,
@@ -50,7 +51,14 @@ func (c controller) List(
 			Type: enum.ResourceTypeUser,
 		},
 		enum.PermissionUserView,
-	); err != nil {
+	)
+	if errors.Is(err, apiauth.ErrNotAuthorized) {
+		return nil, usererror.Forbidden(
+			"You lack the permission to list users. " +
+				"Please grant User view permission at the account level.",
+		)
+	}
+	if err != nil {
 		return nil, err
 	}