1 files changed, 16 insertions, 10 deletions

diff --git a/src/BeerDukeTap.js b/src/BeerDukeTap.js
index 91fc5d9..d25fc64 100644
--- a/src/BeerDukeTap.js
+++ b/src/BeerDukeTap.js
@@ -1,9 +1,13 @@
 (function () {
   'use strict';
 
-  function BeerDukeTapController($log, $timeout, BeerDukeService, TsService) {
+  function BeerDukeTapController($log, $timeout, BeerDukeService, BeerDukeSettings, TsService) {
     var ctrl = this;
 
+    if(!BeerDukeSettings.values.clientId) {
+      BeerDukeSettings.setRandomClientId();
+    }
+
     var messages = ctrl.messages = [];
     ctrl.count = 0;
     ctrl.code = '';
@@ -17,7 +21,7 @@
     }
 
     BeerDukeService.callbacks.onConnect = function () {
-      BeerDukeService.subscribe('/beer-duke/give-beer');
+      BeerDukeService.subscribe(BeerDukeSettings.values.tap + '/give-beer');
     };
     BeerDukeService.callbacks.onMessageArrived = function (m) {
       $log.info('m.payloadString =', m.payloadString);
@@ -32,7 +36,7 @@
         return;
       }
 
-      if (m.destinationName == '/beer-duke/give-beer') {
+      if (m.destinationName == BeerDukeSettings.values.tap + '/give-beer') {
         var code = payload.code;
         var email = payload.email;
 
@@ -41,16 +45,18 @@
           return;
         }
 
-        TsService.giveBeer().then(function(counts) {
-          _.forEach(counts, function(count, index) {
-            BeerDukeService.updateSlots(index, count);
-          });
-        });
-
-        ctrl.message = payload;
+        onGiveBeerRequest(email, code);
       }
     };
 
+    function onGiveBeerRequest(email, code) {
+      TsService.giveBeer().then(function(counts) {
+        BeerDukeService.updateSlots(counts);
+      });
+
+      //ctrl.message = code;
+    }
+
     BeerDukeService.connect('tap');
   }