From af275fe9242303581192258ef4f6457fa45a58e4 Mon Sep 17 00:00:00 2001
From: Harshil Sharma <harshil.sharma@joshtechnologygroup.com>
Date: Wed, 26 Sep 2018 20:49:22 +0000
Subject: #MM-12130 changes for custom service terms (#9450)

* #MM-12130 changes for custom service terms

* Fixed styling

* Added getServiceTerms API

* removed unnecessary panic

* removed custom service terms text from flat config

* reverted user sql store as those changes are no longer needed

* added tests

* Updated a config key to be more standard

* Added copyright info

* Loading service terms only if the feature is enabled

* Loading service terms only if the feature is enabled

* removed unused index

* added createservice termns API

* made a param to bool instead of string

* added createservice termns API

* review fixes

* fixed styling

* Minor refactoring

* removed saveConfig and loadConfig magic

* added empty service terms text check to createServiceTerms API

* refactoed some urls to be terms_of_service instead of service_terms

* removed check for support settings

* changed URLs in tests

* removed unused code

* fixed a bug

* added service termd id in conif

* fixed a test

* review fixes

* minor fixes

* Fixed TestCreateServiceTerms
---
 app/user.go | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'app/user.go')

diff --git a/app/user.go b/app/user.go
index c8df2ca26..86f44db4e 100644
--- a/app/user.go
+++ b/app/user.go
@@ -245,7 +245,6 @@ func (a *App) createUser(user *model.User) (*model.User, *model.AppError) {
 		}
 
 		ruser.Sanitize(map[string]bool{})
-
 		return ruser, nil
 	}
 }
@@ -1616,3 +1615,22 @@ func (a *App) UpdateOAuthUserAttrs(userData io.Reader, user *model.User, provide
 
 	return nil
 }
+
+func (a *App) RecordUserServiceTermsAction(userId, serviceTermsId string, accepted bool) *model.AppError {
+	user, err := a.GetUser(userId)
+	if err != nil {
+		return err
+	}
+
+	if accepted {
+		user.AcceptedServiceTermsId = serviceTermsId
+	} else {
+		user.AcceptedServiceTermsId = ""
+	}
+	_, err = a.UpdateUser(user, false)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
-- 
cgit v1.2.3-1-g7c22