Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

enhancement: don't return deleted user (#499)

Guilherme Oenningf46467e96d4a
diff --git a/app/models/identity.go b/app/models/identity.go
index b36239acf..633e7591b 100644
--- a/app/models/identity.go
+++ b/app/models/identity.go
@@ -43,7 +43,7 @@ type User struct {
Tenant *Tenant `json:"-"`
Role Role `json:"role"`
Providers []*UserProvider `json:"-"`
- Status int `json:"status"`
+ Status int `json:"-"`
}
var (
diff --git a/app/storage/postgres/user.go b/app/storage/postgres/user.go
index 59dd973fd..1c3c12114 100644
--- a/app/storage/postgres/user.go
+++ b/app/storage/postgres/user.go
@@ -226,7 +226,8 @@ func (s *UserStorage) ChangeEmail(userID int, email string) error {
// GetByID returns a user based on given id
func getUser(trx *dbx.Trx, filter string, args ...interface{}) (*models.User, error) {
user := dbUser{}
- err := trx.Get(&user, "SELECT id, name, email, tenant_id, role, status FROM users WHERE "+filter, args...)
+ sql := fmt.Sprintf("SELECT id, name, email, tenant_id, role, status FROM users WHERE status != %d AND ", models.UserDeleted)
+ err := trx.Get(&user, sql+filter, args...)
if err != nil {
return nil, err
}
@@ -242,7 +243,12 @@ func getUser(trx *dbx.Trx, filter string, args ...interface{}) (*models.User, er
// GetAll return all users of current tenant
func (s *UserStorage) GetAll() ([]*models.User, error) {
var users []*dbUser
- err := s.trx.Select(&users, "SELECT id, name, email, tenant_id, role, status FROM users WHERE tenant_id = $1 ORDER BY id", s.tenant.ID)
+ err := s.trx.Select(&users, `
+ SELECT id, name, email, tenant_id, role, status
+ FROM users
+ WHERE tenant_id = $1
+ AND status != $2
+ ORDER BY id`, s.tenant.ID, models.UserDeleted)
if err != nil {
return nil, errors.Wrap(err, "failed to get all users")
}
diff --git a/app/storage/postgres/user_test.go b/app/storage/postgres/user_test.go
index 2e5b930a7..5cb154e71 100644
--- a/app/storage/postgres/user_test.go
+++ b/app/storage/postgres/user_test.go
@@ -320,12 +320,8 @@ func TestUserStorage_Delete(t *testing.T) {
Expect(user).IsNil()
user, err = users.GetByID(jonSnow.ID)
- Expect(err).IsNil()
- Expect(user.Name).Equals("")
- Expect(user.Email).Equals("")
- Expect(user.Role).Equals(models.RoleVisitor)
- Expect(user.Status).Equals(models.UserDeleted)
- Expect(user.Providers).HasLen(0)
+ Expect(errors.Cause(err)).Equals(app.ErrNotFound)
+ Expect(user).IsNil()
}
func TestUserStorage_APIKey(t *testing.T) {
diff --git a/public/components/SupportCounter.spec.tsx b/public/components/SupportCounter.spec.tsx
index 5b54af62d..88cf87c38 100644
--- a/public/components/SupportCounter.spec.tsx
+++ b/public/components/SupportCounter.spec.tsx
@@ -1,6 +1,6 @@
import * as React from "react";
import { shallow } from "enzyme";
-import { Post, UserRole, UserStatus, PostStatus } from "@fider/models";
+import { Post, UserRole, PostStatus } from "@fider/models";
import { SupportCounter } from "@fider/components";
import { httpMock, fiderMock, rerender } from "@fider/services/testing";
@@ -18,8 +18,7 @@ beforeEach(() => {
user: {
id: 5,
name: "John",
- role: UserRole.Collaborator,
- status: UserStatus.Active
+ role: UserRole.Collaborator
},
viewerSupported: false,
response: null,
diff --git a/public/models/identity.ts b/public/models/identity.ts
index 1b6528697..156ee1e97 100644
--- a/public/models/identity.ts
+++ b/public/models/identity.ts
@@ -13,12 +13,6 @@ export interface User {
id: number;
name: string;
role: UserRole;
- status: UserStatus;
-}
-
-export enum UserStatus {
- Active = 1,
- Deleted = 2
}
export enum UserRole {
@@ -32,7 +26,6 @@ export interface CurrentUser {
name: string;
email: string;
role: UserRole;
- status: UserStatus;
isAdministrator: boolean;
isCollaborator: boolean;
}
diff --git a/public/pages/UI/UIToolkit.page.tsx b/public/pages/UI/UIToolkit.page.tsx
index 39f9a64b1..dd74b6f27 100644
--- a/public/pages/UI/UIToolkit.page.tsx
+++ b/public/pages/UI/UIToolkit.page.tsx
@@ -1,5 +1,5 @@
import * as React from "react";
-import { CurrentUser, PostStatus, UserStatus } from "@fider/models";
+import { CurrentUser, PostStatus } from "@fider/models";
import {
Heading,
Button,
@@ -28,15 +28,13 @@ import { notify, Failure } from "@fider/services";
const jonSnow: User = {
id: 0,
name: "Jon Snow",
- role: UserRole.Administrator,
- status: UserStatus.Active
+ role: UserRole.Administrator
};
const aryaStark: User = {
id: 0,
name: "Arya Snow",
- role: UserRole.Visitor,
- status: UserStatus.Active
+ role: UserRole.Visitor
};
const easyTag: Tag = { id: 2, slug: "easy", name: "easy", color: "FB3A62", isPublic: true };