From 30856433f878a1dd4b580bcc0d594baa0ea8569c Mon Sep 17 00:00:00 2001
From: McMatts <matt@documize.com>
Date: Fri, 15 Jun 2018 14:26:02 +0100
Subject: [PATCH] License key workflow improved

Co-Authored-By: Saul S <sauls8t@users.noreply.github.com>
---
 domain/setting/endpoint.go                          | 13 +++++++------
 gui/app/components/customize/license-key.js         |  6 ++++--
 gui/app/pods/customize/license/controller.js        | 11 -----------
 gui/app/pods/customize/license/route.js             |  5 +----
 gui/app/pods/customize/license/template.hbs         |  2 +-
 .../templates/components/customize/license-key.hbs  |  2 +-
 6 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/domain/setting/endpoint.go b/domain/setting/endpoint.go
index 3b4c7a1d..95314bb1 100644
--- a/domain/setting/endpoint.go
+++ b/domain/setting/endpoint.go
@@ -200,15 +200,16 @@ func (h *Handler) SetLicense(w http.ResponseWriter, r *http.Request) {
 
 	h.Store.Setting.Set("EDITION-LICENSE", js)
 
-	ctx.Transaction, err = h.Runtime.Db.Beginx()
-	if err != nil {
-		response.WriteServerError(w, method, err)
-		return
-	}
+	/* ctx.Transaction, err = h.Runtime.Db.Beginx()*/
+	//if err != nil {
+	//response.WriteServerError(w, method, err)
+	//return
+	//}
 
-	ctx.Transaction.Commit()
+	/*ctx.Transaction.Commit()*/
 
 	h.Runtime.Log.Info("License changed")
+
 	event.Handler().Publish(string(event.TypeSystemLicenseChange))
 
 	h.Store.Audit.Record(ctx, audit.EventTypeSystemLicense)
diff --git a/gui/app/components/customize/license-key.js b/gui/app/components/customize/license-key.js
index 748ee45f..9eb271d8 100644
--- a/gui/app/components/customize/license-key.js
+++ b/gui/app/components/customize/license-key.js
@@ -17,7 +17,8 @@ import Component from '@ember/component';
 
 export default Component.extend(Notifier, {
 	appMeta: service(),
-	LicenseError: empty('model.license'),
+	global: service(),
+	LicenseError: empty('license'),
 	changelog: '',
 
 	init() {
@@ -38,7 +39,8 @@ export default Component.extend(Notifier, {
 	actions: {
 		saveLicense() {
 			this.showWait();
-			this.get('saveLicense')().then(() => {
+
+			this.get('global').saveLicense(this.get('license')).then(() => {
 				this.showDone();
 				window.location.reload();
 			});
diff --git a/gui/app/pods/customize/license/controller.js b/gui/app/pods/customize/license/controller.js
index e25fed90..fe1fb43c 100644
--- a/gui/app/pods/customize/license/controller.js
+++ b/gui/app/pods/customize/license/controller.js
@@ -9,18 +9,7 @@
 //
 // https://documize.com
 
-import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 
 export default Controller.extend({
-	global: service(),
-
-	actions: {
-		saveLicense() {
-			if(this.get('session.isGlobalAdmin')) {
-				return this.get('global').saveLicense(this.model.license).then(() => {
-				});
-			}
-		}
-	}
 });
diff --git a/gui/app/pods/customize/license/route.js b/gui/app/pods/customize/license/route.js
index 17b8b77e..5c338ef8 100644
--- a/gui/app/pods/customize/license/route.js
+++ b/gui/app/pods/customize/license/route.js
@@ -11,7 +11,6 @@
 
 import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
-import RSVP from 'rsvp';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
 export default Route.extend(AuthenticatedRouteMixin, {
@@ -26,9 +25,7 @@ export default Route.extend(AuthenticatedRouteMixin, {
 	},
 
 	model() {
-		return RSVP.hash({
-			license: this.get('global').getLicense()
-		});
+		return this.get('global').getLicense();
 	},
 
 	activate() {
diff --git a/gui/app/pods/customize/license/template.hbs b/gui/app/pods/customize/license/template.hbs
index 4bfb64b0..e019dde0 100644
--- a/gui/app/pods/customize/license/template.hbs
+++ b/gui/app/pods/customize/license/template.hbs
@@ -1 +1 @@
-{{customize/license-key model=model saveLicense=(action 'saveLicense')}}
+{{customize/license-key license=model}}
diff --git a/gui/app/templates/components/customize/license-key.hbs b/gui/app/templates/components/customize/license-key.hbs
index 6a0cea72..3bb89354 100644
--- a/gui/app/templates/components/customize/license-key.hbs
+++ b/gui/app/templates/components/customize/license-key.hbs
@@ -13,7 +13,7 @@
 	<form class="mt-5 ">
 		<div class="form-group">
 			<label for="product-license-xml">Enterprise Edition license (optional)</label>
-			<textarea id="product-license-xml" rows=18 value={{model.license}} class={{if LicenseError 'form-control is-invalid' 'form-control'}}></textarea>
+			{{textarea id="product-license-xml" value=license rows="18" class=(if LicenseError 'form-control is-invalid' 'form-control')}}
 			<small class="form-text text-muted ">XML format</small>
 			{{#if appMeta.valid}}
 				<p class="mt-2 color-green">Valid</p>