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_test.go | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(limited to 'app/user_test.go')

diff --git a/app/user_test.go b/app/user_test.go
index 92ff4d62a..a007f93d5 100644
--- a/app/user_test.go
+++ b/app/user_test.go
@@ -524,3 +524,43 @@ func TestPermanentDeleteUser(t *testing.T) {
 		t.Fatal("GetFileInfo after DeleteUser is nil")
 	}
 }
+
+func TestRecordUserServiceTermsAction(t *testing.T) {
+	th := Setup().InitBasic()
+	defer th.TearDown()
+
+	user := &model.User{
+		Email: strings.ToLower(model.NewId()) + "success+test@example.com",
+		Nickname: "Luke Skywalker", // trying to bring balance to the "Force", one test user at a time
+		Username: "luke" + model.NewId(),
+		Password: "passwd1",
+		AuthService: "",
+	}
+	user, err := th.App.CreateUser(user)
+	if err != nil {
+		t.Fatalf("failed to create user: %v", err)
+	}
+
+	defer th.App.PermanentDeleteUser(user)
+
+	serviceTerms, err := th.App.CreateServiceTerms("text", user.Id)
+	if err != nil {
+		t.Fatalf("failed to create service terms: %v", err)
+	}
+
+	err = th.App.RecordUserServiceTermsAction(user.Id, serviceTerms.Id, true)
+	if err != nil {
+		t.Fatalf("failed to record user action: %v", err)
+	}
+
+	nuser, err := th.App.GetUser(user.Id)
+	assert.Equal(t, serviceTerms.Id, nuser.AcceptedServiceTermsId)
+
+	err = th.App.RecordUserServiceTermsAction(user.Id, serviceTerms.Id, false)
+	if err != nil {
+		t.Fatalf("failed to record user action: %v", err)
+	}
+
+	nuser, err = th.App.GetUser(user.Id)
+	assert.Empty(t, nuser.AcceptedServiceTermsId)
+}
-- 
cgit v1.2.3-1-g7c22