fix: set default type for namespace creation as 'team'

shellhub-io · Nov 20, 2024 · e9b5ed2 · e9b5ed2
1 parent fe07bcc
commit e9b5ed2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 29 deletions.
diff --git a/api/services/namespace_test.go b/api/services/namespace_test.go
@@ -80,7 +80,7 @@ func TestListNamespaces(t *testing.T) {
 								Name:     "group1",
 								Owner:    "66ffe0745a82ba5c4fe842ac",
 								TenantID: "a736a52b-5777-4f92-b0b8-e359bf484713",
-								Type:     models.TypePersonal,
+								Type:     models.TypeTeam,
 								Members: []models.Member{
 									{
 										ID:    "66ffe0745a82ba5c4fe842ac",
@@ -93,7 +93,7 @@ func TestListNamespaces(t *testing.T) {
 								Name:     "group2",
 								Owner:    "66ffe0745a82ba5c4fe842ac",
 								TenantID: "a736a52b-5777-4f92-b0b8-e359bf48471i4",
-								Type:     models.TypePersonal,
+								Type:     models.TypeTeam,
 								Members: []models.Member{
 									{
 										ID:    "66ffe0745a82ba5c4fe842ac",
@@ -137,7 +137,7 @@ func TestListNamespaces(t *testing.T) {
 						Name:     "group1",
 						Owner:    "66ffe0745a82ba5c4fe842ac",
 						TenantID: "a736a52b-5777-4f92-b0b8-e359bf484713",
-						Type:     models.TypePersonal,
+						Type:     models.TypeTeam,
 						Members: []models.Member{
 							{
 								ID:    "66ffe0745a82ba5c4fe842ac",
@@ -150,7 +150,7 @@ func TestListNamespaces(t *testing.T) {
 						Name:     "group2",
 						Owner:    "66ffe0745a82ba5c4fe842ac",
 						TenantID: "a736a52b-5777-4f92-b0b8-e359bf48471i4",
-						Type:     models.TypePersonal,
+						Type:     models.TypeTeam,
 						Members: []models.Member{
 							{
 								ID:    "66ffe0745a82ba5c4fe842ac",
@@ -281,7 +281,7 @@ func TestGetNamespace(t *testing.T) {
 			},
 		},
 		{
-			description: "succeeds - personal",
+			description: "succeeds - personal (with have changed to team temporarily)",
 			tenantID:    "00000000-0000-4000-0000-000000000000",
 			requiredMocks: func() {
 				queryOptionsMock.On("CountAcceptedDevices").Return(nil).Once()
@@ -300,7 +300,7 @@ func TestGetNamespace(t *testing.T) {
 									Email: "john.doe@test.com",
 								},
 							},
-							Type: models.TypePersonal,
+							Type: models.TypeTeam,
 						},
 						nil,
 					).
@@ -318,7 +318,7 @@ func TestGetNamespace(t *testing.T) {
 							Email: "john.doe@test.com",
 						},
 					},
-					Type: models.TypePersonal,
+					Type: models.TypeTeam,
 				},
 				err: nil,
 			},
@@ -556,7 +556,7 @@ func TestCreateNamespace(t *testing.T) {
 							TenantID: "00000000-0000-4000-0000-000000000000",
 							Name:     "namespace",
 							Owner:    "000000000000000000000000",
-							Type:     models.TypePersonal,
+							Type:     models.TypeTeam,
 							Members: []models.Member{
 								{
 									ID:      "000000000000000000000000",
@@ -633,7 +633,7 @@ func TestCreateNamespace(t *testing.T) {
 							TenantID: "00000000-0000-4000-0000-000000000000",
 							Name:     "namespace",
 							Owner:    "000000000000000000000000",
-							Type:     models.TypePersonal,
+							Type:     models.TypeTeam,
 							Members: []models.Member{
 								{
 									ID:      "000000000000000000000000",
@@ -654,7 +654,7 @@ func TestCreateNamespace(t *testing.T) {
 							TenantID: "00000000-0000-4000-0000-000000000000",
 							Name:     "namespace",
 							Owner:    "000000000000000000000000",
-							Type:     models.TypePersonal,
+							Type:     models.TypeTeam,
 							Members: []models.Member{
 								{
 									ID:      "000000000000000000000000",
@@ -678,7 +678,7 @@ func TestCreateNamespace(t *testing.T) {
 					TenantID: "00000000-0000-4000-0000-000000000000",
 					Name:     "namespace",
 					Owner:    "000000000000000000000000",
-					Type:     models.TypePersonal,
+					Type:     models.TypeTeam,
 					Members: []models.Member{
 						{
 							ID:      "000000000000000000000000",
@@ -753,7 +753,7 @@ func TestCreateNamespace(t *testing.T) {
 							TenantID: "4de9253f-4a2a-49e7-a748-26e7a009bd2e",
 							Name:     "namespace",
 							Owner:    "000000000000000000000000",
-							Type:     models.TypePersonal,
+							Type:     models.TypeTeam,
 							Members: []models.Member{
 								{
 									ID:      "000000000000000000000000",
@@ -774,7 +774,7 @@ func TestCreateNamespace(t *testing.T) {
 							TenantID: "00000000-0000-4000-0000-000000000000",
 							Name:     "namespace",
 							Owner:    "000000000000000000000000",
-							Type:     models.TypePersonal,
+							Type:     models.TypeTeam,
 							Members: []models.Member{
 								{
 									ID:      "000000000000000000000000",
@@ -798,7 +798,7 @@ func TestCreateNamespace(t *testing.T) {
 					TenantID: "4de9253f-4a2a-49e7-a748-26e7a009bd2e",
 					Name:     "namespace",
 					Owner:    "000000000000000000000000",
-					Type:     models.TypePersonal,
+					Type:     models.TypeTeam,
 					Members: []models.Member{
 						{
 							ID:      "000000000000000000000000",
@@ -883,7 +883,7 @@ func TestCreateNamespace(t *testing.T) {
 								SessionRecord:          true,
 								ConnectionAnnouncement: "",
 							},
-							MaxDevices: 3,
+							MaxDevices: -1,
 						},
 					).
 					Return(
@@ -928,7 +928,7 @@ func TestCreateNamespace(t *testing.T) {
 						SessionRecord:          true,
 						ConnectionAnnouncement: "",
 					},
-					MaxDevices: 3,
+					MaxDevices: -1,
 				},
 				err: nil,
 			},
@@ -1008,7 +1008,7 @@ func TestCreateNamespace(t *testing.T) {
 							TenantID: "00000000-0000-4000-0000-000000000000",
 							Name:     "namespace",
 							Owner:    "000000000000000000000000",
-							Type:     models.TypePersonal,
+							Type:     models.TypeTeam,
 							Members: []models.Member{
 								{
 									ID:      "000000000000000000000000",

diff --git a/cli/services/namespaces_test.go b/cli/services/namespaces_test.go
@@ -102,7 +102,7 @@ func TestNamespaceCreate(t *testing.T) {
 					Name:     "namespace",
 					Owner:    "507f191e810c19729de860ea",
 					TenantID: "00000000-0000-0000-0000-000000000000",
-					Type:     models.TypePersonal,
+					Type:     models.TypeTeam,
 					Members: []models.Member{
 						{
 							ID:      "507f191e810c19729de860ea",
@@ -146,7 +146,7 @@ func TestNamespaceCreate(t *testing.T) {
 					Name:     "namespace",
 					Owner:    "507f191e810c19729de860ea",
 					TenantID: "00000000-0000-0000-0000-000000000000",
-					Type:     models.TypePersonal,
+					Type:     models.TypeTeam,
 					Members: []models.Member{
 						{
 							ID:      "507f191e810c19729de860ea",
@@ -168,7 +168,7 @@ func TestNamespaceCreate(t *testing.T) {
 				Name:     "namespace",
 				Owner:    "507f191e810c19729de860ea",
 				TenantID: "00000000-0000-0000-0000-000000000000",
-				Type:     models.TypePersonal,
+				Type:     models.TypeTeam,
 				Members: []models.Member{
 					{
 						ID:      "507f191e810c19729de860ea",
@@ -398,7 +398,7 @@ func TestNamespaceCreate(t *testing.T) {
 					Name:     "namespace",
 					Owner:    "507f191e810c19729de860ea",
 					TenantID: "00000000-0000-0000-0000-000000000000",
-					Type:     models.TypePersonal,
+					Type:     models.TypeTeam,
 					Members: []models.Member{
 						{
 							ID:      "507f191e810c19729de860ea",
@@ -420,7 +420,7 @@ func TestNamespaceCreate(t *testing.T) {
 				Name:     "namespace",
 				Owner:    "507f191e810c19729de860ea",
 				TenantID: "00000000-0000-0000-0000-000000000000",
-				Type:     models.TypePersonal,
+				Type:     models.TypeTeam,
 				Members: []models.Member{
 					{
 						ID:      "507f191e810c19729de860ea",

diff --git a/pkg/models/type.go b/pkg/models/type.go
@@ -1,7 +1,5 @@
 package models
 
-import env "github.com/shellhub-io/shellhub/pkg/envs"
-
 type Type string
 
 const (
@@ -10,11 +8,7 @@ const (
 )
 
 func NewDefaultType() Type {
-	if env.IsCloud() {
-		return TypeTeam
-	}
-
-	return TypePersonal
+	return TypeTeam
 }
 
 func IsTypeTeam(typeNamespace string) bool {