Fix issue #474 concerning NO_AUTH setting when using a database

pantsel · Oct 19, 2019 · b012b08 · b012b08
1 parent 801ac94
commit b012b08
Show file tree

Hide file tree

Showing 6 changed files with 239 additions and 225 deletions.
diff --git a/api/controllers/KongNodeController.js b/api/controllers/KongNodeController.js
@@ -44,7 +44,6 @@ module.exports = _.merge(_.cloneDeep(require('../base/Controller')), {
 
 
     create : function(req,res) {
-
         sails.models.kongnode.create(req.body)
             .exec(function(err, node){
                 if(err) {
@@ -75,9 +74,6 @@ module.exports = _.merge(_.cloneDeep(require('../base/Controller')), {
                         return res.created(node);
                     }
                 })
-
-
-
             })
     }
 });
diff --git a/api/policies/addDataCreate.js b/api/policies/addDataCreate.js
@@ -10,6 +10,10 @@
 module.exports = function addDataCreate(request, response, next) {
   sails.log.verbose(__filename + ':' + __line + ' [Policy.addDataCreate() called]');
 
+  if(process.env.NO_AUTH === 'true') {
+    return next();
+  }
+
   if (request.token) {
     request.body.createdUser = request.token;
     request.body.updatedUser = request.token;

diff --git a/assets/js/app/connections/create-connection-controller.js b/assets/js/app/connections/create-connection-controller.js
@@ -47,4 +47,4 @@
             }
         ])
     ;
-}());
+}());
diff --git a/assets/js/app/core/layout/01_layout-controllers.js b/assets/js/app/core/layout/01_layout-controllers.js
@@ -166,6 +166,7 @@
                 }, function (err) {
                   $scope.busy = false
                   UserModel.handleError($scope, err)
+                  MessageService.error(_.get(err, 'data.message', 'Something went wrong...'))
                 }
               );
 

diff --git a/assets/js/app/dashboard/02_dashboard-controller.js b/assets/js/app/dashboard/02_dashboard-controller.js
@@ -236,20 +236,31 @@
                               $scope.checkingConnection = false;
 
                               // Finally, activate the node for the logged in user
-                              UserModel
-                                  .update(UserService.user().id, {
-                                      node : created
-                                  })
-                                  .then(
+                              if(window.no_auth) {
+                                  var credentials = $localStorage.credentials;
+                                  if(credentials.user.node && credentials.user.node.id == node.id) {
+                                      delete credentials.user.node;
+                                  }else{
+                                      credentials.user.node = created;
+                                  }
+                                  $rootScope.$broadcast('user.node.updated', credentials.user.node)
+                              } else {
+                                  UserModel
+                                    .update(UserService.user().id, {
+                                        node : created
+                                    })
+                                    .then(
                                       function onSuccess(res) {
                                           var credentials = $localStorage.credentials
                                           credentials.user.node = result.data[0]
                                           $rootScope.$broadcast('user.node.updated',created)
                                       },function(err){
                                           $scope.busy = false
                                           UserModel.handleError($scope,err)
+                                          MessageService.error(_.get(err, 'data.message', 'Something went wrong...'))
                                       }
-                                  );
+                                    );
+                              }
 
                           }).catch(function(error){
                               $log.debug("Check connection:error",error)
@@ -258,8 +269,10 @@
                               MessageService.error("Oh snap! Can't connect to the created node. Check your connections.")
                           })
                       },function(err){
-                          $scope.busy = false
-                          NodeModel.handleError($scope,err)
+                        console.log(err);
+                        $scope.busy = false
+                        NodeModel.handleError($scope,err)
+                        MessageService.error(_.get(err, 'data.message', 'Something went wrong...'))
                       }
                   )
               ;