fix(api): replace raw error responses with generic ErrInternalServerError by rohilsurana · Pull Request #1620 · raystack/frontier · GitHub
Skip to content

fix(api): replace raw error responses with generic ErrInternalServerError #1620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rohilsurana merged 6 commits into from
May 18, 2026
Merged

fix(api): replace raw error responses with generic ErrInternalServerError #1620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b151a9
fix(api): replace raw error responses with generic ErrInternalServerE…
rohilsurana May 15, 2026
0eabfed
fix(api): add missing error log in GetLoggedInPrincipal default case
rohilsurana May 16, 2026
493a03e
fix(api): use errorLogger.LogUnexpectedError in GetLoggedInPrincipal
rohilsurana May 16, 2026
fc0c33b
fix(api): move errorLogger init to start of GetLoggedInPrincipal
rohilsurana May 16, 2026
2ef3c84
fix(api): update tests to expect generic error message instead of raw…
rohilsurana May 16, 2026
caabb7f
fix(api): replace grpc status.Error with connect.NewError and remove …
rohilsurana May 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions internal/api/v1beta1connect/authenticate.go
View file
Open in desktop
11 changes: 3 additions & 8 deletions internal/api/v1beta1connect/authenticate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,9 @@ func TestConnectHandler_AuthToken_ServiceUser(t *testing.T) {
if tt.wantErr {
assert.Error(t, err)
if tt.expectedErr != nil {
if tt.expectedErr == organization.ErrDisabled {
connectErr := err.(*connect.Error)
assert.Equal(t, connect.CodeInternal, connectErr.Code())
assert.Contains(t, connectErr.Message(), "org is disabled")
} else {
connectErr := err.(*connect.Error)
assert.Equal(t, connect.CodeInternal, connectErr.Code())
}
connectErr := err.(*connect.Error)
assert.Equal(t, connect.CodeInternal, connectErr.Code())
assert.Equal(t, "internal server error", connectErr.Message())
}
assert.Nil(t, resp)
} else {
Expand Down
4 changes: 2 additions & 2 deletions internal/api/v1beta1connect/authorize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func (h *ConnectHandler) IsSuperUser(ctx context.Context, request connect.AnyReq
errorLogger.LogUnexpectedError(ctx, request, "IsSuperUser", err,
"user_id", currentUser.ID,
"permission", schema.PlatformSudoPermission)
return connect.NewError(connect.CodeInternal, err)
return connect.NewError(connect.CodeInternal, ErrInternalServerError)
} else if ok {
return nil
}
Expand All @@ -124,7 +124,7 @@ func (h *ConnectHandler) IsSuperUser(ctx context.Context, request connect.AnyReq
errorLogger.LogUnexpectedError(ctx, request, "IsSuperUser", err,
"service_user_id", currentUser.ID,
"permission", schema.PlatformSudoPermission)
return connect.NewError(connect.CodeInternal, err)
return connect.NewError(connect.CodeInternal, ErrInternalServerError)
} else if ok {
return nil
}
Expand Down
6 changes: 3 additions & 3 deletions internal/api/v1beta1connect/kyc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func (h *ConnectHandler) SetOrganizationKyc(ctx context.Context, request *connec
"org_id", request.Msg.GetOrgId(),
"status", request.Msg.GetStatus(),
"link", request.Msg.GetLink())
return nil, connect.NewError(connect.CodeInternal, err)
return nil, connect.NewError(connect.CodeInternal, ErrInternalServerError)
}
}

Expand Down Expand Up @@ -63,7 +63,7 @@ func (h *ConnectHandler) GetOrganizationKyc(ctx context.Context, request *connec
default:
errorLogger.LogServiceError(ctx, request, "GetOrganizationKyc.GetKyc", err,
"org_id", request.Msg.GetOrgId())
return nil, connect.NewError(connect.CodeInternal, err)
return nil, connect.NewError(connect.CodeInternal, ErrInternalServerError)
}
}
return connect.NewResponse(&frontierv1beta1.GetOrganizationKycResponse{OrganizationKyc: transformOrgKycToPB(orgKyc)}), nil
Expand All @@ -79,7 +79,7 @@ func (h *ConnectHandler) ListOrganizationsKyc(ctx context.Context, request *conn
return nil, connect.NewError(connect.CodeNotFound, kyc.ErrNotExist)
default:
errorLogger.LogServiceError(ctx, request, "ListOrganizationsKyc.ListKycs", err)
return nil, connect.NewError(connect.CodeInternal, err)
return nil, connect.NewError(connect.CodeInternal, ErrInternalServerError)
}
}
resp := make([]*frontierv1beta1.OrganizationKyc, len(orgKycs))
Expand Down
4 changes: 2 additions & 2 deletions internal/api/v1beta1connect/kyc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func TestSetOrganizationKyc(t *testing.T) {
}),
mockError: errors.New("internal error"),
expectError: true,
expectedError: connect.NewError(connect.CodeInternal, errors.New("internal error")),
expectedError: connect.NewError(connect.CodeInternal, errors.New("internal server error")),
},
}

Expand Down Expand Up @@ -241,7 +241,7 @@ func TestListOrganizationsKyc(t *testing.T) {
mockService: mocks.NewKycService(t),
mockResponse: nil,
mockError: errors.New("internal error"),
expectError: connect.NewError(connect.CodeInternal, errors.New("internal error")),
expectError: connect.NewError(connect.CodeInternal, errors.New("internal server error")),
expectNilResp: true,
},
}
Expand Down
4 changes: 2 additions & 2 deletions internal/api/v1beta1connect/organization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ func (h *ConnectHandler) GetOrganization(ctx context.Context, request *connect.R
default:
errorLogger.LogServiceError(ctx, request, "GetOrganization.GetRaw", err,
"org_id", request.Msg.GetId())
return nil, connect.NewError(connect.CodeInternal, err)
return nil, connect.NewError(connect.CodeInternal, ErrInternalServerError)
}
}

orgPB, err := transformOrgToPB(fetchedOrg)
if err != nil {
errorLogger.LogTransformError(ctx, request, "GetOrganization", fetchedOrg.ID, err)
return nil, connect.NewError(connect.CodeInternal, err)
return nil, connect.NewError(connect.CodeInternal, ErrInternalServerError)
}

return connect.NewResponse(&frontierv1beta1.GetOrganizationResponse{
Expand Down
4 changes: 2 additions & 2 deletions internal/api/v1beta1connect/role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ func (h *ConnectHandler) CreateOrganizationRole(ctx context.Context, request *co
if err != nil {
errorLogger.LogServiceError(ctx, request, "CreateOrganizationRole.GetOrganization", err,
"org_id", request.Msg.GetOrgId())
return nil, connect.NewError(connect.CodeInternal, err)
return nil, connect.NewError(connect.CodeInternal, ErrInternalServerError)
}
metaDataMap[orgNameMetadataKey] = org.Title

Expand Down Expand Up @@ -341,7 +341,7 @@ func (h *ConnectHandler) UpdateOrganizationRole(ctx context.Context, request *co
if err != nil {
errorLogger.LogServiceError(ctx, request, "UpdateOrganizationRole.GetOrganization", err,
"org_id", request.Msg.GetOrgId())
return nil, connect.NewError(connect.CodeInternal, err)
return nil, connect.NewError(connect.CodeInternal, ErrInternalServerError)
}
metaDataMap[orgNameMetadataKey] = org.Title

Expand Down
4 changes: 2 additions & 2 deletions internal/api/v1beta1connect/serviceuser.go
View file
Open in desktop
Loading