[CLD-7567] Deprecate Self Serve: Second Pass (#26853)

* Deprecate Self Serve: First Pass

* Fix ci

* Fix more ci

* Remmove outdated server tests

* Fix a missed spot opening purchase modal in Self Hosted

* Fix i18n

* Clean up some more server code, fix webapp test

* Fix alignment of button

* Fix linter

* Fix i18n server side

* Deprecate in product true up

* Add back translation

* Remove client functions

* Put back client functions

* webapp deprecation

* Deprecate Self Serve: Second Pass

* Fix various pipeline issues

* Fix linter

* Fix pipelines

* Fix handlers_test.go

* Fix console.error around hostedCustomer in reducer

* PICKY LINTER PLEASE

* Fix webapp tests, various other fixes for the CI pipelines

* Fix i18n

* Updates to accomadate enterprise code removal

* Fix mocks

* More removal

* Fix

* Adjustments from PR

* Fixes for QA Feedback

* Update

* Add migrations to remove true up review history

* Fix migrations check

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
Co-authored-by: maria.nunez <maria.nunez@mattermost.com>

server/channels/api4/cloud.go

@@ -35,7 +35,6 @@ func (api *API) InitCloud() {
 	api.BaseRoutes.Cloud.Handle("/subscription", api.APISessionRequired(getSubscription)).Methods("GET")
 	api.BaseRoutes.Cloud.Handle("/subscription/invoices", api.APISessionRequired(getInvoicesForSubscription)).Methods("GET")
 	api.BaseRoutes.Cloud.Handle("/subscription/invoices/{invoice_id:[_A-Za-z0-9]+}/pdf", api.APISessionRequired(getSubscriptionInvoicePDF)).Methods("GET")
-	api.BaseRoutes.Cloud.Handle("/subscription/self-serve-status", api.APISessionRequired(getLicenseSelfServeStatus)).Methods("GET")
 
 	// GET /api/v4/cloud/validate-business-email
 	api.BaseRoutes.Cloud.Handle("/validate-business-email", api.APISessionRequired(validateBusinessEmail)).Methods("POST")
@@ -378,40 +377,6 @@ func getInstallation(c *Context, w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-// getLicenseSelfServeStatus makes check for the license in the CWS self-serve portal and establishes if the license is renewable, expandable etc.
-func getLicenseSelfServeStatus(c *Context, w http.ResponseWriter, r *http.Request) {
-	ensured := ensureCloudInterface(c, "Api4.getLicenseSelfServeStatus")
-	if !ensured {
-		return
-	}
-
-	if !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageLicenseInformation) {
-		c.SetPermissionError(model.PermissionManageLicenseInformation)
-		return
-	}
-
-	_, token, err := c.App.Srv().GenerateLicenseRenewalLink()
-
-	if err != nil {
-		c.Err = err
-		return
-	}
-
-	status, cloudErr := c.App.Cloud().GetLicenseSelfServeStatus(c.AppContext.Session().UserId, token)
-	if cloudErr != nil {
-		c.Err = model.NewAppError("Api4.getLicenseSelfServeStatus", "api.cloud.request_error", nil, "", http.StatusInternalServerError).Wrap(cloudErr)
-		return
-	}
-
-	json, jsonErr := json.Marshal(status)
-	if jsonErr != nil {
-		c.Err = model.NewAppError("Api4.getLicenseSelfServeStatus", "api.cloud.app_error", nil, "", http.StatusInternalServerError).Wrap(jsonErr)
-		return
-	}
-
-	w.Write(json)
-}
-
 func updateCloudCustomer(c *Context, w http.ResponseWriter, r *http.Request) {
 	ensured := ensureCloudInterface(c, "Api4.updateCloudCustomer")
 	if !ensured {

server/channels/api4/license.go

@@ -5,9 +5,7 @@ package api4
 
 import (
 	"bytes"
-	b64 "encoding/base64"
 	"encoding/json"
-	"fmt"
 	"io"
 	"net/http"
 
@@ -23,10 +21,7 @@ func (api *API) InitLicense() {
 	api.BaseRoutes.APIRoot.Handle("/trial-license/prev", api.APISessionRequired(getPrevTrialLicense)).Methods("GET")
 	api.BaseRoutes.APIRoot.Handle("/license", api.APISessionRequired(addLicense, handlerParamFileAPI)).Methods("POST")
 	api.BaseRoutes.APIRoot.Handle("/license", api.APISessionRequired(removeLicense)).Methods("DELETE")
-	api.BaseRoutes.APIRoot.Handle("/license/renewal", api.APISessionRequired(requestRenewalLink)).Methods("GET")
 	api.BaseRoutes.APIRoot.Handle("/license/client", api.APIHandler(getClientLicense)).Methods("GET")
-	api.BaseRoutes.APIRoot.Handle("/license/review", api.APISessionRequired(requestTrueUpReview)).Methods("POST")
-	api.BaseRoutes.APIRoot.Handle("/license/review/status", api.APISessionRequired(trueUpReviewStatus)).Methods("GET")
 }
 
 func getClientLicense(c *Context, w http.ResponseWriter, r *http.Request) {
@@ -238,54 +233,6 @@ func requestTrialLicense(c *Context, w http.ResponseWriter, r *http.Request) {
 	ReturnStatusOK(w)
 }
 
-func requestRenewalLink(c *Context, w http.ResponseWriter, r *http.Request) {
-	auditRec := c.MakeAuditRecord("requestRenewalLink", audit.Fail)
-	defer c.LogAuditRec(auditRec)
-	c.LogAudit("attempt")
-
-	if !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageLicenseInformation) {
-		c.SetPermissionError(model.PermissionManageLicenseInformation)
-		return
-	}
-
-	if *c.App.Config().ExperimentalSettings.RestrictSystemAdmin {
-		c.Err = model.NewAppError("requestRenewalLink", "api.restricted_system_admin", nil, "", http.StatusForbidden)
-		return
-	}
-
-	renewalLink, token, err := c.App.Srv().GenerateLicenseRenewalLink()
-	if err != nil {
-		c.Err = err
-		return
-	}
-
-	if c.App.Cloud() == nil {
-		c.Err = model.NewAppError("requestRenewalLink", "api.license.upgrade_needed.app_error", nil, "", http.StatusForbidden)
-		return
-	}
-
-	// check if it is possible to renew license on the portal with generated token
-	status, e := c.App.Cloud().GetLicenseSelfServeStatus(c.AppContext.Session().UserId, token)
-	if e != nil {
-		c.Err = model.NewAppError("requestRenewalLink", "api.license.request_renewal_link.cannot_renew_on_cws", nil, "", http.StatusInternalServerError).Wrap(e)
-		return
-	}
-
-	if !status.IsRenewable {
-		c.Err = model.NewAppError("requestRenewalLink", "api.license.request_renewal_link.cannot_renew_on_cws", nil, "License is not self-serve renewable", http.StatusBadRequest)
-		return
-	}
-
-	auditRec.Success()
-	c.LogAudit("success")
-
-	_, werr := w.Write([]byte(fmt.Sprintf(`{"renewal_link": "%s"}`, renewalLink)))
-	if werr != nil {
-		c.Err = model.NewAppError("requestRenewalLink", "api.license.request_renewal_link.app_error", nil, "", http.StatusForbidden).Wrap(werr)
-		return
-	}
-}
-
 func getPrevTrialLicense(c *Context, w http.ResponseWriter, r *http.Request) {
 	if c.App.Srv().Platform().LicenseManager() == nil {
 		c.Err = model.NewAppError("getPrevTrialLicense", "api.license.upgrade_needed.app_error", nil, "", http.StatusForbidden)
@@ -308,102 +255,3 @@ func getPrevTrialLicense(c *Context, w http.ResponseWriter, r *http.Request) {
 
 	w.Write([]byte(model.MapToJSON(clientLicense)))
 }
-
-func requestTrueUpReview(c *Context, w http.ResponseWriter, r *http.Request) {
-	// Only admins can request a true up review.
-	if !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageSystem) {
-		c.SetPermissionError(model.PermissionManageLicenseInformation)
-		return
-	}
-
-	license := c.App.Channels().License()
-	if license == nil {
-		c.Err = model.NewAppError("requestTrueUpReview", "api.license.true_up_review.license_required", nil, "", http.StatusNotImplemented)
-		return
-	}
-
-	if license.IsCloud() {
-		c.Err = model.NewAppError("requestTrueUpReview", "api.license.true_up_review.not_allowed_for_cloud", nil, "", http.StatusNotImplemented)
-		return
-	}
-
-	status, appErr := c.App.GetOrCreateTrueUpReviewStatus(c.AppContext)
-	if appErr != nil {
-		c.Err = appErr
-		return
-	}
-
-	// If a true up review has already been submitted for the current due date, complete the request
-	// with no errors.
-	if status.Completed {
-		ReturnStatusOK(w)
-	}
-
-	profileMap, err := c.App.GetTrueUpProfile()
-	if err != nil {
-		c.Err = model.NewAppError("requestTrueUpReview", "api.license.true_up_review.get_status_error", nil, "", http.StatusInternalServerError)
-		return
-	}
-
-	profileMapJson, err := json.Marshal(profileMap)
-	if err != nil {
-		c.SetJSONEncodingError(err)
-		return
-	}
-
-	// Only report the true up review to CWS if the connection is available.
-	if err := c.App.Cloud().CheckCWSConnection(c.AppContext.Session().UserId); err == nil {
-		err = c.App.Cloud().SubmitTrueUpReview(c.AppContext.Session().UserId, profileMap)
-		if err != nil {
-			c.Err = model.NewAppError("requestTrueUpReview", "api.license.true_up_review.failed_to_submit", nil, "", http.StatusInternalServerError).Wrap(err)
-			return
-		}
-	}
-
-	// Update the review status to reflect the completion.
-	status.Completed = true
-	c.App.Srv().Store().TrueUpReview().Update(status)
-
-	// Encode to string rather than byte[] otherwise json.Marshal will encode it further.
-	encodedData := b64.StdEncoding.EncodeToString(profileMapJson)
-	responseContent := struct {
-		Content string `json:"content"`
-	}{Content: encodedData}
-	response, _ := json.Marshal(responseContent)
-
-	w.WriteHeader(http.StatusOK)
-	w.Write(response)
-}
-
-func trueUpReviewStatus(c *Context, w http.ResponseWriter, r *http.Request) {
-	// Only admins can request a true up review.
-	if !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageSystem) {
-		c.SetPermissionError(model.PermissionManageLicenseInformation)
-		return
-	}
-
-	// Check for license
-	license := c.App.Channels().License()
-	if license == nil {
-		c.Err = model.NewAppError("cloudTrueUpReviewNotAllowed", "api.license.true_up_review.license_required", nil, "True up review requires a license", http.StatusNotImplemented)
-		return
-	}
-
-	if license.IsCloud() {
-		c.Err = model.NewAppError("cloudTrueUpReviewNotAllowed", "api.license.true_up_review.not_allowed_for_cloud", nil, "True up review is not allowed for cloud instances", http.StatusNotImplemented)
-		return
-	}
-
-	status, appErr := c.App.GetOrCreateTrueUpReviewStatus(c.AppContext)
-	if appErr != nil {
-		c.Err = appErr
-	}
-
-	json, err := json.Marshal(status)
-	if err != nil {
-		c.Err = model.NewAppError("trueUpReviewStatus", "api.marshal_error", nil, "", http.StatusInternalServerError)
-		return
-	}
-
-	w.Write(json)
-}

server/channels/api4/license_test.go

@@ -459,116 +459,3 @@ func TestRequestTrialLicense(t *testing.T) {
 		CheckForbiddenStatus(t, resp)
 	})
 }
-
-func TestRequestRenewalLink(t *testing.T) {
-	th := Setup(t)
-	defer th.TearDown()
-
-	require.NotPanics(t, func() {
-		cloudImpl := th.App.Srv().Cloud
-		defer func() {
-			th.App.Srv().Cloud = cloudImpl
-		}()
-		th.App.Srv().Cloud = nil
-		resp, err := th.SystemAdminClient.DoAPIGet(context.Background(), "/license/renewal", "")
-		CheckErrorID(t, err, "app.license.generate_renewal_token.no_license")
-		require.Equal(t, http.StatusBadRequest, resp.StatusCode)
-	})
-}
-
-func TestRequestTrueUpReview(t *testing.T) {
-	t.Run("returns status 200 when telemetry data sent", func(t *testing.T) {
-		th := Setup(t).InitBasic()
-		defer th.TearDown()
-		th.App.Srv().SetLicense(model.NewTestLicense())
-
-		th.Client.Login(context.Background(), th.SystemAdminUser.Email, th.SystemAdminUser.Password)
-
-		cloud := mocks.CloudInterface{}
-		cloud.Mock.On("SubmitTrueUpReview", mock.Anything, mock.Anything).Return(nil)
-		cloud.Mock.On("CheckCWSConnection", mock.Anything).Return(nil)
-
-		cloudImpl := th.App.Srv().Cloud
-		defer func() {
-			th.App.Srv().Cloud = cloudImpl
-		}()
-		th.App.Srv().Cloud = &cloud
-
-		var reviewProfile map[string]any
-		resp, err := th.Client.SubmitTrueUpReview(context.Background(), reviewProfile)
-		require.NoError(t, err)
-		require.Equal(t, http.StatusOK, resp.StatusCode)
-	})
-
-	t.Run("returns 501 when ran by cloud user", func(t *testing.T) {
-		th := Setup(t).InitBasic()
-		defer th.TearDown()
-		th.App.Srv().SetLicense(model.NewTestLicense())
-
-		th.App.Srv().SetLicense(model.NewTestLicense("cloud"))
-
-		resp, err := th.SystemAdminClient.DoAPIPost(context.Background(), "/license/review", "")
-		require.Error(t, err)
-		require.Equal(t, http.StatusNotImplemented, resp.StatusCode)
-
-		th.App.Srv().SetLicense(model.NewTestLicense())
-	})
-
-	t.Run("returns 403 when user does not have permissions", func(t *testing.T) {
-		th := Setup(t).InitBasic()
-		defer th.TearDown()
-		th.App.Srv().SetLicense(model.NewTestLicense())
-
-		resp, err := th.Client.DoAPIPost(context.Background(), "/license/review", "")
-		require.Error(t, err)
-		require.Equal(t, http.StatusForbidden, resp.StatusCode)
-	})
-
-	t.Run("returns 400 when license is nil", func(t *testing.T) {
-		th := Setup(t).InitBasic()
-		defer th.TearDown()
-
-		th.App.Srv().SetLicense(nil)
-
-		resp, err := th.SystemAdminClient.DoAPIPost(context.Background(), "/license/review", "")
-		require.Error(t, err)
-		require.Equal(t, http.StatusNotImplemented, resp.StatusCode)
-	})
-}
-
-func TestTrueUpReviewStatus(t *testing.T) {
-	th := Setup(t)
-
-	defer th.TearDown()
-	th.App.Srv().SetLicense(model.NewTestLicense())
-
-	t.Run("returns 200 when status retrieved", func(t *testing.T) {
-		resp, err := th.SystemAdminClient.DoAPIGet(context.Background(), "/license/review/status", "")
-		require.NoError(t, err)
-		require.Equal(t, http.StatusOK, resp.StatusCode)
-	})
-
-	t.Run("returns 501 when ran by cloud user", func(t *testing.T) {
-		th.App.Srv().SetLicense(model.NewTestLicense("cloud"))
-
-		resp, err := th.SystemAdminClient.DoAPIGet(context.Background(), "/license/review/status", "")
-		require.Error(t, err)
-		require.Equal(t, http.StatusNotImplemented, resp.StatusCode)
-
-		th.App.Srv().SetLicense(model.NewTestLicense())
-	})
-
-	t.Run("returns 403 when user does not have permissions", func(t *testing.T) {
-		resp, err := th.Client.DoAPIGet(context.Background(), "/license/review/status", "")
-		require.Error(t, err)
-		require.Equal(t, http.StatusForbidden, resp.StatusCode)
-	})
-
-	t.Run("returns 400 when license is nil", func(t *testing.T) {
-		th.App.Srv().SetLicense(nil)
-
-		resp, err := th.SystemAdminClient.DoAPIGet(context.Background(), "/license/review/status", "")
-		require.Error(t, err)
-		require.Equal(t, http.StatusNotImplemented, resp.StatusCode)
-	})
-}

server/channels/app/app_iface.go

@@ -747,7 +747,6 @@ type AppIface interface {
 	GetOnboarding() (*model.System, *model.AppError)
 	GetOpenGraphMetadata(requestURL string) ([]byte, error)
 	GetOrCreateDirectChannel(c request.CTX, userID, otherUserID string, channelOptions ...model.ChannelOption) (*model.Channel, *model.AppError)
-	GetOrCreateTrueUpReviewStatus(rctx request.CTX) (*model.TrueUpReviewStatus, *model.AppError)
 	GetOutgoingWebhook(hookID string) (*model.OutgoingWebhook, *model.AppError)
 	GetOutgoingWebhooksForChannelPageByUser(channelID string, userID string, page, perPage int) ([]*model.OutgoingWebhook, *model.AppError)
 	GetOutgoingWebhooksForTeamPage(teamID string, page, perPage int) ([]*model.OutgoingWebhook, *model.AppError)
@@ -852,7 +851,6 @@ type AppIface interface {
 	GetThreadMembershipsForUser(userID, teamID string) ([]*model.ThreadMembership, error)
 	GetThreadsForUser(userID, teamID string, options model.GetUserThreadsOpts) (*model.Threads, *model.AppError)
 	GetTokenById(token string) (*model.Token, *model.AppError)
-	GetTrueUpProfile() (map[string]any, error)
 	GetUploadSession(c request.CTX, uploadId string) (*model.UploadSession, *model.AppError)
 	GetUploadSessionsForUser(userID string) ([]*model.UploadSession, *model.AppError)
 	GetUser(userID string) (*model.User, *model.AppError)

server/channels/app/license.go

@@ -156,13 +156,3 @@ func (s *Server) RemoveLicenseListener(id string) {
 func (s *Server) GetSanitizedClientLicense() map[string]string {
 	return s.platform.GetSanitizedClientLicense()
 }
-
-// GenerateRenewalToken returns a renewal token that expires after duration expiration
-func (s *Server) GenerateRenewalToken(expiration time.Duration) (string, *model.AppError) {
-	return s.platform.GenerateRenewalToken(expiration)
-}
-
-// GenerateLicenseRenewalLink returns a link that points to the CWS where clients can renew license
-func (s *Server) GenerateLicenseRenewalLink() (string, string, *model.AppError) {
-	return s.platform.GenerateLicenseRenewalLink()
-}

server/channels/app/license_test.go

@@ -73,24 +73,6 @@ func TestGetSanitizedClientLicense(t *testing.T) {
 	assert.False(t, ok)
 }
 
-func TestGenerateRenewalToken(t *testing.T) {
-	th := Setup(t)
-	defer th.TearDown()
-
-	t.Run("renewal token generated correctly", func(t *testing.T) {
-		setLicense(th, nil)
-		token, appErr := th.App.Srv().GenerateRenewalToken(JWTDefaultTokenExpiration)
-		require.Nil(t, appErr)
-		require.NotEmpty(t, token)
-	})
-
-	t.Run("return error if there is no active license", func(t *testing.T) {
-		th.App.Srv().SetLicense(nil)
-		_, appErr := th.App.Srv().GenerateRenewalToken(JWTDefaultTokenExpiration)
-		require.NotNil(t, appErr)
-	})
-}
-
 func setLicense(th *TestHelper, customer *model.Customer) {
 	l1 := &model.License{}
 	l1.Features = &model.Features{}

server/channels/app/opentracing/opentracing_layer.go

@@ -8005,28 +8005,6 @@ func (a *OpenTracingAppLayer) GetOrCreateDirectChannel(c request.CTX, userID str
 	return resultVar0, resultVar1
 }
 
-func (a *OpenTracingAppLayer) GetOrCreateTrueUpReviewStatus(rctx request.CTX) (*model.TrueUpReviewStatus, *model.AppError) {
-	origCtx := a.ctx
-	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.GetOrCreateTrueUpReviewStatus")
-
-	a.ctx = newCtx
-	a.app.Srv().Store().SetContext(newCtx)
-	defer func() {
-		a.app.Srv().Store().SetContext(origCtx)
-		a.ctx = origCtx
-	}()
-
-	defer span.Finish()
-	resultVar0, resultVar1 := a.app.GetOrCreateTrueUpReviewStatus(rctx)
-
-	if resultVar1 != nil {
-		span.LogFields(spanlog.Error(resultVar1))
-		ext.Error.Set(span, true)
-	}
-
-	return resultVar0, resultVar1
-}
-
 func (a *OpenTracingAppLayer) GetOutgoingWebhook(hookID string) (*model.OutgoingWebhook, *model.AppError) {
 	origCtx := a.ctx
 	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.GetOutgoingWebhook")
@@ -10617,28 +10595,6 @@ func (a *OpenTracingAppLayer) GetTotalUsersStats(viewRestrictions *model.ViewUse
 	return resultVar0, resultVar1
 }
 
-func (a *OpenTracingAppLayer) GetTrueUpProfile() (map[string]any, error) {
-	origCtx := a.ctx
-	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.GetTrueUpProfile")
-
-	a.ctx = newCtx
-	a.app.Srv().Store().SetContext(newCtx)
-	defer func() {
-		a.app.Srv().Store().SetContext(origCtx)
-		a.ctx = origCtx
-	}()
-
-	defer span.Finish()
-	resultVar0, resultVar1 := a.app.GetTrueUpProfile()
-
-	if resultVar1 != nil {
-		span.LogFields(spanlog.Error(resultVar1))
-		ext.Error.Set(span, true)
-	}
-
-	return resultVar0, resultVar1
-}
-
 func (a *OpenTracingAppLayer) GetUploadSession(c request.CTX, uploadId string) (*model.UploadSession, *model.AppError) {
 	origCtx := a.ctx
 	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.GetUploadSession")

server/channels/app/platform/license.go

@@ -343,54 +343,6 @@ func (ps *PlatformService) RequestTrialLicense(trialRequest *model.TrialLicenseR
 	return nil
 }
 
-// GenerateRenewalToken returns a renewal token that expires after duration expiration
-func (ps *PlatformService) GenerateRenewalToken(expiration time.Duration) (string, *model.AppError) {
-	license := ps.License()
-	if license == nil {
-		return "", model.NewAppError("GenerateRenewalToken", "app.license.generate_renewal_token.no_license", nil, "", http.StatusBadRequest)
-	}
-
-	if license.IsCloud() {
-		return "", model.NewAppError("GenerateRenewalToken", "app.license.generate_renewal_token.bad_license", nil, "", http.StatusBadRequest)
-	}
-
-	activeUsers, err := ps.Store.User().Count(model.UserCountOptions{})
-	if err != nil {
-		return "", model.NewAppError("GenerateRenewalToken", "app.license.generate_renewal_token.app_error",
-			nil, "", http.StatusInternalServerError).Wrap(err)
-	}
-
-	expirationTime := time.Now().UTC().Add(expiration)
-	claims := &JWTClaims{
-		LicenseID:   license.Id,
-		ActiveUsers: activeUsers,
-		RegisteredClaims: jwt.RegisteredClaims{
-			ExpiresAt: jwt.NewNumericDate(expirationTime),
-		},
-	}
-
-	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
-	tokenString, err := token.SignedString([]byte(license.Customer.Email))
-	if err != nil {
-		return "", model.NewAppError("GenerateRenewalToken", "app.license.generate_renewal_token.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
-	}
-
-	return tokenString, nil
-}
-
-// GenerateLicenseRenewalLink returns a link that points to the CWS where clients can renew license
-func (ps *PlatformService) GenerateLicenseRenewalLink() (string, string, *model.AppError) {
-	renewalToken, err := ps.GenerateRenewalToken(JWTDefaultTokenExpiration)
-	if err != nil {
-		return "", "", err
-	}
-	return fmt.Sprintf("%s?token=%s", ps.getLicenseRenewalURL(), renewalToken), renewalToken, nil
-}
-
-func (ps *PlatformService) getLicenseRenewalURL() string {
-	return fmt.Sprintf("%s/subscribe/renew", *ps.Config().CloudSettings.CWSURL)
-}
-
 func (ps *PlatformService) getRequestTrialURL() string {
 	return fmt.Sprintf("%s/api/v1/trials", *ps.Config().CloudSettings.CWSURL)
 }

server/channels/app/platform/license_test.go

@@ -73,24 +73,6 @@ func TestGetSanitizedClientLicense(t *testing.T) {
 	assert.False(t, ok)
 }
 
-func TestGenerateRenewalToken(t *testing.T) {
-	th := Setup(t)
-	defer th.TearDown()
-
-	t.Run("renewal token generated correctly", func(t *testing.T) {
-		setLicense(th, nil)
-		token, appErr := th.Service.GenerateRenewalToken(JWTDefaultTokenExpiration)
-		require.Nil(t, appErr)
-		require.NotEmpty(t, token)
-	})
-
-	t.Run("return error if there is no active license", func(t *testing.T) {
-		th.Service.SetLicense(nil)
-		_, appErr := th.Service.GenerateRenewalToken(JWTDefaultTokenExpiration)
-		require.NotNil(t, appErr)
-	})
-}
-
 func setLicense(th *TestHelper, customer *model.Customer) {
 	l1 := &model.License{}
 	l1.Features = &model.Features{}

server/channels/app/server.go

@@ -1296,16 +1296,6 @@ func (s *Server) sendLicenseUpForRenewalEmail(users map[string]*model.User, lice
 
 	daysToExpiration := license.DaysToExpiration()
 
-	ctaLink, tokenToBeUsedForRenew, appErr := s.GenerateLicenseRenewalLink()
-	if appErr != nil {
-		return model.NewAppError("s.sendLicenseUpForRenewalEmail", "api.server.license_up_for_renewal.error_generating_link", nil, "", http.StatusInternalServerError).Wrap(appErr)
-	}
-
-	status, err := s.Cloud.GetLicenseSelfServeStatus("", tokenToBeUsedForRenew)
-	if err != nil {
-		return model.NewAppError("s.sendLicenseUpForRenewalEmail", "api.cloud.request_error", nil, "", http.StatusInternalServerError).Wrap(err)
-	}
-
 	// we want to at least have one email sent out to an admin
 	countNotOks := 0
 
@@ -1315,13 +1305,10 @@ func (s *Server) sendLicenseUpForRenewalEmail(users map[string]*model.User, lice
 			name = user.Username
 		}
 		T := i18n.GetUserTranslations(user.Locale)
-		ctaTitle := T("api.templates.license_up_for_renewal_subtitle_two")
-		ctaText := T("api.templates.license_up_for_renewal_renew_now")
-		if !status.IsRenewable {
-			ctaTitle = ""
-			ctaText = T("api.templates.license_up_for_renewal_contact_sales")
-			ctaLink = "https://mattermost.com/contact-sales/"
-		}
+
+		ctaTitle := ""
+		ctaText := T("api.templates.license_up_for_renewal_contact_sales")
+		ctaLink := "https://mattermost.com/contact-sales/"
 
 		if err := s.EmailService.SendLicenseUpForRenewalEmail(user.Email, name, user.Locale, *s.platform.Config().ServiceSettings.SiteURL, ctaTitle, ctaLink, ctaText, daysToExpiration); err != nil {
 			mlog.Error("Error sending license up for renewal email to", mlog.String("user_email", user.Email), mlog.Err(err))
@@ -1383,18 +1370,6 @@ func (s *Server) doLicenseExpirationCheck() {
 		return
 	}
 
-	ctaLink, tokenToBeUsedForRenew, appErr := s.GenerateLicenseRenewalLink()
-	if appErr != nil {
-		mlog.Debug(model.NewAppError("s.sendLicenseUpForRenewalEmail", "api.server.license_up_for_renewal.error_generating_link", nil, "", http.StatusInternalServerError).Wrap(appErr).Error())
-		return
-	}
-
-	status, err := s.Cloud.GetLicenseSelfServeStatus("", tokenToBeUsedForRenew)
-	if err != nil {
-		mlog.Debug(model.NewAppError("s.sendLicenseUpForRenewalEmail", "api.cloud.request_error", nil, "", http.StatusInternalServerError).Wrap(err).Error())
-		return
-	}
-
 	//send email to admin(s)
 	for _, user := range users {
 		user := user
@@ -1404,11 +1379,8 @@ func (s *Server) doLicenseExpirationCheck() {
 		}
 
 		T := i18n.GetUserTranslations(user.Locale)
-		ctaText := T("api.templates.remove_expired_license.body.renew_button")
-		if !status.IsRenewable {
-			ctaText = T("api.templates.license_up_for_renewal_contact_sales")
-			ctaLink = "https://mattermost.com/contact-sales/"
-		}
+		ctaText := T("api.templates.license_up_for_renewal_contact_sales")
+		ctaLink := "https://mattermost.com/contact-sales/"
 
 		mlog.Debug("Sending license expired email.", mlog.String("user_email", user.Email))
 		s.Go(func() {

server/channels/app/true_up.go

@@ -1,183 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package app
-
-import (
-	"encoding/json"
-	"errors"
-	"net/http"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/mattermost/mattermost/server/public/model"
-	"github.com/mattermost/mattermost/server/public/shared/request"
-	"github.com/mattermost/mattermost/server/v8/channels/store"
-	"github.com/mattermost/mattermost/server/v8/channels/utils"
-	"github.com/mattermost/mattermost/server/v8/platform/services/telemetry"
-)
-
-func pluginActivated(pluginStates map[string]*model.PluginState, pluginId string) bool {
-	state, ok := pluginStates[pluginId]
-	if !ok {
-		return false
-	}
-	return state.Enable
-}
-
-func (a *App) getMarketplacePlugins() ([]string, error) {
-	ts := a.Srv().telemetryService
-	config := a.Srv().Config()
-
-	marketplacePlugins, err := ts.GetAllMarketplacePlugins(model.PluginSettingsDefaultMarketplaceURL)
-	if err != nil {
-		return nil, err
-	}
-
-	activePlugins := []string{}
-	for _, p := range marketplacePlugins {
-		id := p.Manifest.Id
-		if pluginActivated(config.PluginSettings.PluginStates, id) {
-			activePlugins = append(activePlugins, id)
-		}
-	}
-
-	return activePlugins, nil
-}
-
-func (a *App) getTrueUpProfile() (*model.TrueUpReviewProfile, error) {
-	license := a.Channels().License()
-	if license == nil {
-		return nil, model.NewAppError("requestTrueUpReview", "api.license.true_up_review.license_required", nil, "Could not get the total active users count", http.StatusInternalServerError)
-	}
-
-	// Customer Info & Usage Analytics
-
-	// active registered users
-	activatedUsers, err := a.Srv().Store().User().Count(model.UserCountOptions{})
-	if err != nil {
-		return nil, model.NewAppError("requestTrueUpReview", "api.license.true_up_review.user_count_fail", nil, "Could not get the total activated users count", http.StatusInternalServerError).Wrap(err)
-	}
-
-	// daily active users
-	dau, err := a.Srv().Store().User().AnalyticsActiveCount(DayMilliseconds, model.UserCountOptions{IncludeBotAccounts: false, IncludeDeleted: false})
-	if err != nil {
-		return nil, model.NewAppError("requestTrueUpReview", "api.license.true_up_review.user_count_fail", nil, "Could not get the total daily active users count", http.StatusInternalServerError)
-	}
-
-	// monthly active users
-	mau, err := a.Srv().Store().User().AnalyticsActiveCount(MonthMilliseconds, model.UserCountOptions{IncludeBotAccounts: false, IncludeDeleted: false})
-	if err != nil {
-		return nil, model.NewAppError("requestTrueUpReview", "api.license.true_up_review.user_count_fail", nil, "Could not get the total monthly active users count", http.StatusInternalServerError).Wrap(err)
-	}
-
-	// Webhook, calls, boards, and playbook counts
-	incomingWebhookCount, err := a.Srv().Store().Webhook().AnalyticsIncomingCount("")
-	if err != nil {
-		return nil, model.NewAppError("requestTrueUpReview", "api.license.true_up_review.webhook_in_count_fail", nil, "Could not get the total incoming webhook count", http.StatusInternalServerError)
-	}
-	outgoingWebhookCount, err := a.Srv().Store().Webhook().AnalyticsOutgoingCount("")
-	if err != nil {
-		return nil, model.NewAppError("requestTrueUpReview", "api.license.true_up_review.webhook_out_count_fail", nil, "Could not get the total outgoing webhook count", http.StatusInternalServerError)
-	}
-
-	// Plugin Data
-	trueUpReviewPlugins := model.TrueUpReviewPlugins{
-		PluginNames: []string{},
-	}
-
-	if plugins, err := a.getMarketplacePlugins(); err == nil {
-		trueUpReviewPlugins.PluginNames = plugins
-		trueUpReviewPlugins.TotalPlugins = len(plugins)
-	}
-
-	// Authentication Features
-	config := a.Config()
-	mfaUsed := config.ServiceSettings.EnforceMultifactorAuthentication
-	ldapUsed := config.LdapSettings.Enable
-	samlUsed := config.SamlSettings.Enable
-	openIdUsed := config.OpenIdSettings.Enable
-	guestAccessAllowed := config.GuestAccountsSettings.Enable
-
-	authFeatures := map[string]*bool{
-		model.TrueUpReviewAuthFeaturesMfa:        mfaUsed,
-		model.TrueUpReviewAuthFeaturesADLdap:     ldapUsed,
-		model.TrueUpReviewAuthFeaturesSaml:       samlUsed,
-		model.TrueUpReviewAuthFeatureOpenId:      openIdUsed,
-		model.TrueUpReviewAuthFeatureGuestAccess: guestAccessAllowed,
-	}
-
-	authFeatureList := []string{}
-	for feature, used := range authFeatures {
-		if used != nil && *used {
-			authFeatureList = append(authFeatureList, feature)
-		}
-	}
-
-	reviewProfile := model.TrueUpReviewProfile{
-		ServerId:               a.TelemetryId(),
-		ServerVersion:          model.CurrentVersion,
-		ServerInstallationType: os.Getenv(telemetry.EnvVarInstallType),
-		LicenseId:              license.Id,
-		LicensedSeats:          *license.Features.Users,
-		LicensePlan:            license.SkuName,
-		CustomerName:           license.Customer.Name,
-		ActivatedUsers:         activatedUsers,
-		DailyActiveUsers:       dau,
-		MonthlyActiveUsers:     mau,
-		TotalIncomingWebhooks:  incomingWebhookCount,
-		TotalOutgoingWebhooks:  outgoingWebhookCount,
-		Plugins:                trueUpReviewPlugins,
-		AuthenticationFeatures: authFeatureList,
-	}
-
-	return &reviewProfile, nil
-}
-
-func (a *App) GetTrueUpProfile() (map[string]any, error) {
-	profile, err := a.getTrueUpProfile()
-
-	if err != nil {
-		return nil, err
-	}
-
-	profileJson, err := json.Marshal(profile)
-	if err != nil {
-		return nil, err
-	}
-	telemetryProperties := map[string]any{}
-
-	json.Unmarshal(profileJson, &telemetryProperties)
-	delete(telemetryProperties, "plugins")
-	plugins := profile.Plugins.ToMap()
-	for key, pluginValue := range plugins {
-		telemetryProperties[key] = pluginValue
-	}
-
-	delete(telemetryProperties, "authentication_features")
-	telemetryProperties["authentication_features"] = strings.Join(profile.AuthenticationFeatures, ",")
-
-	return telemetryProperties, nil
-}
-
-func (a *App) GetOrCreateTrueUpReviewStatus(rctx request.CTX) (*model.TrueUpReviewStatus, *model.AppError) {
-	nextDueDate := utils.GetNextTrueUpReviewDueDate(time.Now())
-	status, err := a.Srv().Store().TrueUpReview().GetTrueUpReviewStatus(nextDueDate.UnixMilli())
-	if err != nil {
-		var nfErr *store.ErrNotFound
-		switch {
-		case errors.As(err, &nfErr):
-			rctx.Logger().Warn("Could not find true up review status")
-		default:
-			return nil, model.NewAppError("requestTrueUpReview", "api.license.true_up_review.get_status_error", nil, "Could not get true up status records", http.StatusInternalServerError).Wrap(err)
-		}
-
-		status, err = a.Srv().Store().TrueUpReview().CreateTrueUpReviewStatusRecord(&model.TrueUpReviewStatus{DueDate: nextDueDate.UnixMilli(), Completed: false})
-		if err != nil {
-			return nil, model.NewAppError("requestTrueUpReview", "api.license.true_up_review.create_error", nil, "Could not create true up status record", http.StatusInternalServerError)
-		}
-	}
-
-	return status, nil
-}

server/channels/app/true_up_test.go

@@ -1,55 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package app
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/mattermost/mattermost/server/public/model"
-	"github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-)
-
-func TestGetTrueUpProfile(t *testing.T) {
-	th := SetupWithStoreMock(t)
-	defer th.TearDown()
-
-	mockStore := th.App.Srv().Store().(*mocks.Store)
-	mockUserStore := mocks.UserStore{}
-	//Activated userss set to 10
-	mockUserStore.On("Count", mock.Anything).Return(int64(10), nil)
-	//Mau set to 5
-	mockUserStore.On("AnalyticsActiveCount", int64(MonthMilliseconds), model.UserCountOptions{IncludeBotAccounts: false, IncludeDeleted: false}).Return(int64(5), nil)
-	//dau set to 2
-	mockUserStore.On("AnalyticsActiveCount", int64(DayMilliseconds), model.UserCountOptions{IncludeBotAccounts: false, IncludeDeleted: false}).Return(int64(2), nil)
-	mockStore.On("User").Return(&mockUserStore)
-
-	mockWebhookStore := mocks.WebhookStore{}
-	mockWebhookStore.On("AnalyticsIncomingCount", mock.Anything).Return(int64(1), nil)
-	mockWebhookStore.On("AnalyticsOutgoingCount", mock.Anything).Return(int64(1), nil)
-	mockStore.On("Webhook").Return(&mockWebhookStore)
-
-	t.Run("missing license", func(t *testing.T) {
-		_, err := th.App.GetTrueUpProfile()
-		require.Error(t, err)
-		require.True(t, strings.Contains(err.Error(), "True up review requires a license"))
-	})
-
-	t.Run("happy path - returns correct mau and activated users", func(t *testing.T) {
-		th.App.Srv().SetLicense(model.NewTestLicenseSKU(model.LicenseShortSkuProfessional))
-
-		profile, err := th.App.GetTrueUpProfile()
-		assert.NoError(t, err, "Unexpected error")
-
-		require.NotNil(t, profile)
-		assert.Equal(t, float64(5), profile["monthly_active_users"])
-		assert.Equal(t, float64(2), profile["daily_active_users"])
-		assert.Equal(t, float64(10), profile["total_activated_users"])
-		assert.Equal(t, float64(1), profile["incoming_webhooks_count"])
-		assert.Equal(t, float64(1), profile["outgoing_webhooks_count"])
-	})
-}

server/channels/db/migrations/migrations.list

@@ -238,6 +238,8 @@ channels/db/migrations/mysql/000119_msteams_shared_channels_opts.down.sql
 channels/db/migrations/mysql/000119_msteams_shared_channels_opts.up.sql
 channels/db/migrations/mysql/000120_create_channelbookmarks_table.down.sql
 channels/db/migrations/mysql/000120_create_channelbookmarks_table.up.sql
+channels/db/migrations/mysql/000121_remove_true_up_review_history.down.sql
+channels/db/migrations/mysql/000121_remove_true_up_review_history.up.sql
 channels/db/migrations/postgres/000001_create_teams.down.sql
 channels/db/migrations/postgres/000001_create_teams.up.sql
 channels/db/migrations/postgres/000002_create_team_members.down.sql
@@ -476,3 +478,5 @@ channels/db/migrations/postgres/000119_msteams_shared_channels_opts.down.sql
 channels/db/migrations/postgres/000119_msteams_shared_channels_opts.up.sql
 channels/db/migrations/postgres/000120_create_channelbookmarks_table.down.sql
 channels/db/migrations/postgres/000120_create_channelbookmarks_table.up.sql
+channels/db/migrations/postgres/000121_remove_true_up_review_history.down.sql
+channels/db/migrations/postgres/000121_remove_true_up_review_history.up.sql

server/channels/db/migrations/mysql/000121_remove_true_up_review_history.down.sql

@@ -0,0 +1,5 @@
+CREATE TABLE IF NOT EXISTS TrueUpReviewHistory (
+	DueDate bigint(20),
+	Completed boolean,
+    PRIMARY KEY (DueDate)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

server/channels/db/migrations/mysql/000121_remove_true_up_review_history.up.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS TrueUpReviewHistory;

server/channels/db/migrations/postgres/000121_remove_true_up_review_history.down.sql

@@ -0,0 +1,5 @@
+CREATE TABLE IF NOT EXISTS trueupreviewhistory (
+	duedate bigint,
+	completed boolean,
+    PRIMARY KEY (duedate)
+);

server/channels/db/migrations/postgres/000121_remove_true_up_review_history.up.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS trueupreviewhistory;

server/channels/store/opentracinglayer/opentracinglayer.go

@@ -59,7 +59,6 @@ type OpenTracingLayer struct {
 	TermsOfServiceStore             store.TermsOfServiceStore
 	ThreadStore                     store.ThreadStore
 	TokenStore                      store.TokenStore
-	TrueUpReviewStore               store.TrueUpReviewStore
 	UploadSessionStore              store.UploadSessionStore
 	UserStore                       store.UserStore
 	UserAccessTokenStore            store.UserAccessTokenStore
@@ -227,10 +226,6 @@ func (s *OpenTracingLayer) Token() store.TokenStore {
 	return s.TokenStore
 }
 
-func (s *OpenTracingLayer) TrueUpReview() store.TrueUpReviewStore {
-	return s.TrueUpReviewStore
-}
-
 func (s *OpenTracingLayer) UploadSession() store.UploadSessionStore {
 	return s.UploadSessionStore
 }
@@ -451,11 +446,6 @@ type OpenTracingLayerTokenStore struct {
 	Root *OpenTracingLayer
 }
 
-type OpenTracingLayerTrueUpReviewStore struct {
-	store.TrueUpReviewStore
-	Root *OpenTracingLayer
-}
-
 type OpenTracingLayerUploadSessionStore struct {
 	store.UploadSessionStore
 	Root *OpenTracingLayer
@@ -11117,60 +11107,6 @@ func (s *OpenTracingLayerTokenStore) Save(recovery *model.Token) error {
 	return err
 }
 
-func (s *OpenTracingLayerTrueUpReviewStore) CreateTrueUpReviewStatusRecord(reviewStatus *model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error) {
-	origCtx := s.Root.Store.Context()
-	span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TrueUpReviewStore.CreateTrueUpReviewStatusRecord")
-	s.Root.Store.SetContext(newCtx)
-	defer func() {
-		s.Root.Store.SetContext(origCtx)
-	}()
-
-	defer span.Finish()
-	result, err := s.TrueUpReviewStore.CreateTrueUpReviewStatusRecord(reviewStatus)
-	if err != nil {
-		span.LogFields(spanlog.Error(err))
-		ext.Error.Set(span, true)
-	}
-
-	return result, err
-}
-
-func (s *OpenTracingLayerTrueUpReviewStore) GetTrueUpReviewStatus(dueDate int64) (*model.TrueUpReviewStatus, error) {
-	origCtx := s.Root.Store.Context()
-	span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TrueUpReviewStore.GetTrueUpReviewStatus")
-	s.Root.Store.SetContext(newCtx)
-	defer func() {
-		s.Root.Store.SetContext(origCtx)
-	}()
-
-	defer span.Finish()
-	result, err := s.TrueUpReviewStore.GetTrueUpReviewStatus(dueDate)
-	if err != nil {
-		span.LogFields(spanlog.Error(err))
-		ext.Error.Set(span, true)
-	}
-
-	return result, err
-}
-
-func (s *OpenTracingLayerTrueUpReviewStore) Update(reviewStatus *model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error) {
-	origCtx := s.Root.Store.Context()
-	span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "TrueUpReviewStore.Update")
-	s.Root.Store.SetContext(newCtx)
-	defer func() {
-		s.Root.Store.SetContext(origCtx)
-	}()
-
-	defer span.Finish()
-	result, err := s.TrueUpReviewStore.Update(reviewStatus)
-	if err != nil {
-		span.LogFields(spanlog.Error(err))
-		ext.Error.Set(span, true)
-	}
-
-	return result, err
-}
-
 func (s *OpenTracingLayerUploadSessionStore) Delete(id string) error {
 	origCtx := s.Root.Store.Context()
 	span, newCtx := tracing.StartSpanWithParentByContext(s.Root.Store.Context(), "UploadSessionStore.Delete")
@@ -13475,7 +13411,6 @@ func New(childStore store.Store, ctx context.Context) *OpenTracingLayer {
 	newStore.TermsOfServiceStore = &OpenTracingLayerTermsOfServiceStore{TermsOfServiceStore: childStore.TermsOfService(), Root: &newStore}
 	newStore.ThreadStore = &OpenTracingLayerThreadStore{ThreadStore: childStore.Thread(), Root: &newStore}
 	newStore.TokenStore = &OpenTracingLayerTokenStore{TokenStore: childStore.Token(), Root: &newStore}
-	newStore.TrueUpReviewStore = &OpenTracingLayerTrueUpReviewStore{TrueUpReviewStore: childStore.TrueUpReview(), Root: &newStore}
 	newStore.UploadSessionStore = &OpenTracingLayerUploadSessionStore{UploadSessionStore: childStore.UploadSession(), Root: &newStore}
 	newStore.UserStore = &OpenTracingLayerUserStore{UserStore: childStore.User(), Root: &newStore}
 	newStore.UserAccessTokenStore = &OpenTracingLayerUserAccessTokenStore{UserAccessTokenStore: childStore.UserAccessToken(), Root: &newStore}

server/channels/store/retrylayer/retrylayer.go

@@ -63,7 +63,6 @@ type RetryLayer struct {
 	TermsOfServiceStore             store.TermsOfServiceStore
 	ThreadStore                     store.ThreadStore
 	TokenStore                      store.TokenStore
-	TrueUpReviewStore               store.TrueUpReviewStore
 	UploadSessionStore              store.UploadSessionStore
 	UserStore                       store.UserStore
 	UserAccessTokenStore            store.UserAccessTokenStore
@@ -231,10 +230,6 @@ func (s *RetryLayer) Token() store.TokenStore {
 	return s.TokenStore
 }
 
-func (s *RetryLayer) TrueUpReview() store.TrueUpReviewStore {
-	return s.TrueUpReviewStore
-}
-
 func (s *RetryLayer) UploadSession() store.UploadSessionStore {
 	return s.UploadSessionStore
 }
@@ -455,11 +450,6 @@ type RetryLayerTokenStore struct {
 	Root *RetryLayer
 }
 
-type RetryLayerTrueUpReviewStore struct {
-	store.TrueUpReviewStore
-	Root *RetryLayer
-}
-
 type RetryLayerUploadSessionStore struct {
 	store.UploadSessionStore
 	Root *RetryLayer
@@ -12717,69 +12707,6 @@ func (s *RetryLayerTokenStore) Save(recovery *model.Token) error {
 
 }
 
-func (s *RetryLayerTrueUpReviewStore) CreateTrueUpReviewStatusRecord(reviewStatus *model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error) {
-
-	tries := 0
-	for {
-		result, err := s.TrueUpReviewStore.CreateTrueUpReviewStatusRecord(reviewStatus)
-		if err == nil {
-			return result, nil
-		}
-		if !isRepeatableError(err) {
-			return result, err
-		}
-		tries++
-		if tries >= 3 {
-			err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures")
-			return result, err
-		}
-		timepkg.Sleep(100 * timepkg.Millisecond)
-	}
-
-}
-
-func (s *RetryLayerTrueUpReviewStore) GetTrueUpReviewStatus(dueDate int64) (*model.TrueUpReviewStatus, error) {
-
-	tries := 0
-	for {
-		result, err := s.TrueUpReviewStore.GetTrueUpReviewStatus(dueDate)
-		if err == nil {
-			return result, nil
-		}
-		if !isRepeatableError(err) {
-			return result, err
-		}
-		tries++
-		if tries >= 3 {
-			err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures")
-			return result, err
-		}
-		timepkg.Sleep(100 * timepkg.Millisecond)
-	}
-
-}
-
-func (s *RetryLayerTrueUpReviewStore) Update(reviewStatus *model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error) {
-
-	tries := 0
-	for {
-		result, err := s.TrueUpReviewStore.Update(reviewStatus)
-		if err == nil {
-			return result, nil
-		}
-		if !isRepeatableError(err) {
-			return result, err
-		}
-		tries++
-		if tries >= 3 {
-			err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures")
-			return result, err
-		}
-		timepkg.Sleep(100 * timepkg.Millisecond)
-	}
-
-}
-
 func (s *RetryLayerUploadSessionStore) Delete(id string) error {
 
 	tries := 0
@@ -15372,7 +15299,6 @@ func New(childStore store.Store) *RetryLayer {
 	newStore.TermsOfServiceStore = &RetryLayerTermsOfServiceStore{TermsOfServiceStore: childStore.TermsOfService(), Root: &newStore}
 	newStore.ThreadStore = &RetryLayerThreadStore{ThreadStore: childStore.Thread(), Root: &newStore}
 	newStore.TokenStore = &RetryLayerTokenStore{TokenStore: childStore.Token(), Root: &newStore}
-	newStore.TrueUpReviewStore = &RetryLayerTrueUpReviewStore{TrueUpReviewStore: childStore.TrueUpReview(), Root: &newStore}
 	newStore.UploadSessionStore = &RetryLayerUploadSessionStore{UploadSessionStore: childStore.UploadSession(), Root: &newStore}
 	newStore.UserStore = &RetryLayerUserStore{UserStore: childStore.User(), Root: &newStore}
 	newStore.UserAccessTokenStore = &RetryLayerUserAccessTokenStore{UserAccessTokenStore: childStore.UserAccessToken(), Root: &newStore}

server/channels/store/retrylayer/retrylayer_test.go

@@ -60,7 +60,6 @@ func genStore() *mocks.Store {
 	mock.On("PostPriority").Return(&mocks.PostPriorityStore{})
 	mock.On("PostAcknowledgement").Return(&mocks.PostAcknowledgementStore{})
 	mock.On("PostPersistentNotification").Return(&mocks.PostPersistentNotificationStore{})
-	mock.On("TrueUpReview").Return(&mocks.TrueUpReviewStore{})
 	mock.On("DesktopTokens").Return(&mocks.DesktopTokensStore{})
 	mock.On("ChannelBookmark").Return(&mocks.ChannelBookmarkStore{})
 	return mock

server/channels/store/sqlstore/store.go

@@ -109,7 +109,6 @@ type SqlStoreStores struct {
 	postPriority               store.PostPriorityStore
 	postAcknowledgement        store.PostAcknowledgementStore
 	postPersistentNotification store.PostPersistentNotificationStore
-	trueUpReview               store.TrueUpReviewStore
 	desktopTokens              store.DesktopTokensStore
 	channelBookmarks           store.ChannelBookmarkStore
 }
@@ -235,7 +234,6 @@ func New(settings model.SqlSettings, logger mlog.LoggerIFace, metrics einterface
 	store.stores.postPriority = newSqlPostPriorityStore(store)
 	store.stores.postAcknowledgement = newSqlPostAcknowledgementStore(store)
 	store.stores.postPersistentNotification = newSqlPostPersistentNotificationStore(store)
-	store.stores.trueUpReview = newSqlTrueUpReviewStore(store)
 	store.stores.desktopTokens = newSqlDesktopTokensStore(store, metrics)
 	store.stores.channelBookmarks = newSqlChannelBookmarkStore(store)
 
@@ -1033,10 +1031,6 @@ func (ss *SqlStore) PostPersistentNotification() store.PostPersistentNotificatio
 	return ss.stores.postPersistentNotification
 }
 
-func (ss *SqlStore) TrueUpReview() store.TrueUpReviewStore {
-	return ss.stores.trueUpReview
-}
-
 func (ss *SqlStore) DesktopTokens() store.DesktopTokensStore {
 	return ss.stores.desktopTokens
 }

server/channels/store/sqlstore/true_up_review_store.go

@@ -1,81 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package sqlstore
-
-import (
-	"database/sql"
-	"strconv"
-
-	sq "github.com/mattermost/squirrel"
-	"github.com/pkg/errors"
-
-	"github.com/mattermost/mattermost/server/public/model"
-	"github.com/mattermost/mattermost/server/v8/channels/store"
-)
-
-// SqlLicenseStore encapsulates the database writes and reads for
-// model.LicenseRecord objects.
-type SqlTrueUpReviewStore struct {
-	*SqlStore
-}
-
-func newSqlTrueUpReviewStore(sqlStore *SqlStore) store.TrueUpReviewStore {
-	return &SqlTrueUpReviewStore{sqlStore}
-}
-
-func trueUpReviewStatusColumns() []string {
-	return []string{
-		"DueDate",
-		"Completed",
-	}
-}
-
-func (s *SqlTrueUpReviewStore) GetTrueUpReviewStatus(dueDate int64) (*model.TrueUpReviewStatus, error) {
-	query := s.getQueryBuilder().
-		Select("*").
-		From("TrueUpReviewHistory").
-		Where(sq.Eq{"DueDate": dueDate})
-
-	queryString, args, err := query.ToSql()
-	if err != nil {
-		return nil, errors.Wrap(err, "get_trueUpReviewStatusRecord_tosql")
-	}
-	var trueUpReviewStatus model.TrueUpReviewStatus
-	if err := s.GetReplicaX().Get(&trueUpReviewStatus, queryString, args...); err != nil {
-		if err == sql.ErrNoRows {
-			return nil, store.NewErrNotFound("TrueUpReviewStatus", strconv.FormatInt(dueDate, 10))
-		}
-
-		return nil, err
-	}
-
-	return &trueUpReviewStatus, nil
-}
-
-func (s *SqlTrueUpReviewStore) CreateTrueUpReviewStatusRecord(reviewStatus *model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error) {
-	builder := s.getQueryBuilder().Insert("TrueUpReviewHistory").Columns(trueUpReviewStatusColumns()...).Values(reviewStatus.ToSlice()...)
-	query, args, err := builder.ToSql()
-	if err != nil {
-		return nil, errors.Wrap(err, "create_trueUpReviewStatusRecord_tosql")
-	}
-
-	if _, err = s.GetMasterX().Exec(query, args...); err != nil {
-		return nil, errors.Wrap(err, "fail to create true up review status record")
-	}
-
-	return reviewStatus, nil
-}
-
-func (s *SqlTrueUpReviewStore) Update(reviewStatus *model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error) {
-	query := s.getQueryBuilder().
-		Update("TrueUpReviewHistory").
-		Set("Completed", reviewStatus.Completed).
-		Where(sq.Eq{"DueDate": reviewStatus.DueDate})
-
-	if _, err := s.GetMasterX().ExecBuilder(query); err != nil {
-		return nil, errors.Wrapf(err, "failed to update true up review status with DueDate=%d", reviewStatus.DueDate)
-	}
-
-	return reviewStatus, nil
-}

server/channels/store/sqlstore/true_up_review_store_test.go

@@ -1,14 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package sqlstore
-
-import (
-	"testing"
-
-	"github.com/mattermost/mattermost/server/v8/channels/store/storetest"
-)
-
-func TestTrueUpReviewStore(t *testing.T) {
-	StoreTestWithSqlStore(t, storetest.TestTrueUpReviewStatusStore)
-}

server/channels/store/store.go

@@ -89,7 +89,6 @@ type Store interface {
 	PostPriority() PostPriorityStore
 	PostAcknowledgement() PostAcknowledgementStore
 	PostPersistentNotification() PostPersistentNotificationStore
-	TrueUpReview() TrueUpReviewStore
 	DesktopTokens() DesktopTokensStore
 	ChannelBookmark() ChannelBookmarkStore
 }
@@ -1028,13 +1027,6 @@ type PostPersistentNotificationStore interface {
 	DeleteByChannel(channelIds []string) error
 	DeleteByTeam(teamIds []string) error
 }
-
-type TrueUpReviewStore interface {
-	GetTrueUpReviewStatus(dueDate int64) (*model.TrueUpReviewStatus, error)
-	CreateTrueUpReviewStatusRecord(reviewStatus *model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error)
-	Update(reviewStatus *model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error)
-}
-
 type ChannelBookmarkStore interface {
 	ErrorIfBookmarkFileInfoAlreadyAttached(fileId string) error
 	Get(Id string, includeDeleted bool) (b *model.ChannelBookmarkWithFileInfo, err error)

server/channels/store/storetest/mocks/Store.go

@@ -1158,26 +1158,6 @@ func (_m *Store) TotalSearchDbConnections() int {
 	return r0
 }
 
-// TrueUpReview provides a mock function with given fields:
-func (_m *Store) TrueUpReview() store.TrueUpReviewStore {
-	ret := _m.Called()
-
-	if len(ret) == 0 {
-		panic("no return value specified for TrueUpReview")
-	}
-
-	var r0 store.TrueUpReviewStore
-	if rf, ok := ret.Get(0).(func() store.TrueUpReviewStore); ok {
-		r0 = rf()
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(store.TrueUpReviewStore)
-		}
-	}
-
-	return r0
-}
-
 // UnlockFromMaster provides a mock function with given fields:
 func (_m *Store) UnlockFromMaster() {
 	_m.Called()

server/channels/store/storetest/mocks/TrueUpReviewStore.go

@@ -1,119 +0,0 @@
-// Code generated by mockery v2.42.2. DO NOT EDIT.
-
-// Regenerate this file using `make store-mocks`.
-
-package mocks
-
-import (
-	model "github.com/mattermost/mattermost/server/public/model"
-	mock "github.com/stretchr/testify/mock"
-)
-
-// TrueUpReviewStore is an autogenerated mock type for the TrueUpReviewStore type
-type TrueUpReviewStore struct {
-	mock.Mock
-}
-
-// CreateTrueUpReviewStatusRecord provides a mock function with given fields: reviewStatus
-func (_m *TrueUpReviewStore) CreateTrueUpReviewStatusRecord(reviewStatus *model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error) {
-	ret := _m.Called(reviewStatus)
-
-	if len(ret) == 0 {
-		panic("no return value specified for CreateTrueUpReviewStatusRecord")
-	}
-
-	var r0 *model.TrueUpReviewStatus
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error)); ok {
-		return rf(reviewStatus)
-	}
-	if rf, ok := ret.Get(0).(func(*model.TrueUpReviewStatus) *model.TrueUpReviewStatus); ok {
-		r0 = rf(reviewStatus)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.TrueUpReviewStatus)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*model.TrueUpReviewStatus) error); ok {
-		r1 = rf(reviewStatus)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// GetTrueUpReviewStatus provides a mock function with given fields: dueDate
-func (_m *TrueUpReviewStore) GetTrueUpReviewStatus(dueDate int64) (*model.TrueUpReviewStatus, error) {
-	ret := _m.Called(dueDate)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetTrueUpReviewStatus")
-	}
-
-	var r0 *model.TrueUpReviewStatus
-	var r1 error
-	if rf, ok := ret.Get(0).(func(int64) (*model.TrueUpReviewStatus, error)); ok {
-		return rf(dueDate)
-	}
-	if rf, ok := ret.Get(0).(func(int64) *model.TrueUpReviewStatus); ok {
-		r0 = rf(dueDate)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.TrueUpReviewStatus)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(int64) error); ok {
-		r1 = rf(dueDate)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// Update provides a mock function with given fields: reviewStatus
-func (_m *TrueUpReviewStore) Update(reviewStatus *model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error) {
-	ret := _m.Called(reviewStatus)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Update")
-	}
-
-	var r0 *model.TrueUpReviewStatus
-	var r1 error
-	if rf, ok := ret.Get(0).(func(*model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error)); ok {
-		return rf(reviewStatus)
-	}
-	if rf, ok := ret.Get(0).(func(*model.TrueUpReviewStatus) *model.TrueUpReviewStatus); ok {
-		r0 = rf(reviewStatus)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.TrueUpReviewStatus)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(*model.TrueUpReviewStatus) error); ok {
-		r1 = rf(reviewStatus)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// NewTrueUpReviewStore creates a new instance of TrueUpReviewStore. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewTrueUpReviewStore(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *TrueUpReviewStore {
-	mock := &TrueUpReviewStore{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}

server/channels/store/storetest/store.go

@@ -63,7 +63,6 @@ type Store struct {
 	PostPriorityStore               mocks.PostPriorityStore
 	PostAcknowledgementStore        mocks.PostAcknowledgementStore
 	PostPersistentNotificationStore mocks.PostPersistentNotificationStore
-	TrueUpReviewStore               mocks.TrueUpReviewStore
 	DesktopTokensStore              mocks.DesktopTokensStore
 	ChannelBookmarkStore            mocks.ChannelBookmarkStore
 }
@@ -112,7 +111,6 @@ func (s *Store) ChannelMemberHistory() store.ChannelMemberHistoryStore {
 	return &s.ChannelMemberHistoryStore
 }
 func (s *Store) ChannelBookmark() store.ChannelBookmarkStore { return &s.ChannelBookmarkStore }
-func (s *Store) TrueUpReview() store.TrueUpReviewStore       { return &s.TrueUpReviewStore }
 func (s *Store) DesktopTokens() store.DesktopTokensStore     { return &s.DesktopTokensStore }
 func (s *Store) NotifyAdmin() store.NotifyAdminStore         { return &s.NotifyAdminStore }
 func (s *Store) Group() store.GroupStore                     { return &s.GroupStore }

server/channels/store/storetest/true_up_review_store.go

@@ -1,81 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package storetest
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/mattermost/mattermost/server/public/model"
-	"github.com/mattermost/mattermost/server/public/shared/request"
-	"github.com/mattermost/mattermost/server/v8/channels/store"
-	"github.com/mattermost/mattermost/server/v8/channels/utils"
-)
-
-func TestTrueUpReviewStatusStore(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore) {
-	t.Run("CreateTrueUpReviewStatusRecord", func(t *testing.T) { testCreateTrueUpReviewStatus(t, rctx, ss) })
-	t.Run("GetTrueUpReviewStatus", func(t *testing.T) { testGetTrueUpReviewStatus(t, rctx, ss) })
-	t.Run("Update", func(t *testing.T) { testUpdateTrueUpReviewStatus(t, rctx, ss) })
-}
-
-func testCreateTrueUpReviewStatus(t *testing.T, rctx request.CTX, ss store.Store) {
-	now := time.Date(time.Now().Year(), time.January, 1, 0, 0, 0, 0, time.Local)
-
-	reviewStatus := model.TrueUpReviewStatus{
-		Completed: true,
-		DueDate:   utils.GetNextTrueUpReviewDueDate(now).UnixMilli(),
-	}
-
-	t.Run("create true up review status", func(t *testing.T) {
-		resp, err := ss.TrueUpReview().CreateTrueUpReviewStatusRecord(&reviewStatus)
-		assert.NoError(t, err)
-
-		assert.Equal(t, reviewStatus.Completed, resp.Completed)
-		assert.Equal(t, reviewStatus.DueDate, resp.DueDate)
-	})
-}
-
-func testGetTrueUpReviewStatus(t *testing.T, rctx request.CTX, ss store.Store) {
-	now := time.Date(time.Now().Year(), time.August, 1, 0, 0, 0, 0, time.Local)
-	dueDate := utils.GetNextTrueUpReviewDueDate(now).UnixMilli()
-
-	reviewStatus := model.TrueUpReviewStatus{
-		Completed: true,
-		DueDate:   dueDate,
-	}
-
-	_, err := ss.TrueUpReview().CreateTrueUpReviewStatusRecord(&reviewStatus)
-	assert.NoError(t, err)
-
-	t.Run("get true up review status", func(t *testing.T) {
-		resp, err := ss.TrueUpReview().GetTrueUpReviewStatus(dueDate)
-		assert.NoError(t, err)
-
-		assert.Equal(t, resp.Completed, resp.Completed)
-		assert.Equal(t, resp.DueDate, resp.DueDate)
-	})
-}
-
-func testUpdateTrueUpReviewStatus(t *testing.T, rctx request.CTX, ss store.Store) {
-	now := time.Date(time.Now().Year(), time.April, 1, 0, 0, 0, 0, time.Local)
-
-	reviewStatus := model.TrueUpReviewStatus{
-		Completed: false,
-		DueDate:   utils.GetNextTrueUpReviewDueDate(now).UnixMilli(),
-	}
-
-	_, err := ss.TrueUpReview().CreateTrueUpReviewStatusRecord(&reviewStatus)
-	assert.NoError(t, err)
-
-	t.Run("save ", func(t *testing.T) {
-		reviewStatus.Completed = true
-		resp, err := ss.TrueUpReview().Update(&reviewStatus)
-		assert.NoError(t, err)
-
-		assert.Equal(t, resp.Completed, resp.Completed)
-		assert.Equal(t, resp.DueDate, resp.DueDate)
-	})
-}

server/channels/store/timerlayer/timerlayer.go

@@ -59,7 +59,6 @@ type TimerLayer struct {
 	TermsOfServiceStore             store.TermsOfServiceStore
 	ThreadStore                     store.ThreadStore
 	TokenStore                      store.TokenStore
-	TrueUpReviewStore               store.TrueUpReviewStore
 	UploadSessionStore              store.UploadSessionStore
 	UserStore                       store.UserStore
 	UserAccessTokenStore            store.UserAccessTokenStore
@@ -227,10 +226,6 @@ func (s *TimerLayer) Token() store.TokenStore {
 	return s.TokenStore
 }
 
-func (s *TimerLayer) TrueUpReview() store.TrueUpReviewStore {
-	return s.TrueUpReviewStore
-}
-
 func (s *TimerLayer) UploadSession() store.UploadSessionStore {
 	return s.UploadSessionStore
 }
@@ -451,11 +446,6 @@ type TimerLayerTokenStore struct {
 	Root *TimerLayer
 }
 
-type TimerLayerTrueUpReviewStore struct {
-	store.TrueUpReviewStore
-	Root *TimerLayer
-}
-
 type TimerLayerUploadSessionStore struct {
 	store.UploadSessionStore
 	Root *TimerLayer
@@ -10000,54 +9990,6 @@ func (s *TimerLayerTokenStore) Save(recovery *model.Token) error {
 	return err
 }
 
-func (s *TimerLayerTrueUpReviewStore) CreateTrueUpReviewStatusRecord(reviewStatus *model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error) {
-	start := time.Now()
-
-	result, err := s.TrueUpReviewStore.CreateTrueUpReviewStatusRecord(reviewStatus)
-
-	elapsed := float64(time.Since(start)) / float64(time.Second)
-	if s.Root.Metrics != nil {
-		success := "false"
-		if err == nil {
-			success = "true"
-		}
-		s.Root.Metrics.ObserveStoreMethodDuration("TrueUpReviewStore.CreateTrueUpReviewStatusRecord", success, elapsed)
-	}
-	return result, err
-}
-
-func (s *TimerLayerTrueUpReviewStore) GetTrueUpReviewStatus(dueDate int64) (*model.TrueUpReviewStatus, error) {
-	start := time.Now()
-
-	result, err := s.TrueUpReviewStore.GetTrueUpReviewStatus(dueDate)
-
-	elapsed := float64(time.Since(start)) / float64(time.Second)
-	if s.Root.Metrics != nil {
-		success := "false"
-		if err == nil {
-			success = "true"
-		}
-		s.Root.Metrics.ObserveStoreMethodDuration("TrueUpReviewStore.GetTrueUpReviewStatus", success, elapsed)
-	}
-	return result, err
-}
-
-func (s *TimerLayerTrueUpReviewStore) Update(reviewStatus *model.TrueUpReviewStatus) (*model.TrueUpReviewStatus, error) {
-	start := time.Now()
-
-	result, err := s.TrueUpReviewStore.Update(reviewStatus)
-
-	elapsed := float64(time.Since(start)) / float64(time.Second)
-	if s.Root.Metrics != nil {
-		success := "false"
-		if err == nil {
-			success = "true"
-		}
-		s.Root.Metrics.ObserveStoreMethodDuration("TrueUpReviewStore.Update", success, elapsed)
-	}
-	return result, err
-}
-
 func (s *TimerLayerUploadSessionStore) Delete(id string) error {
 	start := time.Now()
 
@@ -12140,7 +12082,6 @@ func New(childStore store.Store, metrics einterfaces.MetricsInterface) *TimerLay
 	newStore.TermsOfServiceStore = &TimerLayerTermsOfServiceStore{TermsOfServiceStore: childStore.TermsOfService(), Root: &newStore}
 	newStore.ThreadStore = &TimerLayerThreadStore{ThreadStore: childStore.Thread(), Root: &newStore}
 	newStore.TokenStore = &TimerLayerTokenStore{TokenStore: childStore.Token(), Root: &newStore}
-	newStore.TrueUpReviewStore = &TimerLayerTrueUpReviewStore{TrueUpReviewStore: childStore.TrueUpReview(), Root: &newStore}
 	newStore.UploadSessionStore = &TimerLayerUploadSessionStore{UploadSessionStore: childStore.UploadSession(), Root: &newStore}
 	newStore.UserStore = &TimerLayerUserStore{UserStore: childStore.User(), Root: &newStore}
 	newStore.UserAccessTokenStore = &TimerLayerUserAccessTokenStore{UserAccessTokenStore: childStore.UserAccessToken(), Root: &newStore}

server/channels/utils/true_up.go

@@ -1,82 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package utils
-
-import (
-	"time"
-)
-
-const trueUpReviewDueDay = 15
-const day = time.Hour * 24
-
-type DueDateWindow struct {
-	Start time.Time
-	End   time.Time
-}
-
-func GetNextTrueUpReviewDueDate(now time.Time) time.Time {
-	nowYear := now.Year()
-	nowMonth := now.Month()
-	nowDay := now.Day()
-	finalQuarterYear := nowYear
-	if nowMonth >= time.October && nowMonth <= time.December {
-		finalQuarterYear = nowYear + 1
-	}
-	trueUpSubmissionWindows := []DueDateWindow{
-		{
-			Start: time.Date(now.Year(), time.January, 16, 0, 0, 0, 0, now.Location()),
-			End:   time.Date(now.Year(), time.April, 15, 0, 0, 0, 0, now.Location()),
-		},
-		{
-			Start: time.Date(now.Year(), time.April, 16, 0, 0, 0, 0, now.Location()),
-			End:   time.Date(now.Year(), time.July, 15, 0, 0, 0, 0, now.Location()),
-		},
-		{
-			Start: time.Date(now.Year(), time.July, 16, 0, 0, 0, 0, now.Location()),
-			End:   time.Date(now.Year(), time.October, 15, 0, 0, 0, 0, now.Location()),
-		},
-		{
-			Start: time.Date(now.Year(), time.October, 16, 0, 0, 0, 0, now.Location()),
-			End:   time.Date(finalQuarterYear, time.January, 15, 0, 0, 0, 0, now.Location()),
-		},
-	}
-
-	for _, window := range trueUpSubmissionWindows {
-		withinWindow := false
-		// Our due dates "wrap" around (i.e. can go into the next year), so we'll need to check the months different. Since January = 1 and December = 12, the checks
-		// for the current month being greater or equal to the start month and less than or equal to the end month will not work.
-		if window.End.Month() == time.January {
-			withinWindow = (nowMonth != time.January && nowMonth >= window.Start.Month()) || nowMonth == window.End.Month()
-		} else {
-			withinWindow = nowMonth >= window.Start.Month() && nowMonth <= window.End.Month()
-		}
-
-		// Only check the days if the current month is equal to the start or end months.
-		// The dates of the middle month(s) don't matter so much.
-		isFirstMonth := nowMonth == window.Start.Month()
-		if isFirstMonth {
-			withinWindow = withinWindow && nowDay >= window.Start.Day()
-		}
-		isFinalMonth := nowMonth == window.End.Month()
-		if isFinalMonth {
-			withinWindow = withinWindow && nowDay <= window.End.Day()
-		}
-
-		if withinWindow {
-			return window.End
-		}
-	}
-
-	return trueUpSubmissionWindows[0].End
-}
-
-func IsTrueUpReviewDueDateWithinTheNext30Days(now time.Time, dueDate time.Time) bool {
-	dueDateWindow := dueDate.Add(-day * 30)
-
-	if now.Before(dueDateWindow) || now.After(dueDate) {
-		return false
-	}
-
-	return true
-}

server/channels/utils/true_up_test.go

@@ -1,125 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package utils
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestGetNextTrueUpReviewDueDate(t *testing.T) {
-	t.Run("Due date always falls on the 15th", func(t *testing.T) {
-		// Before the 15th
-		now := time.Date(2022, time.March, 14, 0, 0, 0, 0, time.Local)
-		due := GetNextTrueUpReviewDueDate(now)
-		assert.Equal(t, trueUpReviewDueDay, due.Day())
-
-		// On the 15th
-		now = time.Date(2022, time.December, 15, 0, 0, 0, 0, time.Local)
-		due = GetNextTrueUpReviewDueDate(now)
-		assert.Equal(t, trueUpReviewDueDay, due.Day())
-
-		// After the 15th
-		now = time.Date(2022, time.September, 16, 0, 0, 0, 0, time.Local)
-		due = GetNextTrueUpReviewDueDate(now)
-		assert.Equal(t, trueUpReviewDueDay, due.Day())
-	})
-
-	t.Run("Due date will always be in next quarter if the current date is past the 15th", func(t *testing.T) {
-		now := time.Date(2022, time.March, 16, 0, 0, 0, 0, time.Local)
-		due := GetNextTrueUpReviewDueDate(now)
-		assert.Equal(t, time.April, due.Month())
-
-		now = time.Date(2022, time.June, 16, 0, 0, 0, 0, time.Local)
-		due = GetNextTrueUpReviewDueDate(now)
-		assert.Equal(t, time.July, due.Month())
-
-		now = time.Date(2022, time.September, 16, 0, 0, 0, 0, time.Local)
-		due = GetNextTrueUpReviewDueDate(now)
-		assert.Equal(t, time.October, due.Month())
-
-		now = time.Date(2022, time.December, 16, 0, 0, 0, 0, time.Local)
-		due = GetNextTrueUpReviewDueDate(now)
-		assert.Equal(t, time.January, due.Month())
-	})
-
-	t.Run("Due date will always be in the current quarter if the current date is before or on the 15th", func(t *testing.T) {
-		now := time.Date(2022, time.April, 15, 0, 0, 0, 0, time.Local)
-		due := GetNextTrueUpReviewDueDate(now)
-		assert.Equal(t, time.April, due.Month())
-
-		now = time.Date(2022, time.July, 15, 0, 0, 0, 0, time.Local)
-		due = GetNextTrueUpReviewDueDate(now)
-		assert.Equal(t, time.July, due.Month())
-
-		now = time.Date(2022, time.October, 14, 0, 0, 0, 0, time.Local)
-		due = GetNextTrueUpReviewDueDate(now)
-		assert.Equal(t, time.October, due.Month())
-
-		now = time.Date(2022, time.January, 14, 0, 0, 0, 0, time.Local)
-		due = GetNextTrueUpReviewDueDate(now)
-		assert.Equal(t, time.January, due.Month())
-	})
-
-	t.Run("Due date will be in the next year if the next quarter is not within the current year", func(t *testing.T) {
-		now := time.Date(2022, time.October, 21, 0, 0, 0, 0, time.Local)
-		due := GetNextTrueUpReviewDueDate(now)
-		assert.Equal(t, time.January, due.Month())
-		assert.Equal(t, 2023, due.Year())
-	})
-}
-
-func TestIsTrueUpReviewDueDateWithinTheNext15Days(t *testing.T) {
-	t.Run("Ensure a date within 30 days before the due date returns true", func(t *testing.T) {
-		// 1 Day before the due date
-		now := time.Date(2022, time.March, 16, 0, 0, 0, 0, time.Local)
-		// Due date is December 15th, 2022
-		due := GetNextTrueUpReviewDueDate(now)
-
-		res := IsTrueUpReviewDueDateWithinTheNext30Days(now, due)
-		assert.True(t, res)
-	})
-
-	t.Run("Ensure a date that is more than two weeks before the due date returns false", func(t *testing.T) {
-		// 15 Days before the due date
-		now := time.Date(2022, time.October, 16, 0, 0, 0, 0, time.Local)
-		// Due date is December 15th, 2022
-		due := GetNextTrueUpReviewDueDate(now)
-
-		res := IsTrueUpReviewDueDateWithinTheNext30Days(now, due)
-		assert.False(t, res)
-	})
-
-	t.Run("Ensure a date that is past the due date returns false", func(t *testing.T) {
-		now := time.Date(2022, time.April, 15, 0, 0, 0, 0, time.Local)
-
-		// Due date is April 16th, 2022
-		dueNow := time.Date(2022, time.April, 16, 0, 0, 0, 0, time.Local)
-		due := GetNextTrueUpReviewDueDate(dueNow)
-
-		res := IsTrueUpReviewDueDateWithinTheNext30Days(now, due)
-		assert.False(t, res)
-	})
-
-	t.Run("Ensure a date that is on the due date returns true", func(t *testing.T) {
-		now := time.Date(2022, time.January, 15, 0, 0, 0, 0, time.Local)
-		due := GetNextTrueUpReviewDueDate(now)
-		fmt.Printf("\n\ndue date: %s\n\n", due.Format("2006-Jan-02"))
-		fmt.Printf("\n\nnow: %s\n\n", now.Format("2006-Jan-02"))
-
-		res := IsTrueUpReviewDueDateWithinTheNext30Days(now, due)
-		assert.True(t, res)
-	})
-
-	t.Run("Ensure a date that is on the first day of the due date window returns true", func(t *testing.T) {
-		now := time.Date(2022, time.December, 16, 0, 0, 0, 0, time.Local)
-		due := GetNextTrueUpReviewDueDate(now)
-
-		res := IsTrueUpReviewDueDateWithinTheNext30Days(now, due)
-		assert.True(t, res)
-	})
-}

server/channels/web/handlers.go

@@ -258,11 +258,6 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("X-Content-Type-Options", "nosniff")
 	w.Header().Set("Referrer-Policy", "no-referrer")
 
-	cloudCSP := ""
-	if c.App.Channels().License().IsCloud() || *c.App.Config().ServiceSettings.SelfHostedPurchase {
-		cloudCSP = " js.stripe.com/v3"
-	}
-
 	if h.IsStatic {
 		// Instruct the browser not to display us in an iframe unless is the same origin for anti-clickjacking
 		w.Header().Set("X-Frame-Options", "SAMEORIGIN")
@@ -271,9 +266,8 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 		// Set content security policy. This is also specified in the root.html of the webapp in a meta tag.
 		w.Header().Set("Content-Security-Policy", fmt.Sprintf(
-			"frame-ancestors %s; script-src 'self' cdn.rudderlabs.com%s%s%s",
+			"frame-ancestors %s; script-src 'self' cdn.rudderlabs.com%s%s",
 			frameAncestors,
-			cloudCSP,
 			h.cspShaDirective,
 			devCSP,
 		))

server/channels/web/handlers_test.go

@@ -336,29 +336,6 @@ func TestHandlerServeCSPHeader(t *testing.T) {
 			IsStatic:       true,
 		}
 
-		request := httptest.NewRequest("POST", "/", nil)
-		response := httptest.NewRecorder()
-		handler.ServeHTTP(response, request)
-		assert.Equal(t, 200, response.Code)
-		assert.Equal(t, []string{"frame-ancestors " + frameAncestors + "; script-src 'self' cdn.rudderlabs.com js.stripe.com/v3"}, response.Header()["Content-Security-Policy"])
-	})
-
-	t.Run("static, without subpath or SelfHostedPurchase, does not allow Stripe in CSP", func(t *testing.T) {
-		th := Setup(t).InitBasic()
-		th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.SelfHostedPurchase = false })
-		defer th.TearDown()
-
-		web := New(th.Server)
-
-		handler := Handler{
-			Srv:            web.srv,
-			HandleFunc:     handlerForCSPHeader,
-			RequireSession: false,
-			TrustRequester: false,
-			RequireMfa:     false,
-			IsStatic:       true,
-		}
-
 		request := httptest.NewRequest("POST", "/", nil)
 		response := httptest.NewRecorder()
 		handler.ServeHTTP(response, request)
@@ -404,7 +381,7 @@ func TestHandlerServeCSPHeader(t *testing.T) {
 		response := httptest.NewRecorder()
 		handler.ServeHTTP(response, request)
 		assert.Equal(t, 200, response.Code)
-		assert.Equal(t, []string{"frame-ancestors " + frameAncestors + "; script-src 'self' cdn.rudderlabs.com js.stripe.com/v3"}, response.Header()["Content-Security-Policy"])
+		assert.Equal(t, []string{"frame-ancestors " + frameAncestors + "; script-src 'self' cdn.rudderlabs.com"}, response.Header()["Content-Security-Policy"])
 
 		// TODO: It's hard to unit test this now that the CSP directive is effectively
 		// decided in Setup(). Circle back to this in master once the memory store is
@@ -419,7 +396,7 @@ func TestHandlerServeCSPHeader(t *testing.T) {
 		response = httptest.NewRecorder()
 		handler.ServeHTTP(response, request)
 		assert.Equal(t, 200, response.Code)
-		assert.Equal(t, []string{"frame-ancestors " + frameAncestors + "; script-src 'self' cdn.rudderlabs.com js.stripe.com/v3"}, response.Header()["Content-Security-Policy"])
+		assert.Equal(t, []string{"frame-ancestors " + frameAncestors + "; script-src 'self' cdn.rudderlabs.com"}, response.Header()["Content-Security-Policy"])
 		// TODO: See above.
 		// assert.Contains(t, response.Header()["Content-Security-Policy"], "frame-ancestors 'self'; script-src 'self' cdn.rudderlabs.com 'sha256-tPOjw+tkVs9axL78ZwGtYl975dtyPHB6LYKAO2R3gR4='", "csp header incorrectly changed after subpath changed")
 	})
@@ -449,7 +426,7 @@ func TestHandlerServeCSPHeader(t *testing.T) {
 		response := httptest.NewRecorder()
 		handler.ServeHTTP(response, request)
 		assert.Equal(t, 200, response.Code)
-		assert.Equal(t, []string{"frame-ancestors " + frameAncestors + "; script-src 'self' cdn.rudderlabs.com js.stripe.com/v3 'unsafe-eval' 'unsafe-inline'"}, response.Header()["Content-Security-Policy"])
+		assert.Equal(t, []string{"frame-ancestors " + frameAncestors + "; script-src 'self' cdn.rudderlabs.com 'unsafe-eval' 'unsafe-inline'"}, response.Header()["Content-Security-Policy"])
 	})
 }
 

server/einterfaces/cloud.go

@@ -5,7 +5,6 @@ package einterfaces
 
 import (
 	"github.com/mattermost/mattermost/server/public/model"
-	"github.com/mattermost/mattermost/server/public/shared/request"
 )
 
 type CloudInterface interface {
@@ -14,11 +13,7 @@ type CloudInterface interface {
 	GetSelfHostedProducts(userID string) ([]*model.Product, error)
 	GetCloudLimits(userID string) (*model.ProductLimits, error)
 
-	CreateCustomerPayment(userID string) (*model.StripeSetupIntent, error)
-	ConfirmCustomerPayment(userID string, confirmRequest *model.ConfirmPaymentMethodRequest) error
-
 	GetCloudCustomer(userID string) (*model.CloudCustomer, error)
-	GetLicenseSelfServeStatus(userID string, token string) (*model.SubscriptionLicenseSelfServeStatusResponse, error)
 	UpdateCloudCustomer(userID string, customerInfo *model.CloudCustomerInfo) (*model.CloudCustomer, error)
 	UpdateCloudCustomerAddress(userID string, address *model.Address) (*model.CloudCustomer, error)
 
@@ -28,32 +23,17 @@ type CloudInterface interface {
 
 	ChangeSubscription(userID, subscriptionID string, subscriptionChange *model.SubscriptionChange) (*model.Subscription, error)
 
-	RequestCloudTrial(userID, subscriptionID, newValidBusinessEmail string) (*model.Subscription, error)
 	ValidateBusinessEmail(userID, email string) error
 
 	InvalidateCaches() error
 
-	// hosted customer methods
-	SelfHostedSignupAvailable() error
-	BootstrapSelfHostedSignup(req model.BootstrapSelfHostedSignupRequest) (*model.BootstrapSelfHostedSignupResponse, error)
-	CreateCustomerSelfHostedSignup(req model.SelfHostedCustomerForm, requesterEmail string) (*model.SelfHostedSignupCustomerResponse, error)
-	ConfirmSelfHostedSignup(req model.SelfHostedConfirmPaymentMethodRequest, requesterEmail string) (*model.SelfHostedSignupConfirmResponse, error)
-	ConfirmSelfHostedExpansion(req model.SelfHostedConfirmPaymentMethodRequest, requesterEmail string) (*model.SelfHostedSignupConfirmResponse, error)
-	ConfirmSelfHostedSignupLicenseApplication() error
-	GetSelfHostedInvoices(rctx request.CTX) ([]*model.Invoice, error)
-	GetSelfHostedInvoicePDF(invoiceID string) ([]byte, string, error)
-
 	CreateOrUpdateSubscriptionHistoryEvent(userID string, userCount int) (*model.SubscriptionHistory, error)
 	HandleLicenseChange() error
 
 	CheckCWSConnection(userId string) error
 
-	SelfServeDeleteWorkspace(userID string, deletionRequest *model.WorkspaceDeletionRequest) error
 	SubscribeToNewsletter(userID string, req *model.SubscribeNewsletterRequest) error
 
-	// Used only for when a customer has telemetry disabled. In this scenario, true up review telemetry will be submitted via CWS.
-	SubmitTrueUpReview(userID string, trueUpReviewProfile map[string]any) error
-
 	ApplyIPFilters(userID string, ranges *model.AllowedIPRanges) (*model.AllowedIPRanges, error)
 	GetIPFilters(userID string) (*model.AllowedIPRanges, error)
 	GetInstallation(userID string) (*model.Installation, error)

server/einterfaces/mocks/CloudInterface.go

@@ -6,7 +6,6 @@ package mocks
 
 import (
 	model "github.com/mattermost/mattermost/server/public/model"
-	request "github.com/mattermost/mattermost/server/public/shared/request"
 	mock "github.com/stretchr/testify/mock"
 )
 
@@ -45,36 +44,6 @@ func (_m *CloudInterface) ApplyIPFilters(userID string, ranges *model.AllowedIPR
 	return r0, r1
 }
 
-// BootstrapSelfHostedSignup provides a mock function with given fields: req
-func (_m *CloudInterface) BootstrapSelfHostedSignup(req model.BootstrapSelfHostedSignupRequest) (*model.BootstrapSelfHostedSignupResponse, error) {
-	ret := _m.Called(req)
-
-	if len(ret) == 0 {
-		panic("no return value specified for BootstrapSelfHostedSignup")
-	}
-
-	var r0 *model.BootstrapSelfHostedSignupResponse
-	var r1 error
-	if rf, ok := ret.Get(0).(func(model.BootstrapSelfHostedSignupRequest) (*model.BootstrapSelfHostedSignupResponse, error)); ok {
-		return rf(req)
-	}
-	if rf, ok := ret.Get(0).(func(model.BootstrapSelfHostedSignupRequest) *model.BootstrapSelfHostedSignupResponse); ok {
-		r0 = rf(req)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.BootstrapSelfHostedSignupResponse)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(model.BootstrapSelfHostedSignupRequest) error); ok {
-		r1 = rf(req)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 // ChangeSubscription provides a mock function with given fields: userID, subscriptionID, subscriptionChange
 func (_m *CloudInterface) ChangeSubscription(userID string, subscriptionID string, subscriptionChange *model.SubscriptionChange) (*model.Subscription, error) {
 	ret := _m.Called(userID, subscriptionID, subscriptionChange)
@@ -123,162 +92,6 @@ func (_m *CloudInterface) CheckCWSConnection(userId string) error {
 	return r0
 }
 
-// ConfirmCustomerPayment provides a mock function with given fields: userID, confirmRequest
-func (_m *CloudInterface) ConfirmCustomerPayment(userID string, confirmRequest *model.ConfirmPaymentMethodRequest) error {
-	ret := _m.Called(userID, confirmRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ConfirmCustomerPayment")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(string, *model.ConfirmPaymentMethodRequest) error); ok {
-		r0 = rf(userID, confirmRequest)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// ConfirmSelfHostedExpansion provides a mock function with given fields: req, requesterEmail
-func (_m *CloudInterface) ConfirmSelfHostedExpansion(req model.SelfHostedConfirmPaymentMethodRequest, requesterEmail string) (*model.SelfHostedSignupConfirmResponse, error) {
-	ret := _m.Called(req, requesterEmail)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ConfirmSelfHostedExpansion")
-	}
-
-	var r0 *model.SelfHostedSignupConfirmResponse
-	var r1 error
-	if rf, ok := ret.Get(0).(func(model.SelfHostedConfirmPaymentMethodRequest, string) (*model.SelfHostedSignupConfirmResponse, error)); ok {
-		return rf(req, requesterEmail)
-	}
-	if rf, ok := ret.Get(0).(func(model.SelfHostedConfirmPaymentMethodRequest, string) *model.SelfHostedSignupConfirmResponse); ok {
-		r0 = rf(req, requesterEmail)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.SelfHostedSignupConfirmResponse)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(model.SelfHostedConfirmPaymentMethodRequest, string) error); ok {
-		r1 = rf(req, requesterEmail)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// ConfirmSelfHostedSignup provides a mock function with given fields: req, requesterEmail
-func (_m *CloudInterface) ConfirmSelfHostedSignup(req model.SelfHostedConfirmPaymentMethodRequest, requesterEmail string) (*model.SelfHostedSignupConfirmResponse, error) {
-	ret := _m.Called(req, requesterEmail)
-
-	if len(ret) == 0 {
-		panic("no return value specified for ConfirmSelfHostedSignup")
-	}
-
-	var r0 *model.SelfHostedSignupConfirmResponse
-	var r1 error
-	if rf, ok := ret.Get(0).(func(model.SelfHostedConfirmPaymentMethodRequest, string) (*model.SelfHostedSignupConfirmResponse, error)); ok {
-		return rf(req, requesterEmail)
-	}
-	if rf, ok := ret.Get(0).(func(model.SelfHostedConfirmPaymentMethodRequest, string) *model.SelfHostedSignupConfirmResponse); ok {
-		r0 = rf(req, requesterEmail)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.SelfHostedSignupConfirmResponse)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(model.SelfHostedConfirmPaymentMethodRequest, string) error); ok {
-		r1 = rf(req, requesterEmail)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// ConfirmSelfHostedSignupLicenseApplication provides a mock function with given fields:
-func (_m *CloudInterface) ConfirmSelfHostedSignupLicenseApplication() error {
-	ret := _m.Called()
-
-	if len(ret) == 0 {
-		panic("no return value specified for ConfirmSelfHostedSignupLicenseApplication")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func() error); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// CreateCustomerPayment provides a mock function with given fields: userID
-func (_m *CloudInterface) CreateCustomerPayment(userID string) (*model.StripeSetupIntent, error) {
-	ret := _m.Called(userID)
-
-	if len(ret) == 0 {
-		panic("no return value specified for CreateCustomerPayment")
-	}
-
-	var r0 *model.StripeSetupIntent
-	var r1 error
-	if rf, ok := ret.Get(0).(func(string) (*model.StripeSetupIntent, error)); ok {
-		return rf(userID)
-	}
-	if rf, ok := ret.Get(0).(func(string) *model.StripeSetupIntent); ok {
-		r0 = rf(userID)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.StripeSetupIntent)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(string) error); ok {
-		r1 = rf(userID)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// CreateCustomerSelfHostedSignup provides a mock function with given fields: req, requesterEmail
-func (_m *CloudInterface) CreateCustomerSelfHostedSignup(req model.SelfHostedCustomerForm, requesterEmail string) (*model.SelfHostedSignupCustomerResponse, error) {
-	ret := _m.Called(req, requesterEmail)
-
-	if len(ret) == 0 {
-		panic("no return value specified for CreateCustomerSelfHostedSignup")
-	}
-
-	var r0 *model.SelfHostedSignupCustomerResponse
-	var r1 error
-	if rf, ok := ret.Get(0).(func(model.SelfHostedCustomerForm, string) (*model.SelfHostedSignupCustomerResponse, error)); ok {
-		return rf(req, requesterEmail)
-	}
-	if rf, ok := ret.Get(0).(func(model.SelfHostedCustomerForm, string) *model.SelfHostedSignupCustomerResponse); ok {
-		r0 = rf(req, requesterEmail)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.SelfHostedSignupCustomerResponse)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(model.SelfHostedCustomerForm, string) error); ok {
-		r1 = rf(req, requesterEmail)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 // CreateOrUpdateSubscriptionHistoryEvent provides a mock function with given fields: userID, userCount
 func (_m *CloudInterface) CreateOrUpdateSubscriptionHistoryEvent(userID string, userCount int) (*model.SubscriptionHistory, error) {
 	ret := _m.Called(userID, userCount)
@@ -556,103 +369,6 @@ func (_m *CloudInterface) GetInvoicesForSubscription(userID string) ([]*model.In
 	return r0, r1
 }
 
-// GetLicenseSelfServeStatus provides a mock function with given fields: userID, token
-func (_m *CloudInterface) GetLicenseSelfServeStatus(userID string, token string) (*model.SubscriptionLicenseSelfServeStatusResponse, error) {
-	ret := _m.Called(userID, token)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetLicenseSelfServeStatus")
-	}
-
-	var r0 *model.SubscriptionLicenseSelfServeStatusResponse
-	var r1 error
-	if rf, ok := ret.Get(0).(func(string, string) (*model.SubscriptionLicenseSelfServeStatusResponse, error)); ok {
-		return rf(userID, token)
-	}
-	if rf, ok := ret.Get(0).(func(string, string) *model.SubscriptionLicenseSelfServeStatusResponse); ok {
-		r0 = rf(userID, token)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.SubscriptionLicenseSelfServeStatusResponse)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(string, string) error); ok {
-		r1 = rf(userID, token)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// GetSelfHostedInvoicePDF provides a mock function with given fields: invoiceID
-func (_m *CloudInterface) GetSelfHostedInvoicePDF(invoiceID string) ([]byte, string, error) {
-	ret := _m.Called(invoiceID)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetSelfHostedInvoicePDF")
-	}
-
-	var r0 []byte
-	var r1 string
-	var r2 error
-	if rf, ok := ret.Get(0).(func(string) ([]byte, string, error)); ok {
-		return rf(invoiceID)
-	}
-	if rf, ok := ret.Get(0).(func(string) []byte); ok {
-		r0 = rf(invoiceID)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]byte)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(string) string); ok {
-		r1 = rf(invoiceID)
-	} else {
-		r1 = ret.Get(1).(string)
-	}
-
-	if rf, ok := ret.Get(2).(func(string) error); ok {
-		r2 = rf(invoiceID)
-	} else {
-		r2 = ret.Error(2)
-	}
-
-	return r0, r1, r2
-}
-
-// GetSelfHostedInvoices provides a mock function with given fields: rctx
-func (_m *CloudInterface) GetSelfHostedInvoices(rctx request.CTX) ([]*model.Invoice, error) {
-	ret := _m.Called(rctx)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetSelfHostedInvoices")
-	}
-
-	var r0 []*model.Invoice
-	var r1 error
-	if rf, ok := ret.Get(0).(func(request.CTX) ([]*model.Invoice, error)); ok {
-		return rf(rctx)
-	}
-	if rf, ok := ret.Get(0).(func(request.CTX) []*model.Invoice); ok {
-		r0 = rf(rctx)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]*model.Invoice)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(request.CTX) error); ok {
-		r1 = rf(rctx)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 // GetSelfHostedProducts provides a mock function with given fields: userID
 func (_m *CloudInterface) GetSelfHostedProducts(userID string) ([]*model.Product, error) {
 	ret := _m.Called(userID)
@@ -749,90 +465,6 @@ func (_m *CloudInterface) InvalidateCaches() error {
 	return r0
 }
 
-// RequestCloudTrial provides a mock function with given fields: userID, subscriptionID, newValidBusinessEmail
-func (_m *CloudInterface) RequestCloudTrial(userID string, subscriptionID string, newValidBusinessEmail string) (*model.Subscription, error) {
-	ret := _m.Called(userID, subscriptionID, newValidBusinessEmail)
-
-	if len(ret) == 0 {
-		panic("no return value specified for RequestCloudTrial")
-	}
-
-	var r0 *model.Subscription
-	var r1 error
-	if rf, ok := ret.Get(0).(func(string, string, string) (*model.Subscription, error)); ok {
-		return rf(userID, subscriptionID, newValidBusinessEmail)
-	}
-	if rf, ok := ret.Get(0).(func(string, string, string) *model.Subscription); ok {
-		r0 = rf(userID, subscriptionID, newValidBusinessEmail)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.Subscription)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(string, string, string) error); ok {
-		r1 = rf(userID, subscriptionID, newValidBusinessEmail)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// SelfHostedSignupAvailable provides a mock function with given fields:
-func (_m *CloudInterface) SelfHostedSignupAvailable() error {
-	ret := _m.Called()
-
-	if len(ret) == 0 {
-		panic("no return value specified for SelfHostedSignupAvailable")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func() error); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// SelfServeDeleteWorkspace provides a mock function with given fields: userID, deletionRequest
-func (_m *CloudInterface) SelfServeDeleteWorkspace(userID string, deletionRequest *model.WorkspaceDeletionRequest) error {
-	ret := _m.Called(userID, deletionRequest)
-
-	if len(ret) == 0 {
-		panic("no return value specified for SelfServeDeleteWorkspace")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(string, *model.WorkspaceDeletionRequest) error); ok {
-		r0 = rf(userID, deletionRequest)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// SubmitTrueUpReview provides a mock function with given fields: userID, trueUpReviewProfile
-func (_m *CloudInterface) SubmitTrueUpReview(userID string, trueUpReviewProfile map[string]interface{}) error {
-	ret := _m.Called(userID, trueUpReviewProfile)
-
-	if len(ret) == 0 {
-		panic("no return value specified for SubmitTrueUpReview")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(string, map[string]interface{}) error); ok {
-		r0 = rf(userID, trueUpReviewProfile)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
 // SubscribeToNewsletter provides a mock function with given fields: userID, req
 func (_m *CloudInterface) SubscribeToNewsletter(userID string, req *model.SubscribeNewsletterRequest) error {
 	ret := _m.Called(userID, req)

server/i18n/en.json

@@ -2272,14 +2272,6 @@
     "id": "api.license.request-trial.can-start-trial.not-allowed",
     "translation": "Failed to apply new trial license. You have previously applied a trial license to this Mattermost instance.. If you would like to extend your trial period please [contact our sales team](https://mattermost.com/contact-us/)."
   },
-  {
-    "id": "api.license.request_renewal_link.app_error",
-    "translation": "Error getting the license renewal link"
-  },
-  {
-    "id": "api.license.request_renewal_link.cannot_renew_on_cws",
-    "translation": "Renewing this license on the portal is not possible"
-  },
   {
     "id": "api.license.request_trial_license.app_error",
     "translation": "Unable to get a trial license, please try again or contact with support@mattermost.com."
@@ -2288,38 +2280,6 @@
     "id": "api.license.request_trial_license.embargoed",
     "translation": "We were unable to process the request due to limitations for embargoed countries. [Learn more in our documentation](https://mattermost.com/pl/limitations-for-embargoed-countries), or reach out to legal@mattermost.com for questions around export limitations."
   },
-  {
-    "id": "api.license.true_up_review.create_error",
-    "translation": "Could not create true up status record"
-  },
-  {
-    "id": "api.license.true_up_review.failed_to_submit",
-    "translation": "Failed to submit true up review profile to CWS."
-  },
-  {
-    "id": "api.license.true_up_review.get_status_error",
-    "translation": "Could not get true up status records"
-  },
-  {
-    "id": "api.license.true_up_review.license_required",
-    "translation": "True up review requires a license"
-  },
-  {
-    "id": "api.license.true_up_review.not_allowed_for_cloud",
-    "translation": "True up review is not allowed for cloud instances"
-  },
-  {
-    "id": "api.license.true_up_review.user_count_fail",
-    "translation": "Could not get the total active users count"
-  },
-  {
-    "id": "api.license.true_up_review.webhook_in_count_fail",
-    "translation": "Could not get the total incoming webhook count"
-  },
-  {
-    "id": "api.license.true_up_review.webhook_out_count_fail",
-    "translation": "Could not get the total outgoing webhook count"
-  },
   {
     "id": "api.license.upgrade_needed.app_error",
     "translation": "Feature requires an upgrade to Enterprise Edition."
@@ -2854,10 +2814,6 @@
     "id": "api.server.hosted_signup_unavailable.error",
     "translation": "Portal unavailable for self-hosted signup."
   },
-  {
-    "id": "api.server.license_up_for_renewal.error_generating_link",
-    "translation": "Failed to generate the license renewal link"
-  },
   {
     "id": "api.server.license_up_for_renewal.error_sending_email",
     "translation": "Failed to send license up for renewal emails"
@@ -3490,10 +3446,6 @@
     "id": "api.templates.license_up_for_renewal_contact_sales",
     "translation": "Contact sales"
   },
-  {
-    "id": "api.templates.license_up_for_renewal_renew_now",
-    "translation": "Renew now"
-  },
   {
     "id": "api.templates.license_up_for_renewal_subject",
     "translation": "Your license is up for renewal"
@@ -3502,10 +3454,6 @@
     "id": "api.templates.license_up_for_renewal_subtitle",
     "translation": "{{.UserName}}, your subscription is set to expire in {{.Days}} days. We hope you’re experiencing the flexible, secure team collaboration that Mattermost enables. Renew soon to ensure your team can keep enjoying these benefits."
   },
-  {
-    "id": "api.templates.license_up_for_renewal_subtitle_two",
-    "translation": "Log in to your Customer Account to renew"
-  },
   {
     "id": "api.templates.license_up_for_renewal_title",
     "translation": "Your Mattermost subscription is up for renewal"
@@ -3554,10 +3502,6 @@
     "id": "api.templates.questions_footer.title",
     "translation": "Questions?"
   },
-  {
-    "id": "api.templates.remove_expired_license.body.renew_button",
-    "translation": "Renew License Now"
-  },
   {
     "id": "api.templates.remove_expired_license.body.title",
     "translation": "Your Enterprise Edition license has expired and some features may be disabled. Please renew your license now."
@@ -5734,18 +5678,6 @@
     "id": "app.last_accessible_post.app_error",
     "translation": "Error fetching last accessible post"
   },
-  {
-    "id": "app.license.generate_renewal_token.app_error",
-    "translation": "Failed to generate a new renewal token."
-  },
-  {
-    "id": "app.license.generate_renewal_token.bad_license",
-    "translation": "This type of license doesn't support renewal token generation"
-  },
-  {
-    "id": "app.license.generate_renewal_token.no_license",
-    "translation": "No license present"
-  },
   {
     "id": "app.limits.get_app_limits.user_count.store_error",
     "translation": "Failed to get user count"

server/platform/services/telemetry/telemetry.go

@@ -490,7 +490,6 @@ func (ts *TelemetryService) trackConfig() {
 		"persistent_notification_interval_minutes":                *cfg.ServiceSettings.PersistentNotificationIntervalMinutes,
 		"persistent_notification_max_count":                       *cfg.ServiceSettings.PersistentNotificationMaxCount,
 		"persistent_notification_max_recipients":                  *cfg.ServiceSettings.PersistentNotificationMaxRecipients,
-		"self_hosted_purchase":                                    *cfg.ServiceSettings.SelfHostedPurchase,
 		"allow_synced_drafts":                                     *cfg.ServiceSettings.AllowSyncedDrafts,
 		"refresh_post_stats_run_time":                             *cfg.ServiceSettings.RefreshPostStatsRunTime,
 		"maximum_payload_size":                                    *cfg.ServiceSettings.MaximumPayloadSizeBytes,

server/public/model/client4.go

@@ -340,10 +340,6 @@ func (c *Client4) cloudRoute() string {
 	return "/cloud"
 }
 
-func (c *Client4) hostedCustomerRoute() string {
-	return "/hosted_customer"
-}
-
 func (c *Client4) testEmailRoute() string {
 	return "/email/test"
 }
@@ -584,10 +580,6 @@ func (c *Client4) permissionsRoute() string {
 	return "/permissions"
 }
 
-func (c *Client4) limitsRoute() string {
-	return "/limits"
-}
-
 func (c *Client4) bookmarksRoute(channelId string) string {
 	return c.channelRoute(channelId) + "/bookmarks"
 }
@@ -8305,50 +8297,6 @@ func (c *Client4) GetMyIP(ctx context.Context) (*GetIPAddressResponse, *Response
 	return response, BuildResponse(r), nil
 }
 
-func (c *Client4) CreateCustomerPayment(ctx context.Context) (*StripeSetupIntent, *Response, error) {
-	r, err := c.DoAPIPost(ctx, c.cloudRoute()+"/payment", "")
-	if err != nil {
-		return nil, BuildResponse(r), err
-	}
-	defer closeBody(r)
-
-	var setupIntent *StripeSetupIntent
-	json.NewDecoder(r.Body).Decode(&setupIntent)
-
-	return setupIntent, BuildResponse(r), nil
-}
-
-func (c *Client4) ConfirmCustomerPayment(ctx context.Context, confirmRequest *ConfirmPaymentMethodRequest) (*Response, error) {
-	json, err := json.Marshal(confirmRequest)
-	if err != nil {
-		return nil, NewAppError("ConfirmCustomerPayment", "api.marshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
-	}
-	r, err := c.DoAPIPostBytes(ctx, c.cloudRoute()+"/payment/confirm", json)
-	if err != nil {
-		return BuildResponse(r), err
-	}
-	defer closeBody(r)
-
-	return BuildResponse(r), nil
-}
-
-func (c *Client4) RequestCloudTrial(ctx context.Context, cloudTrialRequest *StartCloudTrialRequest) (*Subscription, *Response, error) {
-	payload, err := json.Marshal(cloudTrialRequest)
-	if err != nil {
-		return nil, nil, NewAppError("RequestCloudTrial", "api.marshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
-	}
-	r, err := c.DoAPIPutBytes(ctx, c.cloudRoute()+"/request-trial", payload)
-	if err != nil {
-		return nil, BuildResponse(r), err
-	}
-	defer closeBody(r)
-
-	var subscription *Subscription
-	json.NewDecoder(r.Body).Decode(&subscription)
-
-	return subscription, BuildResponse(r), nil
-}
-
 func (c *Client4) ValidateWorkspaceBusinessEmail(ctx context.Context) (*Response, error) {
 	r, err := c.DoAPIPost(ctx, c.cloudRoute()+"/validate-workspace-business-email", "")
 	if err != nil {
@@ -8415,19 +8363,6 @@ func (c *Client4) GetCloudCustomer(ctx context.Context) (*CloudCustomer, *Respon
 	return cloudCustomer, BuildResponse(r), nil
 }
 
-func (c *Client4) GetSubscriptionStatus(ctx context.Context, licenseId string) (*SubscriptionLicenseSelfServeStatusResponse, *Response, error) {
-	r, err := c.DoAPIGet(ctx, fmt.Sprintf("%s%s?licenseID=%s", c.cloudRoute(), "/subscription/self-serve-status", licenseId), "")
-	if err != nil {
-		return nil, BuildResponse(r), err
-	}
-	defer closeBody(r)
-
-	var status *SubscriptionLicenseSelfServeStatusResponse
-	json.NewDecoder(r.Body).Decode(&status)
-
-	return status, BuildResponse(r), nil
-}
-
 func (c *Client4) GetSubscription(ctx context.Context) (*Subscription, *Response, error) {
 	r, err := c.DoAPIGet(ctx, c.cloudRoute()+"/subscription", "")
 	if err != nil {
@@ -8488,23 +8423,6 @@ func (c *Client4) UpdateCloudCustomerAddress(ctx context.Context, address *Addre
 	return customer, BuildResponse(r), nil
 }
 
-func (c *Client4) BootstrapSelfHostedSignup(ctx context.Context, req BootstrapSelfHostedSignupRequest) (*BootstrapSelfHostedSignupResponse, *Response, error) {
-	reqBytes, err := json.Marshal(req)
-	if err != nil {
-		return nil, nil, NewAppError("BootstrapSelfHostedSignup", "api.marshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
-	}
-	r, err := c.DoAPIPostBytes(ctx, c.hostedCustomerRoute()+"/bootstrap", reqBytes)
-	if err != nil {
-		return nil, BuildResponse(r), err
-	}
-	defer closeBody(r)
-
-	var res *BootstrapSelfHostedSignupResponse
-	json.NewDecoder(r.Body).Decode(&res)
-
-	return res, BuildResponse(r), nil
-}
-
 func (c *Client4) ListImports(ctx context.Context) ([]string, *Response, error) {
 	r, err := c.DoAPIGet(ctx, c.importsRoute(), "")
 	if err != nil {
@@ -8793,96 +8711,6 @@ func (c *Client4) GetTeamsUsage(ctx context.Context) (*TeamsUsage, *Response, er
 	return usage, BuildResponse(r), err
 }
 
-func (c *Client4) SelfHostedSignupAvailable(ctx context.Context) (*Response, error) {
-	r, err := c.DoAPIGet(ctx, c.hostedCustomerRoute()+"/signup_available", "")
-
-	if err != nil {
-		return BuildResponse(r), err
-	}
-	defer closeBody(r)
-
-	return BuildResponse(r), nil
-}
-
-func (c *Client4) SelfHostedSignupCustomer(ctx context.Context, form *SelfHostedCustomerForm) (*Response, *SelfHostedSignupCustomerResponse, error) {
-	payloadBytes, err := json.Marshal(form)
-	if err != nil {
-		return nil, nil, NewAppError("SelfHostedSignupCustomer", "api.marshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
-	}
-
-	r, err := c.DoAPIPost(ctx, c.hostedCustomerRoute()+"/customer", string(payloadBytes))
-
-	if err != nil {
-		return BuildResponse(r), nil, err
-	}
-	data, err := io.ReadAll(r.Body)
-	if err != nil {
-		return BuildResponse(r), nil, err
-	}
-	defer closeBody(r)
-
-	response := SelfHostedSignupCustomerResponse{}
-	err = json.Unmarshal(data, &response)
-	if err != nil {
-		return BuildResponse(r), nil, err
-	}
-
-	return BuildResponse(r), &response, nil
-}
-
-func (c *Client4) SelfHostedSignupConfirm(ctx context.Context, form *SelfHostedConfirmPaymentMethodRequest) (*Response, *SelfHostedSignupConfirmClientResponse, error) {
-	payloadBytes, err := json.Marshal(form)
-	if err != nil {
-		return nil, nil, NewAppError("SelfHostedSignupConfirm", "api.marshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
-	}
-
-	r, err := c.DoAPIPost(ctx, c.hostedCustomerRoute()+"/confirm", string(payloadBytes))
-
-	if err != nil {
-		return BuildResponse(r), nil, err
-	}
-
-	data, err := io.ReadAll(r.Body)
-	if err != nil {
-		return BuildResponse(r), nil, err
-	}
-	defer closeBody(r)
-
-	response := SelfHostedSignupConfirmClientResponse{}
-	err = json.Unmarshal(data, &response)
-	if err != nil {
-		return BuildResponse(r), nil, err
-	}
-
-	defer closeBody(r)
-
-	return BuildResponse(r), &response, nil
-}
-
-func (c *Client4) GetSelfHostedInvoices(ctx context.Context) (*Response, []*Invoice, error) {
-	r, err := c.DoAPIGet(ctx, c.hostedCustomerRoute()+"/invoices", "")
-
-	if err != nil {
-		return BuildResponse(r), nil, err
-	}
-
-	data, err := io.ReadAll(r.Body)
-	if err != nil {
-		return BuildResponse(r), nil, err
-	}
-	defer closeBody(r)
-
-	invoices := []*Invoice{}
-	err = json.Unmarshal(data, &invoices)
-	if err != nil {
-		return BuildResponse(r), nil, err
-	}
-
-	defer closeBody(r)
-
-	return BuildResponse(r), invoices, nil
-}
-
 func (c *Client4) GetPostInfo(ctx context.Context, postId string) (*PostInfo, *Response, error) {
 	r, err := c.DoAPIGet(ctx, c.postRoute(postId)+"/info", "")
 	if err != nil {
@@ -8939,36 +8767,6 @@ func (c *Client4) CheckCWSConnection(ctx context.Context, userId string) (*Respo
 	return BuildResponse(r), nil
 }
 
-func (c *Client4) SubmitTrueUpReview(ctx context.Context, req map[string]any) (*Response, error) {
-	reqBytes, err := json.Marshal(req)
-	if err != nil {
-		return nil, NewAppError("SubmitTrueUpReview", "api.marshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
-	}
-	r, err := c.DoAPIPostBytes(ctx, c.licenseRoute()+"/review", reqBytes)
-	if err != nil {
-		return BuildResponse(r), nil
-	}
-	defer closeBody(r)
-
-	return BuildResponse(r), nil
-}
-
-func (c *Client4) GetServerLimits(ctx context.Context) (*ServerLimits, *Response, error) {
-	r, err := c.DoAPIGet(ctx, c.limitsRoute()+"/users", "")
-	if err != nil {
-		return nil, BuildResponse(r), err
-	}
-	defer closeBody(r)
-	var serverLimits ServerLimits
-	if r.StatusCode == http.StatusNotModified {
-		return &serverLimits, BuildResponse(r), nil
-	}
-	if err := json.NewDecoder(r.Body).Decode(&serverLimits); err != nil {
-		return nil, nil, NewAppError("GetServerLimits", "api.unmarshal_error", nil, "", http.StatusInternalServerError).Wrap(err)
-	}
-	return &serverLimits, BuildResponse(r), nil
-}
-
 // CreateChannelBookmark creates a channel bookmark based on the provided struct.
 func (c *Client4) CreateChannelBookmark(ctx context.Context, channelBookmark *ChannelBookmark) (*ChannelBookmark, *Response, error) {
 	channelBookmarkJSON, err := json.Marshal(channelBookmark)

server/public/model/config.go

@@ -403,7 +403,6 @@ type ServiceSettings struct {
 	CollapsedThreads                                  *string `access:"experimental_features"`
 	ManagedResourcePaths                              *string `access:"environment_web_server,write_restrictable,cloud_restrictable"`
 	EnableCustomGroups                                *bool   `access:"site_users_and_teams"`
-	SelfHostedPurchase                                *bool   `access:"write_restrictable,cloud_restrictable"`
 	AllowSyncedDrafts                                 *bool   `access:"site_posts"`
 	UniqueEmojiReactionLimitPerPost                   *int    `access:"site_posts"`
 	RefreshPostStatsRunTime                           *string `access:"site_users_and_teams"`
@@ -903,10 +902,6 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
 		s.AllowSyncedDrafts = NewBool(true)
 	}
 
-	if s.SelfHostedPurchase == nil {
-		s.SelfHostedPurchase = NewBool(true)
-	}
-
 	if s.UniqueEmojiReactionLimitPerPost == nil {
 		s.UniqueEmojiReactionLimitPerPost = NewInt(ServiceSettingsDefaultUniqueReactionsPerPost)
 	}

server/public/model/hosted_customer.go

@@ -3,71 +3,8 @@
 
 package model
 
-type BootstrapSelfHostedSignupRequest struct {
-	Email string `json:"email"`
-	Reset bool   `json:"reset"`
-}
-
 type SubscribeNewsletterRequest struct {
 	Email             string `json:"email"`
 	ServerID          string `json:"server_id"`
 	SubscribedContent string `json:"subscribed_content"`
 }
-
-type BootstrapSelfHostedSignupResponse struct {
-	Progress string `json:"progress"`
-	// email listed on the JWT claim
-	Email string `json:"email"`
-}
-
-type BootstrapSelfHostedSignupResponseInternal struct {
-	Progress string `json:"progress"`
-	License  string `json:"license"`
-}
-
-// email contained in token, so not in the request body.
-type SelfHostedCustomerForm struct {
-	FirstName       string   `json:"first_name"`
-	LastName        string   `json:"last_name"`
-	BillingAddress  *Address `json:"billing_address"`
-	ShippingAddress *Address `json:"shipping_address"`
-	Organization    string   `json:"organization"`
-}
-
-type SelfHostedConfirmPaymentMethodRequest struct {
-	StripeSetupIntentID string                      `json:"stripe_setup_intent_id"`
-	Subscription        *CreateSubscriptionRequest  `json:"subscription"`
-	ExpandRequest       *SelfHostedExpansionRequest `json:"expand_request"`
-}
-
-// SelfHostedSignupPaymentResponse contains feels needed for self hosted signup to confirm payment and receive license.
-type SelfHostedSignupCustomerResponse struct {
-	CustomerId        string `json:"customer_id"`
-	SetupIntentId     string `json:"setup_intent_id"`
-	SetupIntentSecret string `json:"setup_intent_secret"`
-	Progress          string `json:"progress"`
-}
-
-// SelfHostedSignupConfirmResponse contains data received on successful self hosted signup
-type SelfHostedSignupConfirmResponse struct {
-	License  string `json:"license"`
-	Progress string `json:"progress"`
-}
-
-type SelfHostedSignupConfirmClientResponse struct {
-	License  map[string]string `json:"license"`
-	Progress string            `json:"progress"`
-}
-
-type SelfHostedBillingAccessRequest struct {
-	LicenseId string `json:"license_id"`
-}
-
-type SelfHostedBillingAccessResponse struct {
-	Token string `json:"token"`
-}
-
-type SelfHostedExpansionRequest struct {
-	Seats     int    `json:"seats"`
-	LicenseId string `json:"license_id"`
-}

server/public/model/license.go

@@ -39,15 +39,6 @@ var (
 	sanctionedTrialDurationUpperBound = 29*(time.Hour*24) + (time.Hour * 23) + (time.Minute * 59) + (time.Second * 59) // 696 hours (29 days) + 23 hours, 59 mins and 59 seconds
 )
 
-const (
-	TrueUpReviewTelemetryName          = "true_up_review_sent"
-	TrueUpReviewAuthFeaturesMfa        = "multi_factor_authentication"
-	TrueUpReviewAuthFeaturesADLdap     = "ad_ldap_sign_in"
-	TrueUpReviewAuthFeaturesSaml       = "saml_sign_in"
-	TrueUpReviewAuthFeatureOpenId      = "openid_connect"
-	TrueUpReviewAuthFeatureGuestAccess = "guest_access"
-)
-
 type LicenseRecord struct {
 	Id       string `json:"id"`
 	CreateAt int64  `json:"create_at"`

server/public/model/true_up_review_profile.go

@@ -1,47 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model
-
-import "strings"
-
-type TrueUpReviewProfile struct {
-	ServerId               string              `json:"server_id"`
-	ServerVersion          string              `json:"server_version"`
-	ServerInstallationType string              `json:"server_installation_type"`
-	LicenseId              string              `json:"license_id"`
-	LicensedSeats          int                 `json:"licensed_seats"`
-	LicensePlan            string              `json:"license_plan"`
-	CustomerName           string              `json:"customer_name"`
-	ActivatedUsers         int64               `json:"total_activated_users"`
-	DailyActiveUsers       int64               `json:"daily_active_users"`
-	MonthlyActiveUsers     int64               `json:"monthly_active_users"`
-	AuthenticationFeatures []string            `json:"authentication_features"`
-	Plugins                TrueUpReviewPlugins `json:"plugins"`
-	TotalIncomingWebhooks  int64               `json:"incoming_webhooks_count"`
-	TotalOutgoingWebhooks  int64               `json:"outgoing_webhooks_count"`
-}
-
-type TrueUpReviewPlugins struct {
-	TotalPlugins int      `json:"total_plugins"`
-	PluginNames  []string `json:"plugin_names"`
-}
-
-func (t *TrueUpReviewPlugins) ToMap() map[string]interface{} {
-	return map[string]interface{}{
-		"total_plugins": t.TotalPlugins,
-		"plugin_names":  strings.Join(t.PluginNames, ","),
-	}
-}
-
-type TrueUpReviewStatus struct {
-	Completed bool  `json:"complete"`
-	DueDate   int64 `json:"due_date"`
-}
-
-func (t *TrueUpReviewStatus) ToSlice() []interface{} {
-	return []interface{}{
-		t.DueDate,
-		t.Completed,
-	}
-}