Skip to content

Commit

Permalink
Enable desktop access in Web UI in Cloud clusters (#10970)
Browse files Browse the repository at this point in the history
  • Loading branch information
bernardjkim authored Mar 9, 2022
1 parent 124ff22 commit edce7ec
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
3 changes: 0 additions & 3 deletions lib/web/ui/usercontext.go
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,6 @@ func NewUserContext(user types.User, userRoles services.RoleSet, features proto.
var billingAccess access
if features.Cloud {
billingAccess = newAccess(userRoles, ctx, types.KindBilling)

// disable access to preview features
desktopAccess = access{}
}

logins := getLogins(userRoles)
Expand Down
3 changes: 1 addition & 2 deletions lib/web/ui/usercontext_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ func (s *UserContextSuite) TestNewUserContextCloud(c *check.C) {
roleSet := []types.Role{role}

allowed := access{true, true, true, true, true}
denied := access{false, false, false, false, false}

userContext, err := NewUserContext(user, roleSet, proto.Features{Cloud: true}, true)
c.Assert(err, check.IsNil)
Expand Down Expand Up @@ -186,5 +185,5 @@ func (s *UserContextSuite) TestNewUserContextCloud(c *check.C) {

// cloud-specific asserts
c.Assert(userContext.ACL.Billing, check.DeepEquals, allowed)
c.Assert(userContext.ACL.Desktops, check.DeepEquals, denied)
c.Assert(userContext.ACL.Desktops, check.DeepEquals, allowed)
}

0 comments on commit edce7ec

Please sign in to comment.