Revert "[MM-48626] Move plugins environment out of Channels (#21730)" (#21934)

api4/plugin.go

@@ -155,7 +155,7 @@ func installMarketplacePlugin(c *Context, w http.ResponseWriter, r *http.Request
 	// https://mattermost.atlassian.net/browse/MM-41981
 	pluginRequest.Version = ""
 
-	manifest, appErr := c.App.PluginService().InstallMarketplacePlugin(pluginRequest)
+	manifest, appErr := c.App.Channels().InstallMarketplacePlugin(pluginRequest)
 	if appErr != nil {
 		c.Err = appErr
 		return
@@ -235,7 +235,7 @@ func removePlugin(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err := c.App.PluginService().RemovePlugin(c.Params.PluginId)
+	err := c.App.Channels().RemovePlugin(c.Params.PluginId)
 	if err != nil {
 		c.Err = err
 		return

api4/plugin_test.go

@@ -94,7 +94,7 @@ func TestPlugin(t *testing.T) {
 			assert.Equal(t, "testplugin", manifest.Id)
 		})
 
-		th.App.PluginService().RemovePlugin(manifest.Id)
+		th.App.Channels().RemovePlugin(manifest.Id)
 
 		th.App.UpdateConfig(func(cfg *model.Config) { *cfg.PluginSettings.Enable = false })
 

api4/websocket.go

@@ -61,7 +61,7 @@ func connectWebSocket(c *Context, w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	wc := c.App.Srv().Platform().NewWebConn(cfg, c.App, c.App.Srv())
+	wc := c.App.Srv().Platform().NewWebConn(cfg, c.App, c.App.Srv().Channels())
 	if c.AppContext.Session().UserId != "" {
 		c.App.Srv().Platform().HubRegister(wc)
 	}