From 560b4b7c7e9a28c7ac3461e07b611126e39b7c30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 6 Feb 2020 15:55:38 +0100 Subject: [PATCH] MM-21882: Remove the license requirement to promote guests to regular users (#13790) * MM-21882: Remove the license requirement to promote guests to regular users * Removing unneded translation keys Co-authored-by: mattermod --- api4/user.go | 10 ---------- i18n/en.json | 8 -------- 2 files changed, 18 deletions(-) diff --git a/api4/user.go b/api4/user.go index e0828a2947..d20bb1208f 100644 --- a/api4/user.go +++ b/api4/user.go @@ -1966,16 +1966,6 @@ func promoteGuestToUser(c *Context, w http.ResponseWriter, r *http.Request) { return } - if c.App.License() == nil { - c.Err = model.NewAppError("Api4.promoteGuestToUser", "api.team.promote_guest_to_user.license.error", nil, "", http.StatusNotImplemented) - return - } - - if !*c.App.Config().GuestAccountsSettings.Enable { - c.Err = model.NewAppError("Api4.promoteGuestToUser", "api.team.promote_guest_to_user.disabled.error", nil, "", http.StatusNotImplemented) - return - } - if !c.App.SessionHasPermissionTo(c.App.Session, model.PERMISSION_PROMOTE_GUEST) { c.SetPermissionError(model.PERMISSION_PROMOTE_GUEST) return diff --git a/i18n/en.json b/i18n/en.json index 3e4253dad0..b2f1fffeaa 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2058,14 +2058,6 @@ "id": "api.team.move_channel.success", "translation": "This channel has been moved to this team from %v." }, - { - "id": "api.team.promote_guest_to_user.disabled.error", - "translation": "Guest accounts are disabled." - }, - { - "id": "api.team.promote_guest_to_user.license.error", - "translation": "Your license does not support guest accounts" - }, { "id": "api.team.remove_member.group_constrained.app_error", "translation": "Unable to remove a user from a group-constrained team."