From be4f3ec81d57a367c12f1c0155d9e2b56ed99b0d Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <lapenna.anthony@gmail.com>
Date: Mon, 11 Sep 2017 10:36:18 +0200
Subject: [PATCH] fix(admin-init): do not redirect to endpoint-init if at least
 one endpoint is defined

---
 .../initAdmin/initAdminController.js          | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/components/initAdmin/initAdminController.js b/app/components/initAdmin/initAdminController.js
index a78fa7854..a396cbd17 100644
--- a/app/components/initAdmin/initAdminController.js
+++ b/app/components/initAdmin/initAdminController.js
@@ -1,6 +1,6 @@
 angular.module('initAdmin', [])
-.controller('InitAdminController', ['$scope', '$state', '$sanitize', 'Notifications', 'Authentication', 'StateManager', 'UserService',
-function ($scope, $state, $sanitize, Notifications, Authentication, StateManager, UserService) {
+.controller('InitAdminController', ['$scope', '$state', '$sanitize', 'Notifications', 'Authentication', 'StateManager', 'UserService', 'EndpointService', 'EndpointProvider',
+function ($scope, $state, $sanitize, Notifications, Authentication, StateManager, UserService, EndpointService, EndpointProvider) {
 
   $scope.logo = StateManager.getState().application.logo;
 
@@ -20,7 +20,23 @@ function ($scope, $state, $sanitize, Notifications, Authentication, StateManager
       return Authentication.login(username, password);
     })
     .then(function success() {
-      $state.go('init.endpoint');
+      return EndpointService.endpoints();
+    })
+    .then(function success(data) {
+      var endpoints = data;
+      if (endpoints.length > 0)  {
+        var endpoint = endpoints[0];
+        EndpointProvider.setEndpointID(endpoint.Id);
+        StateManager.updateEndpointState(true)
+        .then(function success(data) {
+          $state.go('dashboard');
+        })
+        .catch(function error(err) {
+          Notifications.error('Failure', err, 'Unable to connect to the Docker endpoint');
+        });
+      } else {
+        $state.go('init.endpoint');
+      }
     })
     .catch(function error(err) {
       Notifications.error('Failure', err, 'Unable to create administrator user');