From 0167015b4670a37612a9965bb9d989f96c3e0d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Mon, 12 Sep 2016 12:28:07 +0200
Subject: [PATCH] Fix generate/delete API key functionality in user settings

Closes #1491
---
 .../static/js/app/viewmodels/usersettings.js       | 14 ++++++++++++++
 .../templates/dialogs/usersettings/access.jinja2   |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/octoprint/static/js/app/viewmodels/usersettings.js b/src/octoprint/static/js/app/viewmodels/usersettings.js
index 68a5f369..9bd9bad4 100644
--- a/src/octoprint/static/js/app/viewmodels/usersettings.js
+++ b/src/octoprint/static/js/app/viewmodels/usersettings.js
@@ -68,6 +68,20 @@ $(function() {
             });
         };
 
+        self.generateApikey = function() {
+            if (!CONFIG_ACCESS_CONTROL) return;
+            self.users.generateApikey(self.currentUser().name, function(response) {
+                self.access_apikey(response.apikey);
+            });
+        };
+
+        self.deleteApikey = function() {
+            if (!CONFIG_ACCESS_CONTROL) return;
+            self.users.deleteApikey(self.currentUser().name, function() {
+                self.access_apikey(undefined);
+            });
+        };
+
         self.updateSettings = function(username, settings, callback) {
             if (!CONFIG_ACCESS_CONTROL) return;
 
diff --git a/src/octoprint/templates/dialogs/usersettings/access.jinja2 b/src/octoprint/templates/dialogs/usersettings/access.jinja2
index 38788c9e..6cb7e2f9 100644
--- a/src/octoprint/templates/dialogs/usersettings/access.jinja2
+++ b/src/octoprint/templates/dialogs/usersettings/access.jinja2
@@ -25,8 +25,8 @@
             <div class="controls">
                 <div class="input-append">
                     <input type="text" class="input-block-level uneditable-input" id="userSettings-access_apikey" data-bind="value: access_apikey, valueUpdate: 'input', attr: {placeholder: '{{ _('N/A') }}'}">
-                    <a class="btn" title="Generate new Apikey" data-bind="click: function() { users.confirmGenerateApikey(); }"><i class="icon-refresh"></i></a>
-                    <a class="btn btn-danger" title="Delete Apikey" data-bind="click: function() { users.confirmDeleteApikey(); }"><i class="icon-trash"></i></a>
+                    <a class="btn" title="Generate new Apikey" data-bind="click: generateApikey"><i class="icon-refresh"></i></a>
+                    <a class="btn btn-danger" title="Delete Apikey" data-bind="click: deleteApikey"><i class="icon-trash"></i></a>
                 </div>
 
             </div>