@@ -826,6 +826,9 @@ export class WorkspaceStarter {
826
826
}
827
827
//#endregion
828
828
829
+ const billingTier = await this . entitlementService . getBillingTier ( user ) ;
830
+ const userTeams = await this . teamDB . findTeamsByUser ( user . id ) ;
831
+
829
832
let featureFlags : NamedWorkspaceFeatureFlag [ ] = workspace . config . _featureFlags || [ ] ;
830
833
featureFlags = featureFlags . concat ( this . config . workspaceDefaults . defaultFeatureFlags ) ;
831
834
if ( user . featureFlags && user . featureFlags . permanentWSFeatureFlags ) {
@@ -840,7 +843,13 @@ export class WorkspaceStarter {
840
843
) ;
841
844
}
842
845
843
- if ( await getExperimentsClientForBackend ( ) . getValueAsync ( "protected_secrets" , false , { user } ) ) {
846
+ if (
847
+ await getExperimentsClientForBackend ( ) . getValueAsync ( "protected_secrets" , false , {
848
+ user,
849
+ teams : userTeams ,
850
+ billingTier,
851
+ } )
852
+ ) {
844
853
// We roll out the protected secrets feature using a ConfigCat feature flag, to ensure
845
854
// a smooth, gradual roll out without breaking users.
846
855
featureFlags = featureFlags . concat ( [ "protected_secrets" ] ) ;
@@ -859,11 +868,10 @@ export class WorkspaceStarter {
859
868
}
860
869
}
861
870
862
- const userTeams = await this . teamDB . findTeamsByUser ( user . id ) ;
863
871
const wsConnectionLimitingEnabled = await getExperimentsClientForBackend ( ) . getValueAsync (
864
872
"workspace_connection_limiting" ,
865
873
false ,
866
- { user, teams : userTeams } ,
874
+ { user, teams : userTeams , billingTier } ,
867
875
) ;
868
876
if ( wsConnectionLimitingEnabled ) {
869
877
const shouldLimitNetworkConnections = await this . entitlementService . limitNetworkConnections (
@@ -879,6 +887,7 @@ export class WorkspaceStarter {
879
887
let classesEnabled = await getExperimentsClientForBackend ( ) . getValueAsync ( "workspace_classes" , false , {
880
888
user,
881
889
teams : userTeams ,
890
+ billingTier,
882
891
} ) ;
883
892
const usageAttributionId = await this . userService . getWorkspaceUsageAttributionId ( user , workspace . projectId ) ;
884
893
const billingMode = await this . billingModes . getBillingMode ( usageAttributionId , new Date ( ) ) ;
0 commit comments