Revert "[MM-37984] Allow Desktop App to authenticate via external providers outside of the app on supported servers (#23795)" (#24039)

This reverts commit abdf4e58c3.

server/channels/web/oauth.go

@@ -11,7 +11,6 @@ import (
 	"net/url"
 	"path/filepath"
 	"strings"
-	"time"
 
 	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/public/shared/i18n"
@@ -345,29 +344,6 @@ func completeOAuth(c *Context, w http.ResponseWriter, r *http.Request) {
 		} else { // For web
 			c.App.AttachSessionCookies(c.AppContext, w, r)
 		}
-
-		desktopToken := ""
-		if val, ok := props["desktop_token"]; ok {
-			desktopToken = val
-		}
-
-		if desktopToken != "" {
-			desktopTokenErr := c.App.AuthenticateDesktopToken(desktopToken, time.Now().Add(-model.DesktopTokenTTL).Unix(), user)
-			if desktopTokenErr != nil {
-				desktopTokenErr.Translate(c.AppContext.T)
-				c.LogErrorByCode(desktopTokenErr)
-				renderError(desktopTokenErr)
-				return
-			}
-
-			queryString := map[string]string{
-				"desktopAuthComplete": "true",
-			}
-			if val, ok := props["redirect_to"]; ok {
-				queryString["redirect_to"] = val
-			}
-			redirectURL = utils.AppendQueryParamsToURL(c.GetSiteURLHeader()+"/login/desktop", queryString)
-		}
 	}
 
 	w.Header().Set("Content-Type", "text/html; charset=utf-8")
@@ -382,15 +358,6 @@ func loginWithOAuth(c *Context, w http.ResponseWriter, r *http.Request) {
 
 	loginHint := r.URL.Query().Get("login_hint")
 	redirectURL := r.URL.Query().Get("redirect_to")
-	desktopToken := r.URL.Query().Get("desktop_token")
-	if desktopToken != "" {
-		desktopTokenErr := c.App.CreateDesktopToken(desktopToken, time.Now().Unix())
-
-		if desktopTokenErr != nil {
-			c.Err = desktopTokenErr
-			return
-		}
-	}
 
 	if redirectURL != "" && !utils.IsValidWebAuthRedirectURL(c.App.Config(), redirectURL) {
 		c.Err = model.NewAppError("loginWithOAuth", "api.invalid_redirect_url", nil, "", http.StatusBadRequest)
@@ -403,7 +370,7 @@ func loginWithOAuth(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	authURL, err := c.App.GetOAuthLoginEndpoint(w, r, c.Params.Service, teamId, model.OAuthActionLogin, redirectURL, loginHint, false, desktopToken)
+	authURL, err := c.App.GetOAuthLoginEndpoint(w, r, c.Params.Service, teamId, model.OAuthActionLogin, redirectURL, loginHint, false)
 	if err != nil {
 		c.Err = err
 		return
@@ -432,7 +399,7 @@ func mobileLoginWithOAuth(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	authURL, err := c.App.GetOAuthLoginEndpoint(w, r, c.Params.Service, teamId, model.OAuthActionMobile, redirectURL, "", true, "")
+	authURL, err := c.App.GetOAuthLoginEndpoint(w, r, c.Params.Service, teamId, model.OAuthActionMobile, redirectURL, "", true)
 	if err != nil {
 		c.Err = err
 		return
@@ -460,17 +427,7 @@ func signupWithOAuth(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	desktopToken := r.URL.Query().Get("desktop_token")
-	if desktopToken != "" {
-		desktopTokenErr := c.App.CreateDesktopToken(desktopToken, time.Now().Unix())
-
-		if desktopTokenErr != nil {
-			c.Err = desktopTokenErr
-			return
-		}
-	}
-
-	authURL, err := c.App.GetOAuthSignupEndpoint(w, r, c.Params.Service, teamId, desktopToken)
+	authURL, err := c.App.GetOAuthSignupEndpoint(w, r, c.Params.Service, teamId)
 	if err != nil {
 		c.Err = err
 		return

server/channels/web/saml.go

@@ -9,7 +9,6 @@ import (
 	"net/http"
 	"strconv"
 	"strings"
-	"time"
 
 	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/public/shared/mlog"
@@ -60,16 +59,6 @@ func loginWithSaml(c *Context, w http.ResponseWriter, r *http.Request) {
 		relayProps["redirect_to"] = redirectURL
 	}
 
-	desktopToken := r.URL.Query().Get("desktop_token")
-	if desktopToken != "" {
-		desktopTokenErr := c.App.CreateDesktopToken(desktopToken, time.Now().Unix())
-		if desktopTokenErr != nil {
-			c.Err = err
-			return
-		}
-		relayProps["desktop_token"] = desktopToken
-	}
-
 	relayProps[model.UserAuthServiceIsMobile] = strconv.FormatBool(isMobile)
 
 	if len(relayProps) > 0 {
@@ -196,26 +185,6 @@ func completeSaml(c *Context, w http.ResponseWriter, r *http.Request) {
 
 	c.App.AttachSessionCookies(c.AppContext, w, r)
 
-	desktopToken := relayProps["desktop_token"]
-	if desktopToken != "" {
-		desktopTokenErr := c.App.AuthenticateDesktopToken(desktopToken, time.Now().Add(-model.DesktopTokenTTL).Unix(), user)
-		if desktopTokenErr != nil {
-			handleError(desktopTokenErr)
-			return
-		}
-
-		queryString := map[string]string{
-			"desktopAuthComplete": "true",
-		}
-		if val, ok := relayProps["redirect_to"]; ok {
-			queryString["redirect_to"] = val
-		}
-
-		redirectURL = utils.AppendQueryParamsToURL(c.GetSiteURLHeader()+"/login/desktop", queryString)
-		http.Redirect(w, r, redirectURL, http.StatusFound)
-		return
-	}
-
 	if hasRedirectURL {
 		if isMobile {
 			// Mobile clients with redirect url support