MM-52981, MM-53559: Streamlined in-product marketplace (#24311)

server/channels/app/plugin.go

@@ -552,7 +552,7 @@ func (a *App) GetPlugins() (*model.PluginsResponse, *model.AppError) {
 func (a *App) GetMarketplacePlugins(filter *model.MarketplacePluginFilter) ([]*model.MarketplacePlugin, *model.AppError) {
 	plugins := map[string]*model.MarketplacePlugin{}
 
-	if *a.Config().PluginSettings.EnableRemoteMarketplace && !filter.LocalOnly {
+	if *a.Config().PluginSettings.EnableRemoteMarketplace && !a.Config().FeatureFlags.StreamlinedMarketplace && !filter.LocalOnly {
 		p, appErr := a.getRemotePlugins()
 		if appErr != nil {
 			return nil, appErr
@@ -561,20 +561,12 @@ func (a *App) GetMarketplacePlugins(filter *model.MarketplacePluginFilter) ([]*m
 	}
 
 	if !filter.RemoteOnly {
-		// Some plugin don't work on cloud. The remote Marketplace is aware of this fact,
-		// but prepackaged plugins are not. Hence, on a cloud installation prepackaged plugins
-		// shouldn't be shown in the Marketplace modal.
-		// This is a short term fix. The long term solution is to have a separate set of
-		// prepacked plugins for cloud: https://mattermost.atlassian.net/browse/MM-31331.
-		license := a.Srv().License()
-		if license == nil || !license.IsCloud() {
-			appErr := a.mergePrepackagedPlugins(plugins)
-			if appErr != nil {
-				return nil, appErr
-			}
+		appErr := a.mergePrepackagedPlugins(plugins)
+		if appErr != nil {
+			return nil, appErr
 		}
 
-		appErr := a.mergeLocalPlugins(plugins)
+		appErr = a.mergeLocalPlugins(plugins)
 		if appErr != nil {
 			return nil, appErr
 		}

server/channels/app/plugin_install.go

@@ -289,7 +289,7 @@ func (ch *Channels) InstallMarketplacePlugin(request *model.InstallMarketplacePl
 		signatureFile = bytes.NewReader(prepackagedPlugin.Signature)
 	}
 
-	if *ch.cfgSvc.Config().PluginSettings.EnableRemoteMarketplace {
+	if *ch.cfgSvc.Config().PluginSettings.EnableRemoteMarketplace && !ch.cfgSvc.Config().FeatureFlags.StreamlinedMarketplace {
 		var plugin *model.BaseMarketplacePlugin
 		plugin, appErr = ch.getRemoteMarketplacePlugin(request.Id, request.Version)
 		// The plugin might only be prepackaged and not on the Marketplace.