Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

UI to Add/Remove members (Admin or Collaborator) (#149)

Guilherme Oenningaea2623c3ea2
diff --git a/app/actions/actions_test.go b/app/actions/actions_test.go
index 56a51582c..0224848a9 100644
--- a/app/actions/actions_test.go
+++ b/app/actions/actions_test.go
@@ -18,6 +18,7 @@ var jonSnowToken, _ = jwt.Encode(&models.OAuthClaims{
var services = &app.Services{
Tenants: &inmemory.TenantStorage{},
+ Users: &inmemory.UserStorage{},
}
func ExpectFailed(result *validate.Result, fields ...string) {
diff --git a/app/actions/idea.go b/app/actions/idea.go
index 05099ce5b..9754e8d4d 100644
--- a/app/actions/idea.go
+++ b/app/actions/idea.go
@@ -79,7 +79,7 @@ func (input *SetResponse) Initialize() interface{} {
// IsAuthorized returns true if current user is authorized to perform this action
func (input *SetResponse) IsAuthorized(user *models.User) bool {
- return user != nil && user.IsStaff()
+ return user != nil && user.IsCollaborator()
}
// Validate is current model is valid
diff --git a/app/actions/user.go b/app/actions/user.go
new file mode 100644
index 000000000..3c2318c65
--- /dev/null
+++ b/app/actions/user.go
@@ -0,0 +1,47 @@
+package actions
+
+import (
+ "github.com/getfider/fider/app"
+ "github.com/getfider/fider/app/models"
+ "github.com/getfider/fider/app/pkg/validate"
+)
+
+//ChangeUserRole is the input model change role of an user
+type ChangeUserRole struct {
+ CurrentTenant *models.Tenant
+ Model *models.ChangeUserRole
+}
+
+// Initialize the model
+func (input *ChangeUserRole) Initialize() interface{} {
+ input.Model = new(models.ChangeUserRole)
+ return input.Model
+}
+
+// IsAuthorized returns true if current user is authorized to perform this action
+func (input *ChangeUserRole) IsAuthorized(user *models.User) bool {
+ if user == nil {
+ return false
+ }
+ input.CurrentTenant = user.Tenant
+ return user.IsAdministrator() && user.ID != input.Model.UserID
+}
+
+// Validate is current model is valid
+func (input *ChangeUserRole) Validate(services *app.Services) *validate.Result {
+ result := validate.Success()
+ if input.Model.Role < models.RoleVisitor || input.Model.Role > models.RoleAdministrator {
+ result.AddFieldFailure("role", "Invalid role")
+ }
+ user, err := services.Users.GetByID(input.Model.UserID)
+ if err != nil {
+ if err == app.ErrNotFound {
+ result.AddFieldFailure("user_id", "User not found")
+ } else {
+ return validate.Error(err)
+ }
+ } else if user.Tenant.ID != input.CurrentTenant.ID {
+ result.AddFieldFailure("user_id", "User not found")
+ }
+ return result
+}
diff --git a/app/actions/user_test.go b/app/actions/user_test.go
new file mode 100644
index 000000000..f80b47a76
--- /dev/null
+++ b/app/actions/user_test.go
@@ -0,0 +1,84 @@
+package actions_test
+
+import (
+ "testing"
+
+ "github.com/getfider/fider/app/actions"
+ "github.com/getfider/fider/app/models"
+ . "github.com/onsi/gomega"
+)
+
+func TestChangeUserRole_Unauthorized(t *testing.T) {
+ RegisterTestingT(t)
+
+ for _, user := range []*models.User{
+ &models.User{ID: 1, Role: models.RoleVisitor},
+ &models.User{ID: 1, Role: models.RoleCollaborator},
+ &models.User{ID: 2, Role: models.RoleAdministrator},
+ } {
+ action := actions.ChangeUserRole{Model: &models.ChangeUserRole{UserID: 2}}
+ Expect(action.IsAuthorized(user)).To(BeFalse())
+ }
+}
+
+func TestChangeUserRole_Authorized(t *testing.T) {
+ RegisterTestingT(t)
+
+ user := &models.User{ID: 2, Role: models.RoleAdministrator}
+ action := actions.ChangeUserRole{Model: &models.ChangeUserRole{UserID: 1}}
+ Expect(action.IsAuthorized(user)).To(BeTrue())
+}
+
+func TestChangeUserRole_InvalidRole(t *testing.T) {
+ RegisterTestingT(t)
+
+ targetUser := &models.User{
+ Tenant: &models.Tenant{ID: 1},
+ }
+ services.Users.Register(targetUser)
+
+ currentUser := &models.User{
+ Tenant: &models.Tenant{ID: 1},
+ Role: models.RoleAdministrator,
+ }
+ services.Users.Register(currentUser)
+
+ action := actions.ChangeUserRole{Model: &models.ChangeUserRole{UserID: targetUser.ID, Role: 4}}
+ action.IsAuthorized(currentUser)
+ result := action.Validate(services)
+ ExpectFailed(result, "role")
+}
+
+func TestChangeUserRole_InvalidUser(t *testing.T) {
+ RegisterTestingT(t)
+
+ currentUser := &models.User{
+ Tenant: &models.Tenant{ID: 1},
+ Role: models.RoleAdministrator,
+ }
+
+ action := actions.ChangeUserRole{Model: &models.ChangeUserRole{UserID: 999, Role: models.RoleAdministrator}}
+ action.IsAuthorized(currentUser)
+ result := action.Validate(services)
+ ExpectFailed(result, "user_id")
+}
+
+func TestChangeUserRole_InvalidUser_Tenant(t *testing.T) {
+ RegisterTestingT(t)
+
+ targetUser := &models.User{
+ Tenant: &models.Tenant{ID: 1},
+ }
+ services.Users.Register(targetUser)
+
+ currentUser := &models.User{
+ Tenant: &models.Tenant{ID: 2},
+ Role: models.RoleAdministrator,
+ }
+ services.Users.Register(currentUser)
+
+ action := actions.ChangeUserRole{Model: &models.ChangeUserRole{UserID: targetUser.ID, Role: models.RoleAdministrator}}
+ action.IsAuthorized(currentUser)
+ result := action.Validate(services)
+ ExpectFailed(result, "user_id")
+}
diff --git a/app/handlers/admin.go b/app/handlers/admin.go
index fc7be2297..1cc498d19 100644
--- a/app/handlers/admin.go
+++ b/app/handlers/admin.go
@@ -20,3 +20,16 @@ func UpdateSettings() web.HandlerFunc {
return c.Ok(web.Map{})
}
}
+
+// ManageMembers is the page used by administrators to change member's role
+func ManageMembers() web.HandlerFunc {
+ return func(c web.Context) error {
+ users, err := c.Services().Users.GetAll()
+ if err != nil {
+ return c.Failure(err)
+ }
+ return c.Page(web.Map{
+ "users": users,
+ })
+ }
+}
diff --git a/app/handlers/admin_test.go b/app/handlers/admin_test.go
index dedd5dcf9..dcd78897f 100644
--- a/app/handlers/admin_test.go
+++ b/app/handlers/admin_test.go
@@ -1,6 +1,7 @@
package handlers_test
import (
+ "net/http"
"testing"
"github.com/getfider/fider/app/pkg/mock"
@@ -22,8 +23,21 @@ func TestUpdateSettingsHandler(t *testing.T) {
)
tenant, _ := services.Tenants.GetByDomain("demo")
- Expect(code).To(Equal(200))
+ Expect(code).To(Equal(http.StatusOK))
Expect(tenant.Name).To(Equal("GoT"))
Expect(tenant.Invitation).To(Equal("Join us!"))
Expect(tenant.WelcomeMessage).To(Equal("Welcome to GoT Feedback Forum"))
}
+
+func TestUManageMembersHandler(t *testing.T) {
+ RegisterTestingT(t)
+
+ server, _ := mock.NewServer()
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ Execute(
+ handlers.ManageMembers(),
+ )
+
+ Expect(code).To(Equal(http.StatusOK))
+}
diff --git a/app/handlers/status.go b/app/handlers/common.go
similarity index 77%
rename from app/handlers/status.go
rename to app/handlers/common.go
index 088cc8288..e374849dd 100644
--- a/app/handlers/status.go
+++ b/app/handlers/common.go
@@ -19,3 +19,10 @@ func Status(settings *models.AppSettings) web.HandlerFunc {
})
}
}
+
+//Page returns a page without properties
+func Page() web.HandlerFunc {
+ return func(c web.Context) error {
+ return c.Page(web.Map{})
+ }
+}
diff --git a/app/handlers/status_test.go b/app/handlers/common_test.go
similarity index 100%
rename from app/handlers/status_test.go
rename to app/handlers/common_test.go
diff --git a/app/handlers/settings.go b/app/handlers/settings.go
index 3354b11d9..0589b0877 100644
--- a/app/handlers/settings.go
+++ b/app/handlers/settings.go
@@ -21,3 +21,20 @@ func UpdateUserSettings() web.HandlerFunc {
return c.Ok(web.Map{})
}
}
+
+// ChangeUserRole changes given user role
+func ChangeUserRole() web.HandlerFunc {
+ return func(c web.Context) error {
+ input := new(actions.ChangeUserRole)
+ if result := c.BindTo(input); !result.Ok {
+ return c.HandleValidation(result)
+ }
+
+ err := c.Services().Users.ChangeRole(input.Model.UserID, input.Model.Role)
+ if err != nil {
+ return c.Failure(err)
+ }
+
+ return c.Ok(web.Map{})
+ }
+}
diff --git a/app/handlers/settings_test.go b/app/handlers/settings_test.go
index f91e7be0d..6e13232a8 100644
--- a/app/handlers/settings_test.go
+++ b/app/handlers/settings_test.go
@@ -1,9 +1,12 @@
package handlers_test
import (
+ "fmt"
"net/http"
"testing"
+ "github.com/getfider/fider/app/models"
+
"github.com/getfider/fider/app/handlers"
"github.com/getfider/fider/app/pkg/mock"
. "github.com/onsi/gomega"
@@ -34,3 +37,19 @@ func TestUpdateUserSettingsHandler_ValidName(t *testing.T) {
Expect(code).To(Equal(http.StatusOK))
Expect(user.Name).To(Equal("Jon Stark"))
}
+
+func TestChangeRoleHandler_Valid(t *testing.T) {
+ RegisterTestingT(t)
+
+ server, services := mock.NewServer()
+ code, _ := server.
+ OnTenant(mock.DemoTenant).
+ AsUser(mock.JonSnow).
+ AddParam("user_id", mock.AryaStark.ID).
+ ExecutePost(handlers.ChangeUserRole(), fmt.Sprintf(`{ "role": %d }`, models.RoleAdministrator))
+
+ user, _ := services.Users.GetByID(mock.AryaStark.ID)
+
+ Expect(code).To(Equal(http.StatusOK))
+ Expect(user.Role).To(Equal(models.RoleAdministrator))
+}
diff --git a/app/middlewares/auth.go b/app/middlewares/auth.go
index 794bcf485..476750a66 100644
--- a/app/middlewares/auth.go
+++ b/app/middlewares/auth.go
@@ -1,6 +1,7 @@
package middlewares
import (
+ "github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/web"
)
@@ -17,7 +18,7 @@ func IsAuthenticated() web.MiddlewareFunc {
}
// IsAuthorized blocks non-authorized requests
-func IsAuthorized(roles ...int) web.MiddlewareFunc {
+func IsAuthorized(roles ...models.Role) web.MiddlewareFunc {
return func(next web.HandlerFunc) web.HandlerFunc {
return func(c web.Context) error {
user := c.User()
diff --git a/app/middlewares/auth_test.go b/app/middlewares/auth_test.go
index 6d0888b0b..9deeeee0d 100644
--- a/app/middlewares/auth_test.go
+++ b/app/middlewares/auth_test.go
@@ -15,7 +15,7 @@ func TestIsAuthorized_WithAllowedRole(t *testing.T) {
RegisterTestingT(t)
server, _ := mock.NewServer()
- server.Use(middlewares.IsAuthorized(models.RoleAdministrator, models.RoleMember))
+ server.Use(middlewares.IsAuthorized(models.RoleAdministrator, models.RoleCollaborator))
status, _ := server.AsUser(mock.JonSnow).Execute(func(c web.Context) error {
return c.NoContent(http.StatusOK)
})
@@ -27,7 +27,7 @@ func TestIsAuthorized_WithForbiddenRole(t *testing.T) {
RegisterTestingT(t)
server, _ := mock.NewServer()
- server.Use(middlewares.IsAuthorized(models.RoleAdministrator, models.RoleMember))
+ server.Use(middlewares.IsAuthorized(models.RoleAdministrator, models.RoleCollaborator))
status, _ := server.AsUser(mock.AryaStark).Execute(func(c web.Context) error {
return c.NoContent(http.StatusOK)
})
diff --git a/app/middlewares/setup.go b/app/middlewares/setup.go
index dee92b589..b40dcc831 100644
--- a/app/middlewares/setup.go
+++ b/app/middlewares/setup.go
@@ -78,7 +78,7 @@ func AddServices() web.MiddlewareFunc {
services.Tenants.SetCurrentTenant(tenant)
services.OAuth = &oauth.HTTPService{}
services.Ideas = postgres.NewIdeaStorage(tenant, trx)
- services.Users = postgres.NewUserStorage(trx)
+ services.Users = postgres.NewUserStorage(tenant, trx)
return next(c)
}
}
diff --git a/app/models/feedback.go b/app/models/feedback.go
index 49f3d3368..91638ff46 100644
--- a/app/models/feedback.go
+++ b/app/models/feedback.go
@@ -21,7 +21,7 @@ type Idea struct {
//CanBeChangedBy returns true if given user can change this idea
func (i *Idea) CanBeChangedBy(user *User) bool {
- return user.IsStaff() || i.User.ID == user.ID
+ return user.IsCollaborator() || i.User.ID == user.ID
}
// NewIdea represents a new idea
diff --git a/app/models/identity.go b/app/models/identity.go
index 36c55ac58..163bc7402 100644
--- a/app/models/identity.go
+++ b/app/models/identity.go
@@ -31,17 +31,20 @@ type User struct {
Email string `json:"-"`
Gravatar string `json:"gravatar"`
Tenant *Tenant `json:"-"`
- Role int `json:"role"`
+ Role Role `json:"role"`
Providers []*UserProvider `json:"-"`
}
-var (
+//Role is the role of a user inside a tenant
+type Role int
+
+const (
//RoleVisitor is the basic role for every user
- RoleVisitor = 1
- //RoleMember has limited access to administrative console
- RoleMember = 2
+ RoleVisitor Role = 1
+ //RoleCollaborator has limited access to administrative console
+ RoleCollaborator Role = 2
//RoleAdministrator has full access to administrative console
- RoleAdministrator = 3
+ RoleAdministrator Role = 3
)
//HasProvider returns true if current user has registered with given provider
@@ -54,9 +57,14 @@ func (u *User) HasProvider(provider string) bool {
return false
}
-//IsStaff returns true if user has special permissions
-func (u *User) IsStaff() bool {
- return u.Role >= RoleMember
+// IsCollaborator returns true if user has special permissions
+func (u *User) IsCollaborator() bool {
+ return u.Role == RoleCollaborator || u.Role == RoleAdministrator
+}
+
+// IsAdministrator returns true if user is administrator
+func (u *User) IsAdministrator() bool {
+ return u.Role == RoleAdministrator
}
//UserProvider represents the relashionship between an User and an Authentication provide
@@ -128,3 +136,9 @@ type CompleteProfile struct {
type UpdateUserSettings struct {
Name string `json:"name"`
}
+
+// ChangeUserRole is the input model change role of an user
+type ChangeUserRole struct {
+ UserID int `route:"user_id"`
+ Role Role `json:"role"`
+}
diff --git a/app/storage/inmemory/user.go b/app/storage/inmemory/user.go
index 42fde3921..6408d0d17 100644
--- a/app/storage/inmemory/user.go
+++ b/app/storage/inmemory/user.go
@@ -80,3 +80,19 @@ func (s *UserStorage) Update(userID int, settings *models.UpdateUserSettings) er
}
return app.ErrNotFound
}
+
+// ChangeRole of given user
+func (s *UserStorage) ChangeRole(userID int, role models.Role) error {
+ for _, user := range s.users {
+ if user.ID == userID {
+ user.Role = role
+ return nil
+ }
+ }
+ return app.ErrNotFound
+}
+
+// GetAll return all users of current tenant
+func (s *UserStorage) GetAll() ([]*models.User, error) {
+ return s.users, nil
+}
diff --git a/app/storage/postgres/idea_test.go b/app/storage/postgres/idea_test.go
index b0df43247..8c0c1ee4b 100644
--- a/app/storage/postgres/idea_test.go
+++ b/app/storage/postgres/idea_test.go
@@ -11,16 +11,6 @@ import (
. "github.com/onsi/gomega"
)
-func orangeTenant(tenants *postgres.TenantStorage) *models.Tenant {
- tenant, _ := tenants.GetByDomain("orange")
- return tenant
-}
-
-func demoTenant(tenants *postgres.TenantStorage) *models.Tenant {
- tenant, _ := tenants.GetByDomain("demo")
- return tenant
-}
-
func TestIdeaStorage_GetAll(t *testing.T) {
RegisterTestingT(t)
db, _ := dbx.New()
diff --git a/app/storage/postgres/setup_test.go b/app/storage/postgres/setup_test.go
index d7222b2ad..1ef799109 100644
--- a/app/storage/postgres/setup_test.go
+++ b/app/storage/postgres/setup_test.go
@@ -4,9 +4,21 @@ import (
"os"
"testing"
+ "github.com/getfider/fider/app/models"
"github.com/getfider/fider/app/pkg/dbx"
+ "github.com/getfider/fider/app/storage/postgres"
)
+func orangeTenant(tenants *postgres.TenantStorage) *models.Tenant {
+ tenant, _ := tenants.GetByDomain("orange")
+ return tenant
+}
+
+func demoTenant(tenants *postgres.TenantStorage) *models.Tenant {
+ tenant, _ := tenants.GetByDomain("demo")
+ return tenant
+}
+
func TestMain(m *testing.M) {
db, _ := dbx.New()
db.Migrate()
diff --git a/app/storage/postgres/user.go b/app/storage/postgres/user.go
index f24d6e5ad..ebbba3bd4 100644
--- a/app/storage/postgres/user.go
+++ b/app/storage/postgres/user.go
@@ -34,7 +34,7 @@ func (u *dbUser) toModel() *models.User {
Email: u.Email.String,
Gravatar: fmt.Sprintf("%x", md5.Sum([]byte(u.Email.String))),
Tenant: u.Tenant.toModel(),
- Role: int(u.Role.Int64),
+ Role: models.Role(u.Role.Int64),
Providers: make([]*models.UserProvider, len(u.Providers)),
}
@@ -50,12 +50,13 @@ func (u *dbUser) toModel() *models.User {
// UserStorage is used for user operations using a Postgres database
type UserStorage struct {
- trx *dbx.Trx
+ tenant *models.Tenant
+ trx *dbx.Trx
}
// NewUserStorage creates a new UserStorage
-func NewUserStorage(trx *dbx.Trx) *UserStorage {
- return &UserStorage{trx: trx}
+func NewUserStorage(tenant *models.Tenant, trx *dbx.Trx) *UserStorage {
+ return &UserStorage{tenant: tenant, trx: trx}
}
// GetByID returns a user based on given id
@@ -110,6 +111,12 @@ func (s *UserStorage) Update(userID int, settings *models.UpdateUserSettings) er
return s.trx.Execute(cmd, userID, settings.Name)
}
+// ChangeRole of given user
+func (s *UserStorage) ChangeRole(userID int, role models.Role) error {
+ cmd := "UPDATE users SET role = $3 WHERE id = $1 AND tenant_id = $2"
+ return s.trx.Execute(cmd, userID, s.tenant.ID, role)
+}
+
// GetByID returns a user based on given id
func getUser(trx *dbx.Trx, filter string, args ...interface{}) (*models.User, error) {
user := dbUser{}
@@ -127,3 +134,18 @@ func getUser(trx *dbx.Trx, filter string, args ...interface{}) (*models.User, er
return user.toModel(), nil
}
+
+// 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 FROM users WHERE tenant_id = $1 ORDER BY id", s.tenant.ID)
+ if err != nil {
+ return nil, err
+ }
+
+ var result = make([]*models.User, len(users))
+ for i, user := range users {
+ result[i] = user.toModel()
+ }
+ return result, nil
+}
diff --git a/app/storage/postgres/user_test.go b/app/storage/postgres/user_test.go
index 7b6405d99..a2a6d252f 100644
--- a/app/storage/postgres/user_test.go
+++ b/app/storage/postgres/user_test.go
@@ -20,7 +20,7 @@ func TestUserStorage_GetByID(t *testing.T) {
trx, _ := db.Begin()
defer trx.Rollback()
- users := postgres.NewUserStorage(trx)
+ users := postgres.NewUserStorage(nil, trx)
user, err := users.GetByID(1)
Expect(err).To(BeNil())
@@ -42,7 +42,7 @@ func TestUserStorage_GetByEmail_Error(t *testing.T) {
trx, _ := db.Begin()
defer trx.Rollback()
- users := postgres.NewUserStorage(trx)
+ users := postgres.NewUserStorage(nil, trx)
user, err := users.GetByEmail(1, "[email protected]")
Expect(user).To(BeNil())
@@ -58,7 +58,7 @@ func TestUserStorage_GetByEmail(t *testing.T) {
trx, _ := db.Begin()
defer trx.Rollback()
- users := postgres.NewUserStorage(trx)
+ users := postgres.NewUserStorage(nil, trx)
user, err := users.GetByEmail(1, "[email protected]")
Expect(err).To(BeNil())
@@ -80,7 +80,7 @@ func TestUserStorage_GetByProvider(t *testing.T) {
trx, _ := db.Begin()
defer trx.Rollback()
- users := postgres.NewUserStorage(trx)
+ users := postgres.NewUserStorage(nil, trx)
user, err := users.GetByProvider(1, "facebook", "FB1234")
Expect(err).To(BeNil())
@@ -102,7 +102,7 @@ func TestUserStorage_GetByProvider_WrongTenant(t *testing.T) {
trx, _ := db.Begin()
defer trx.Rollback()
- users := postgres.NewUserStorage(trx)
+ users := postgres.NewUserStorage(nil, trx)
user, err := users.GetByProvider(2, "facebook", "FB1234")
Expect(user).To(BeNil())
@@ -118,7 +118,7 @@ func TestUserStorage_GetByEmail_WrongTenant(t *testing.T) {
trx, _ := db.Begin()
defer trx.Rollback()
- users := postgres.NewUserStorage(trx)
+ users := postgres.NewUserStorage(nil, trx)
user, err := users.GetByEmail(2, "[email protected]")
Expect(user).To(BeNil())
@@ -134,14 +134,14 @@ func TestUserStorage_Register(t *testing.T) {
trx, _ := db.Begin()
defer trx.Rollback()
- users := postgres.NewUserStorage(trx)
+ users := postgres.NewUserStorage(nil, trx)
user := &models.User{
Name: "Rob Stark",
Tenant: &models.Tenant{
ID: 1,
},
- Role: models.RoleMember,
+ Role: models.RoleCollaborator,
Providers: []*models.UserProvider{
{
UID: "123123123",
@@ -155,7 +155,7 @@ func TestUserStorage_Register(t *testing.T) {
user, err = users.GetByEmail(1, "[email protected]")
Expect(err).To(BeNil())
Expect(user.ID).To(Equal(int(5)))
- Expect(user.Role).To(Equal(models.RoleMember))
+ Expect(user.Role).To(Equal(models.RoleCollaborator))
Expect(user.Name).To(Equal("Rob Stark"))
Expect(user.Email).To(Equal("[email protected]"))
}
@@ -171,14 +171,14 @@ func TestUserStorage_Register_MultipleProviders(t *testing.T) {
trx.Execute("INSERT INTO tenants (name, subdomain, created_on, status) VALUES ('My Domain Inc.','mydomain', now(), 1)")
- users := postgres.NewUserStorage(trx)
+ users := postgres.NewUserStorage(nil, trx)
user := &models.User{
Name: "Jon Snow",
Tenant: &models.Tenant{
ID: 3,
},
- Role: models.RoleMember,
+ Role: models.RoleCollaborator,
Providers: []*models.UserProvider{
{
UID: "123123123",
@@ -207,7 +207,7 @@ func TestUserStorage_RegisterProvider(t *testing.T) {
trx, _ := db.Begin()
defer trx.Rollback()
- users := postgres.NewUserStorage(trx)
+ users := postgres.NewUserStorage(nil, trx)
users.RegisterProvider(1, &models.UserProvider{
UID: "GO1234",
Name: "google",
@@ -236,10 +236,48 @@ func TestUserStorage_UpdateSettings(t *testing.T) {
trx, _ := db.Begin()
defer trx.Rollback()
- users := postgres.NewUserStorage(trx)
+ users := postgres.NewUserStorage(nil, trx)
err := users.Update(1, &models.UpdateUserSettings{Name: "Jon Stark"})
Expect(err).To(BeNil())
user, err := users.GetByEmail(1, "[email protected]")
Expect(user.Name).To(Equal("Jon Stark"))
}
+
+func TestUserStorage_ChangeRole(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+ db.Seed()
+ defer db.Close()
+
+ trx, _ := db.Begin()
+ defer trx.Rollback()
+
+ tenants := postgres.NewTenantStorage(trx)
+
+ users := postgres.NewUserStorage(demoTenant(tenants), trx)
+ err := users.ChangeRole(1, models.RoleVisitor)
+ Expect(err).To(BeNil())
+
+ user, err := users.GetByEmail(1, "[email protected]")
+ Expect(user.Role).To(Equal(models.RoleVisitor))
+}
+
+func TestUserStorage_GetAll(t *testing.T) {
+ RegisterTestingT(t)
+ db, _ := dbx.New()
+ db.Seed()
+ defer db.Close()
+
+ trx, _ := db.Begin()
+ defer trx.Rollback()
+
+ tenants := postgres.NewTenantStorage(trx)
+
+ users := postgres.NewUserStorage(demoTenant(tenants), trx)
+ all, err := users.GetAll()
+ Expect(err).To(BeNil())
+ Expect(len(all)).To(Equal(2))
+ Expect(all[0].Name).To(Equal("Jon Snow"))
+ Expect(all[1].Name).To(Equal("Arya Stark"))
+}
diff --git a/app/storage/storage.go b/app/storage/storage.go
index db33365a9..52d36f1d8 100644
--- a/app/storage/storage.go
+++ b/app/storage/storage.go
@@ -29,6 +29,8 @@ type User interface {
Register(user *models.User) error
RegisterProvider(userID int, provider *models.UserProvider) error
Update(userID int, settings *models.UpdateUserSettings) error
+ ChangeRole(userID int, role models.Role) error
+ GetAll() ([]*models.User, error)
}
// Tenant contains read and write operations for tenants
diff --git a/public/assets/styles/form.scss b/public/assets/styles/form.scss
index 344de391e..c94cc8217 100644
--- a/public/assets/styles/form.scss
+++ b/public/assets/styles/form.scss
@@ -1,7 +1,5 @@
.field {
.info {
- font-size: 90%;
- color: rgba(0,0,0,.6);
padding: 5px 0px 0px 5px;
}
}
diff --git a/public/assets/styles/main.scss b/public/assets/styles/main.scss
index 28ccd8e79..ab8565813 100644
--- a/public/assets/styles/main.scss
+++ b/public/assets/styles/main.scss
@@ -27,8 +27,8 @@ body {
}
.info {
- color: rgba(0,0,0,.4);
font-size: 90%;
+ color: rgba(0,0,0,.6);
}
.info.right {
@@ -87,11 +87,14 @@ code {
}
}
-.fdr-avatar,
-.ui.menu .item>img:not(.ui) {
+.fdr-avatar {
border-radius: 50%;
width: 30px;
vertical-align: middle;
+ padding: 1px;
+ &.staff {
+ border: 1px solid $admin-color;
+ }
}
.no-margin {
@@ -157,22 +160,8 @@ code {
margin-left: 0.5em;
}
- .info {
- display: inline !important;
- position: relative;
- top: 0px;
- left: 0px;
- color: rgba(0, 0, 0, 0.4);
- box-shadow: none;
- background: 0px 0px;
- margin: 0.5rem 0px 0px;
- padding: 0px;
- transition: color 0.1s ease;
- border-top: none;
-
- span {
- margin-left: 6px;
- }
+ span.date {
+ margin-left: 6px;
}
}
diff --git a/public/assets/styles/semantic.scss b/public/assets/styles/semantic.scss
index e69de29bb..63625e8ef 100644
--- a/public/assets/styles/semantic.scss
+++ b/public/assets/styles/semantic.scss
@@ -0,0 +1,12 @@
+.ui.list {
+ .item {
+ .showover {
+ visibility: hidden;
+ }
+ &:hover {
+ .showover {
+ visibility: visible;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/public/assets/styles/variables.scss b/public/assets/styles/variables.scss
index 94fda5ae8..9baa13a91 100644
--- a/public/assets/styles/variables.scss
+++ b/public/assets/styles/variables.scss
@@ -1,5 +1,5 @@
$main-color: #0069ff; //#0c9
-$admin-color: #5a93a6;
+$admin-color: #365899;
$bg-color: #fff;
$menu-color: #f9f9f9;
diff --git a/public/components/CommentInput.tsx b/public/components/CommentInput.tsx
index 96f503f8c..a65097cb9 100644
--- a/public/components/CommentInput.tsx
+++ b/public/components/CommentInput.tsx
@@ -64,7 +64,7 @@ export class CommentInput extends React.Component<CommentInputProps, CommentInpu
const user = this.session.getCurrentUser();
return <div className={`comment-input ${user && 'authenticated' }`}>
- { this.user && <Gravatar name={ this.user.name } hash={ this.user.gravatar }/> }
+ { this.user && <Gravatar user={ this.user } /> }
<div className="ui form">
{ this.user && <UserName user={ this.user } /> }
<DisplayError error={this.state.error} />
diff --git a/public/components/ShowIdeaResponse.tsx b/public/components/ShowIdeaResponse.tsx
index 9baf8b226..56c54b162 100644
--- a/public/components/ShowIdeaResponse.tsx
+++ b/public/components/ShowIdeaResponse.tsx
@@ -13,7 +13,7 @@ export const ShowIdeaResponse = (props: IdeaResponseProps): JSX.Element => {
if (props.response && status.show) {
return <div className="fdr-response item ui segment">
<span className={`ui mini label ${status.color}`}>{ status.title }</span>
- <Gravatar name={props.response.user.name} hash={props.response.user.gravatar}/> <UserName user={props.response.user} />
+ <Gravatar user={ props.response.user }/> <UserName user={props.response.user} />
<span className="info">
<Moment date={props.response.respondedOn} />
</span>
diff --git a/public/components/common/Button.tsx b/public/components/common/Button.tsx
index 7020ca0ff..5056eacdf 100644
--- a/public/components/common/Button.tsx
+++ b/public/components/common/Button.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
interface ButtonProps {
className?: string;
href?: string;
- size?: 'tiny' | 'small' | 'large';
+ size?: 'mini' | 'tiny' | 'small' | 'large';
onClick?: () => Promise<any>;
}
@@ -12,6 +12,8 @@ interface ButtonState {
}
export class Button extends React.Component<ButtonProps, ButtonState> {
+ private unmounted: boolean;
+
public static defaultProps: Partial<ButtonProps> = {
size: 'tiny'
};
@@ -23,11 +25,17 @@ export class Button extends React.Component<ButtonProps, ButtonState> {
};
}
+ public componentWillUnmount() {
+ this.unmounted = true;
+ }
+
private async click() {
this.setState({ clicked: true });
if (this.props.onClick) {
await this.props.onClick();
- this.setState({ clicked: false });
+ if (!this.unmounted) {
+ this.setState({ clicked: false });
+ }
}
}
diff --git a/public/components/common/Gravatar.tsx b/public/components/common/Gravatar.tsx
index 85ffcbbd3..b5d28274e 100644
--- a/public/components/common/Gravatar.tsx
+++ b/public/components/common/Gravatar.tsx
@@ -1,21 +1,24 @@
import * as React from 'react';
import md5 = require('md5');
import { getBaseUrl } from '@fider/utils/page';
+import { User } from '@fider/models';
interface GravatarProps {
- name: string;
- hash?: string;
+ user?: User;
+ name?: string;
email?: string;
}
export const Gravatar = (props: GravatarProps) => {
- const fallback = `${getBaseUrl()}/avatars/50/${props.name}`;
- const hash = props.email ? md5(props.email) : props.hash || '';
+ const name = props.name ? props.name : props.user ? props.user.name : '';
+ const hash = props.email ? md5(props.email) : props.user ? props.user.gravatar : '';
+ const fallback = `${getBaseUrl()}/avatars/50/${name}`;
+ const isCollaborator = props.user ? props.user.role >= 2 : false;
let element: any;
return <img ref={(e) => element = e }
onError={() => { element.src = fallback; }}
- className="fdr-avatar"
- title={ props.name }
+ className={`fdr-avatar image ${isCollaborator && 'staff'}`}
+ title={ name }
src={ `https://www.gravatar.com/avatar/${hash}?d=${encodeURIComponent(fallback)}` }/>;
};
diff --git a/public/components/common/Header.tsx b/public/components/common/Header.tsx
index 883ccadee..7b812e0d2 100644
--- a/public/components/common/Header.tsx
+++ b/public/components/common/Header.tsx
@@ -35,13 +35,14 @@ export class Header extends React.Component<{}, {}> {
<a href="/settings" className="item">Settings</a>
<div className="divider"></div>
{
- this.session.isStaff() && [
+ this.session.isCollaborator() && [
<div key={1} className="header">
<i className="setting icon"></i>
Administration
</div>,
<a key={2} href="/admin" className="item">General Settings</a>,
- <div key={3} className="divider"></div>
+ <a key={3} href="/admin/members" className="item">Members</a>,
+ <div key={4} className="divider"></div>
]
}
<a href="/signout?redirect=/" className="item signout">Sign out</a>
@@ -55,7 +56,7 @@ export class Header extends React.Component<{}, {}> {
{ this.tenant.name }
</a>
<div onClick={ () => this.showModal() } className={`ui right simple dropdown item signin ${!this.user && 'subtitle'}`}>
- { this.user && <Gravatar name={this.user.name} hash={this.user.gravatar} /> }
+ { this.user && <Gravatar user={ this.user } /> }
{ !this.user && 'Sign in' } { this.user && <i className="dropdown icon"></i> }
{ items }
</div>
diff --git a/public/components/common/UserName.tsx b/public/components/common/UserName.tsx
index 495c5ae35..3c4f85c6e 100644
--- a/public/components/common/UserName.tsx
+++ b/public/components/common/UserName.tsx
@@ -6,6 +6,6 @@ interface UserNameProps {
}
export const UserName = (props: UserNameProps) => {
- const isStaff = props.user.role >= 2;
- return <span className={`name ${isStaff ? 'staff' : ''}`}>{ props.user.name }</span>;
+ const isCollaborator = props.user.role >= 2;
+ return <span className={`name ${isCollaborator ? 'staff' : ''}`}>{ props.user.name }</span>;
};
diff --git a/public/index.tsx b/public/index.tsx
index 40c56eefb..5d6014656 100644
--- a/public/index.tsx
+++ b/public/index.tsx
@@ -3,12 +3,14 @@ import * as ReactDOM from 'react-dom';
import { SignInModal } from '@fider/components/SignInModal';
import { AdminHomePage } from '@fider/pages/admin/AdminHomePage';
+import { MembersPage } from '@fider/pages/admin/MembersPage';
import { SiteHomePage } from '@fider/pages/site/SiteHomePage';
import { ShowIdeaPage } from '@fider/pages/site/ShowIdeaPage';
import { UserSettingsPage } from '@fider/pages/site/UserSettingsPage';
import { CompleteSignInProfilePage } from '@fider/pages/site/CompleteSignInProfilePage';
import { SignUpPage } from '@fider/pages/signup/SignUpPage';
import { container, injectables } from '@fider/di';
+
import {
Session,
BrowserSession,
@@ -30,16 +32,17 @@ container.bind<UserService>(injectables.UserService).to(HttpUserService);
interface PageConfiguration {
id: string;
regex: RegExp;
- component: JSX.Element;
+ component: any;
}
const pathRegex = [
- { regex: new RegExp('^\/$'), component: <SiteHomePage />, id: 'fdr-home-page' },
- { regex: new RegExp('^\/admin$'), component: <AdminHomePage />, id: 'fdr-admin-page' },
- { regex: new RegExp('^\/signup$'), component: <SignUpPage />, id: 'fdr-signup-page' },
- { regex: new RegExp('^\/ideas\/\\d+.*$'), component: <ShowIdeaPage />, id: 'fdr-show-idea-page' },
- { regex: new RegExp('^\/signin\/verify'), component: <CompleteSignInProfilePage />, id: 'fdr-complete-signin-profile' },
- { regex: new RegExp('^\/settings$'), component: <UserSettingsPage />, id: 'fdr-user-settings' },
+ { regex: new RegExp('^\/$'), component: SiteHomePage, id: 'fdr-home-page' },
+ { regex: new RegExp('^\/admin\/members$'), component: MembersPage, id: 'fdr-admin-members-page' },
+ { regex: new RegExp('^\/admin$'), component: AdminHomePage, id: 'fdr-admin-page' },
+ { regex: new RegExp('^\/signup$'), component: SignUpPage, id: 'fdr-signup-page' },
+ { regex: new RegExp('^\/ideas\/\\d+.*$'), component: ShowIdeaPage, id: 'fdr-show-idea-page' },
+ { regex: new RegExp('^\/signin\/verify'), component: CompleteSignInProfilePage, id: 'fdr-complete-signin-profile' },
+ { regex: new RegExp('^\/settings$'), component: UserSettingsPage, id: 'fdr-user-settings' },
];
const resolveRootComponent = (path: string): PageConfiguration | undefined => {
@@ -58,7 +61,7 @@ document.addEventListener('DOMContentLoaded', () => {
<div>
<SignInModal />
<div id={ config.id }>
- { config.component }
+ { React.createElement(config.component) }
</div>
</div>, root
);
diff --git a/public/models/identity.ts b/public/models/identity.ts
index b14e98407..db267a313 100644
--- a/public/models/identity.ts
+++ b/public/models/identity.ts
@@ -13,6 +13,12 @@ export interface User {
role: number;
}
+export enum UserRole {
+ Visitor = 1,
+ Collaborator = 2,
+ Administrator = 3,
+}
+
export interface CurrentUser {
id: number;
name: string;
diff --git a/public/pages/admin/AdminHomePage.tsx b/public/pages/admin/AdminHomePage.tsx
index 84110e5cf..36a0e97f8 100644
--- a/public/pages/admin/AdminHomePage.tsx
+++ b/public/pages/admin/AdminHomePage.tsx
@@ -51,8 +51,13 @@ export class AdminHomePage extends React.Component<{}, AdminHomePageState> {
return <div>
<Header />
<div className="page ui container">
- <h1 className="ui header">Administration</h1>
- <h4 className="ui header">General Settings</h4>
+ <h2 className="ui header">
+ <i className="circular settings icon"></i>
+ <div className="content">
+ General Settings
+ <div className="sub header">Manage your site settings</div>
+ </div>
+ </h2>
<div className="ui grid">
<div className="eight wide computer sixteen wide mobile column">
diff --git a/public/pages/admin/MembersPage.tsx b/public/pages/admin/MembersPage.tsx
new file mode 100644
index 000000000..e740b5c05
--- /dev/null
+++ b/public/pages/admin/MembersPage.tsx
@@ -0,0 +1,186 @@
+import * as React from 'react';
+import { Header, Footer, Button, Gravatar, UserName } from '@fider/components/common';
+
+import { User, CurrentUser, UserRole } from '@fider/models';
+
+import { inject, injectables } from '@fider/di';
+import { Session, TenantService } from '@fider/services';
+
+interface MembersPageState {
+ administrators: User[];
+ collaborators: User[];
+ visitors: User[];
+ filteredNewAdministrators: User[];
+ filteredNewCollaborators: User[];
+ newAdministratorFilter: string;
+ newCollaboratorFilter: string;
+}
+
+export class MembersPage extends React.Component<{}, MembersPageState> {
+ private allUsers: User[];
+ private currentUser: CurrentUser;
+
+ @inject(injectables.Session)
+ public session: Session;
+
+ @inject(injectables.TenantService)
+ public tenantService: TenantService;
+
+ constructor(props: {}) {
+ super(props);
+ this.allUsers = this.session.get<User[]>('users') || [];
+ this.currentUser = this.session.getCurrentUser()!;
+ this.state = this.groupUsers();
+ }
+
+ private async changeRole(user: User, role: UserRole): Promise<any> {
+ const response = await this.tenantService.changeRole(user.id, role);
+ if (response.ok) {
+ user.role = role;
+ this.setState(this.groupUsers());
+ }
+ }
+
+ private groupUsers(): MembersPageState {
+ const usersByRole = this.allUsers.reduce<{ [key: number]: User[] }>((groups, x) => {
+ groups[x.role] = [ x ].concat(groups[x.role] || []);
+ return groups;
+ }, {});
+
+ return {
+ administrators: usersByRole[UserRole.Administrator] || [],
+ collaborators: usersByRole[UserRole.Collaborator] || [],
+ visitors: usersByRole[UserRole.Visitor] || [],
+ filteredNewAdministrators: [],
+ filteredNewCollaborators: [],
+ newAdministratorFilter: '',
+ newCollaboratorFilter: '',
+ };
+ }
+
+ private showUser(user: User, role: UserRole, addable: boolean, removable: boolean) {
+ if (user.id === this.currentUser.id || this.currentUser.role !== UserRole.Administrator) {
+ removable = false;
+ }
+
+ return <div key={user.id} className="item">
+ <Gravatar user={user} />
+ <div className="content">
+ <UserName user={user} />
+ </div>
+ <div className="right floated content">
+ {
+ removable &&
+ <Button size="mini" onClick={() => this.changeRole(user, UserRole.Visitor)} className="red showover">
+ <i className="remove icon"></i>
+ Remove
+ </Button>
+ }
+ {
+ addable &&
+ <Button size="mini" onClick={() => this.changeRole(user, role)} className="green showover">
+ <i className="add icon"></i>
+ Add
+ </Button>
+ }
+ </div>
+ </div>;
+ }
+
+ private filterVisitors(property: string, text: string) {
+ let filtered: User[] = [];
+ if (text) {
+ filtered = this.state.visitors.filter((x) => x.name.toLowerCase().indexOf(text.toLowerCase()) >= 0);
+ }
+
+ if (property === 'administrator') {
+ this.setState({
+ newAdministratorFilter: text,
+ filteredNewAdministrators: filtered
+ });
+ } else if (property === 'collaborator') {
+ this.setState({
+ newCollaboratorFilter: text,
+ filteredNewCollaborators: filtered
+ });
+ }
+ }
+
+ public render() {
+ return <div>
+ <Header />
+ <div className="page ui container">
+ <h2 className="ui header">
+ <i className="circular users icon"></i>
+ <div className="content">
+ Members
+ <div className="sub header">Manage your account administrators and collaborators.</div>
+ </div>
+ </h2>
+
+ <div className="ui grid">
+
+ <div className="eight wide computer sixteen wide mobile column">
+ <div className="ui segment">
+ <h4 className="ui header">Administrators</h4>
+ <p className="info">Administrators have full access to edit and manage content, permissions and settings.</p>
+ <div className="ui middle aligned very relaxed selection list">
+ { this.state.administrators.map((x) => this.showUser(x, UserRole.Administrator, false, true)) }
+ </div>
+ { this.currentUser.role === UserRole.Administrator && <div className="ui mini form">
+ <p>Add new administrator</p>
+ <div className="mini field">
+ <input
+ type="text"
+ value={this.state.newAdministratorFilter}
+ onChange={(x) => this.filterVisitors('administrator', x.currentTarget.value)}
+ placeholder="Search users by name"
+ />
+ </div>
+ <div className="ui middle aligned very relaxed selection list">
+ { this.state.filteredNewAdministrators.map((x) => this.showUser(x, UserRole.Administrator, true, false)) }
+ </div>
+ {
+ this.state.newAdministratorFilter &&
+ this.state.filteredNewAdministrators.length === 0 &&
+ <p className="info">No users to show.</p>
+ }
+ </div> }
+ </div>
+ </div>
+
+ <div className="eight wide computer sixteen wide mobile column">
+ <div className="ui segment">
+ <h4 className="ui header">Collaborators</h4>
+ <p className="info">Collaborators can edit and manage content, but not permissions and settings.</p>
+ <div className="ui middle aligned very relaxed selection list">
+ { this.state.collaborators.map((x) => this.showUser(x, UserRole.Collaborator, false, true)) }
+ </div>
+ { this.currentUser.role === UserRole.Administrator && <div className="ui mini form">
+ <p>Add new collaborator</p>
+ <div className="mini field">
+ <input
+ type="text"
+ value={this.state.newCollaboratorFilter}
+ onChange={(x) => this.filterVisitors('collaborator', x.currentTarget.value)}
+ placeholder="Search users by name"
+ />
+ </div>
+ <div className="ui middle aligned very relaxed selection list">
+ { this.state.filteredNewCollaborators.map((x) => this.showUser(x, UserRole.Collaborator, true, false)) }
+ </div>
+ {
+ this.state.newCollaboratorFilter &&
+ this.state.filteredNewCollaborators.length === 0 &&
+ <p className="info">No users to show.</p>
+ }
+ </div> }
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <Footer />
+ </div>;
+ }
+}
diff --git a/public/pages/site/CompleteSignInProfilePage.tsx b/public/pages/site/CompleteSignInProfilePage.tsx
index c7556e20f..de1e0709c 100644
--- a/public/pages/site/CompleteSignInProfilePage.tsx
+++ b/public/pages/site/CompleteSignInProfilePage.tsx
@@ -61,10 +61,9 @@ export class CompleteSignInProfilePage extends React.Component<{}, CompleteSignI
</div>
</div>;
- // TODO: remove this duplicated id, should use from index.tsx
- return <div id="fdr-home-page">
- { modal }
- <SiteHomePage />
- </div>;
+ return <div>
+ { modal }
+ <SiteHomePage />
+ </div>;
}
}
diff --git a/public/pages/site/ShowIdeaPage.tsx b/public/pages/site/ShowIdeaPage.tsx
index 8fc0ee0a5..ca3546468 100644
--- a/public/pages/site/ShowIdeaPage.tsx
+++ b/public/pages/site/ShowIdeaPage.tsx
@@ -35,7 +35,7 @@ export class ShowIdeaPage extends React.Component<{}, {}> {
const commentsList = this.comments.map((c) =>
<div key={c.id} className="comment">
- <Gravatar name={c.user.name} hash={c.user.gravatar} />
+ <Gravatar user={ c.user } />
<div className="content">
<UserName user={c.user} />
<div className="metadata">
@@ -61,7 +61,7 @@ export class ShowIdeaPage extends React.Component<{}, {}> {
<h1 className="ui header">{ this.idea.title }</h1>
<span className="info">
- Shared <Moment date={this.idea.createdOn} /> by <Gravatar name={ this.idea.user.name } hash={ this.idea.user.gravatar }/> <UserName user={this.idea.user} />
+ Shared <Moment date={this.idea.createdOn} /> by <Gravatar user={ this.idea.user } /> <UserName user={this.idea.user} />
</span>
</div>
</div>
@@ -79,7 +79,7 @@ export class ShowIdeaPage extends React.Component<{}, {}> {
</div>
{
- this.session.isStaff() &&
+ this.session.isCollaborator() &&
<div className="four wide column">
<span className="subtitle">Actions</span>
<br /><br />
diff --git a/public/pages/site/SiteHomePage.tsx b/public/pages/site/SiteHomePage.tsx
index 936392c26..815aa2ac7 100644
--- a/public/pages/site/SiteHomePage.tsx
+++ b/public/pages/site/SiteHomePage.tsx
@@ -16,8 +16,8 @@ interface SiteHomePageState {
}
export class SiteHomePage extends React.Component<{}, SiteHomePageState> {
- private user?: CurrentUser;
- private tenant: Tenant;
+ private user?: CurrentUser;
+ private tenant: Tenant;
private allIdeas: Idea[];
private filter: HTMLDivElement;
private activeFilter: string;
diff --git a/public/pages/site/UserSettingsPage.tsx b/public/pages/site/UserSettingsPage.tsx
index 9b2e3e083..d132af99b 100644
--- a/public/pages/site/UserSettingsPage.tsx
+++ b/public/pages/site/UserSettingsPage.tsx
@@ -41,18 +41,24 @@ export class UserSettingsPage extends React.Component<{}, UserSettingsPageState>
return <div>
<Header />
<div className="page ui container">
- <h1 className="ui header">Settings</h1>
+ <h2 className="ui header">
+ <i className="circular id badge icon"></i>
+ <div className="content">
+ Settings
+ <div className="sub header">Manage your profile settings</div>
+ </div>
+ </h2>
<div className="ui grid">
<div className="eight wide computer sixteen wide mobile column">
<div className="ui form">
<div className="field">
<label htmlFor="email">Avatar</label>
- <p><Gravatar hash={ this.user.gravatar } name={ this.user.name } /></p>
+ <p><Gravatar user={ this.user } /></p>
<div className="info">
<p>
- We use <a href="https://en.gravatar.com/" target="blank">Gravatar</a> to display profile avatars. <br/>
- A letter avatar based on your name is generated for profiles without e-mail.
+ This site uses <a href="https://en.gravatar.com/" target="blank">Gravatar</a> to display profile avatars. <br/>
+ A letter avatar based on your name is generated for profiles without a Gravatar.
</p>
</div>
</div>
diff --git a/public/services/Session.ts b/public/services/Session.ts
index 8bf85ed6a..0b09395ab 100644
--- a/public/services/Session.ts
+++ b/public/services/Session.ts
@@ -5,7 +5,7 @@ export interface Session {
getCurrentUser(): CurrentUser | undefined;
getCurrentTenant(): Tenant;
isAdmin(): boolean;
- isStaff(): boolean;
+ isCollaborator(): boolean;
set<T>(key: string, value: T): void;
get<T>(key: string): T;
getArray<T>(key: string): T[];
@@ -43,7 +43,7 @@ export class BrowserSession implements Session {
return !!user && user.role === 3;
}
- public isStaff(): boolean {
+ public isCollaborator(): boolean {
const user = this.getCurrentUser();
return !!user && user.role >= 2;
}
diff --git a/public/services/TenantService.ts b/public/services/TenantService.ts
index ded6152f3..08e6a6c79 100644
--- a/public/services/TenantService.ts
+++ b/public/services/TenantService.ts
@@ -1,6 +1,6 @@
import { get, post, Result } from '@fider/services/http';
import { injectable } from '@fider/di';
-import { Tenant } from '@fider/models';
+import { Tenant, UserRole } from '@fider/models';
export interface TenantService {
create(request: CreateTenantRequest): Promise<Result<CreateTenantResponse>>;
@@ -8,6 +8,7 @@ export interface TenantService {
checkAvailability(subdomain: string): Promise<Result<CheckAvailabilityResponse>>;
signIn(email: string): Promise<Result>;
completeProfile(key: string, name: string): Promise<Result>;
+ changeRole(userId: number, role: UserRole): Promise<Result>;
}
export interface CheckAvailabilityResponse {
@@ -54,4 +55,10 @@ export class HttpTenantService implements TenantService {
name,
});
}
+
+ public async changeRole(userId: number, role: UserRole): Promise<Result> {
+ return await post(`/api/admin/users/${userId}/role`, {
+ role,
+ });
+ }
}
diff --git a/routes.go b/routes.go
index f5538529b..c7254659d 100644
--- a/routes.go
+++ b/routes.go
@@ -95,9 +95,7 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {
private := page.Group()
{
private.Use(middlewares.IsAuthenticated())
- private.Get("/settings", func(ctx web.Context) error {
- return ctx.Page(web.Map{})
- })
+ private.Get("/settings", handlers.Page())
private.Post("/api/ideas", handlers.PostIdea())
private.Post("/api/ideas/:number/comments", handlers.PostComment())
@@ -106,19 +104,19 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {
private.Post("/api/ideas/:number/unsupport", handlers.RemoveSupporter())
private.Post("/api/user/settings", handlers.UpdateUserSettings())
- private.Use(middlewares.IsAuthorized(models.RoleMember, models.RoleAdministrator))
+ private.Use(middlewares.IsAuthorized(models.RoleAdministrator))
private.Post("/api/admin/settings", handlers.UpdateSettings())
+ private.Post("/api/admin/users/:user_id/role", handlers.ChangeUserRole())
}
admin := page.Group()
{
admin.Use(middlewares.IsAuthenticated())
- admin.Use(middlewares.IsAuthorized(models.RoleMember, models.RoleAdministrator))
+ admin.Use(middlewares.IsAuthorized(models.RoleCollaborator, models.RoleAdministrator))
- admin.Get("/admin", func(ctx web.Context) error {
- return ctx.Page(web.Map{})
- })
+ admin.Get("/admin", handlers.Page())
+ admin.Get("/admin/members", handlers.ManageMembers())
}
}