From 758116f3e3e7d7dd399f0e2e9f3d1145daf79268 Mon Sep 17 00:00:00 2001
From: Ben Schumacher <ben.schumacher@mattermost.com>
Date: Tue, 3 Aug 2021 18:52:14 +0200
Subject: [PATCH] [M-36899] Remove deprecated SourcePluginId (#17884)

---
 app/plugin_requests.go | 5 ++---
 plugin/context.go      | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/plugin_requests.go b/app/plugin_requests.go
index fbc92b43d2..b6a5305829 100644
--- a/app/plugin_requests.go
+++ b/app/plugin_requests.go
@@ -69,9 +69,8 @@ func (a *App) ServeInterPluginRequest(w http.ResponseWriter, r *http.Request, so
 	}
 
 	context := &plugin.Context{
-		RequestId:      model.NewId(),
-		UserAgent:      r.UserAgent(),
-		SourcePluginId: sourcePluginId,
+		RequestId: model.NewId(),
+		UserAgent: r.UserAgent(),
 	}
 
 	r.Header.Set("Mattermost-Plugin-ID", sourcePluginId)
diff --git a/plugin/context.go b/plugin/context.go
index d8fa94f645..288739e7c3 100644
--- a/plugin/context.go
+++ b/plugin/context.go
@@ -12,5 +12,4 @@ type Context struct {
 	IpAddress      string
 	AcceptLanguage string
 	UserAgent      string
-	SourcePluginId string // Deprecated: Use the "Mattermost-Plugin-ID" HTTP header instead
 }