Add all features property

kylecarbs · kylecarbs · commit 86b28abac6d9 · 2022-10-06T23:29:49.000Z
diff --git a/enterprise/coderd/coderdenttest/coderdenttest.go b/enterprise/coderd/coderdenttest/coderdenttest.go
@@ -88,6 +88,7 @@ type LicenseOptions struct {
 	AccountType    string
 	AccountID      string
 	Trial          bool
+	AllFeatures    bool
 	GraceAt        time.Time
 	ExpiresAt      time.Time
 	UserLimit      int64
@@ -143,6 +144,7 @@ func GenerateLicense(t *testing.T, options LicenseOptions) string {
 		AccountID:      options.AccountID,
 		Trial:          options.Trial,
 		Version:        license.CurrentVersion,
+		AllFeatures:    options.AllFeatures,
 		Features: license.Features{
 			UserLimit:      options.UserLimit,
 			AuditLog:       auditLog,
diff --git a/enterprise/coderd/license/license.go b/enterprise/coderd/license/license.go
@@ -41,6 +41,8 @@ func Entitlements(ctx context.Context, db database.Store, logger slog.Logger, ke
 		return entitlements, xerrors.Errorf("query active user count: %w", err)
 	}
 
+	allFeatures := false
+
 	// Here we loop through licenses to detect enabled features.
 	for _, l := range licenses {
 		claims, err := validateDBLicense(l, keys)
@@ -94,9 +96,12 @@ func Entitlements(ctx context.Context, db database.Store, logger slog.Logger, ke
 				Enabled:     enablements[codersdk.FeatureWorkspaceQuota],
 			}
 		}
+		if claims.AllFeatures {
+			allFeatures = true
+		}
 	}
 
-	if entitlements.Trial {
+	if allFeatures {
 		for _, featureName := range codersdk.FeatureNames {
 			// No user limit!
 			if featureName == codersdk.FeatureUserLimit {
@@ -171,6 +176,7 @@ type Claims struct {
 	AccountType    string           `json:"account_type,omitempty"`
 	AccountID      string           `json:"account_id,omitempty"`
 	Trial          bool             `json:"trial"`
+	AllFeatures    bool             `json:"all_features"`
 	Version        uint64           `json:"version"`
 	Features       Features         `json:"features"`
 }
diff --git a/enterprise/coderd/license/license_test.go b/enterprise/coderd/license/license_test.go
@@ -165,19 +165,19 @@ func TestEntitlements(t *testing.T) {
 		require.False(t, entitlements.Trial)
 	})
 
-	t.Run("TrialEntitledAll", func(t *testing.T) {
+	t.Run("AllFeatures", func(t *testing.T) {
 		t.Parallel()
 		db := databasefake.New()
 		db.InsertLicense(context.Background(), database.InsertLicenseParams{
 			Exp: time.Now().Add(time.Hour),
 			JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
-				Trial: true,
+				AllFeatures: true,
 			}),
 		})
 		entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, coderdenttest.Keys, all)
 		require.NoError(t, err)
 		require.True(t, entitlements.HasLicense)
-		require.True(t, entitlements.Trial)
+		require.False(t, entitlements.Trial)
 		for _, featureName := range codersdk.FeatureNames {
 			if featureName == codersdk.FeatureUserLimit {
 				continue
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -30,6 +30,7 @@ export const defaultEntitlements = (): TypesGen.Entitlements => {
     has_license: false,
     warnings: [],
     experimental: false,
+    trial: false,
   }
 }
 
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -777,12 +777,14 @@ export const MockEntitlements: TypesGen.Entitlements = {
   has_license: false,
   features: {},
   experimental: false,
+  trial: false,
 }
 
 export const MockEntitlementsWithWarnings: TypesGen.Entitlements = {
   warnings: ["You are over your active user limit.", "And another thing."],
   has_license: true,
   experimental: false,
+  trial: false,
   features: {
     user_limit: {
       enabled: true,
@@ -805,6 +807,7 @@ export const MockEntitlementsWithAuditLog: TypesGen.Entitlements = {
   warnings: [],
   has_license: true,
   experimental: false,
+  trial: false,
   features: {
     audit_log: {
       enabled: true,
diff --git a/site/src/xServices/entitlements/entitlementsXService.ts b/site/src/xServices/entitlements/entitlementsXService.ts
@@ -24,6 +24,7 @@ const emptyEntitlements = {
   features: {},
   has_license: false,
   experimental: false,
+  trial: false,
 }
 
 export const entitlementsMachine = createMachine(

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ func Entitlements(ctx context.Context, db database.Store, logger slog.Logger, ke`
`41`	`41`	`return entitlements, xerrors.Errorf("query active user count: %w", err)`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ allFeatures := false`
	`45`	`+`
`44`	`46`	`// Here we loop through licenses to detect enabled features.`
`45`	`47`	`for _, l := range licenses {`
`46`	`48`	`claims, err := validateDBLicense(l, keys)`
`@@ -94,9 +96,12 @@ func Entitlements(ctx context.Context, db database.Store, logger slog.Logger, ke`
`94`	`96`	`Enabled: enablements[codersdk.FeatureWorkspaceQuota],`
`95`	`97`	`}`
`96`	`98`	`}`
	`99`	`+ if claims.AllFeatures {`
	`100`	`+ allFeatures = true`
	`101`	`+ }`
`97`	`102`	`}`
`98`	`103`
`99`		`- if entitlements.Trial {`
	`104`	`+ if allFeatures {`
`100`	`105`	`for _, featureName := range codersdk.FeatureNames {`
`101`	`106`	`// No user limit!`
`102`	`107`	`if featureName == codersdk.FeatureUserLimit {`
`@@ -171,6 +176,7 @@ type Claims struct {`
`171`	`176`	AccountType string `json:"account_type,omitempty"`
`172`	`177`	AccountID string `json:"account_id,omitempty"`
`173`	`178`	Trial bool `json:"trial"`
	`179`	+ AllFeatures bool `json:"all_features"`
`174`	`180`	Version uint64 `json:"version"`
`175`	`181`	Features Features `json:"features"`
`176`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ export const defaultEntitlements = (): TypesGen.Entitlements => {`
`30`	`30`	`has_license: false,`
`31`	`31`	`warnings: [],`
`32`	`32`	`experimental: false,`
	`33`	`+ trial: false,`
`33`	`34`	`}`
`34`	`35`	`}`
`35`	`36`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ const emptyEntitlements = {`
`24`	`24`	`features: {},`
`25`	`25`	`has_license: false,`
`26`	`26`	`experimental: false,`
	`27`	`+ trial: false,`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`export const entitlementsMachine = createMachine(`