From 362f036a68abea5247dd5fa777ad54b566f52e1b Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <lapenna.anthony@gmail.com>
Date: Tue, 23 Jan 2018 09:50:14 +0100
Subject: [PATCH] fix(state): ensure API version >= 1.25 before extension check
 (#1594)

* fix(state): ensure API version >= 1.25 before extension check
---
 app/services/stateManager.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/services/stateManager.js b/app/services/stateManager.js
index 36b3dc3cb..c2f358375 100644
--- a/app/services/stateManager.js
+++ b/app/services/stateManager.js
@@ -114,15 +114,17 @@ angular.module('portainer.services')
     }
     $q.all({
       info: SystemService.info(),
-      version: SystemService.version(),
-      extensions: ExtensionManager.extensions()
+      version: SystemService.version()
     })
     .then(function success(data) {
       var endpointMode = InfoHelper.determineEndpointMode(data.info);
       var endpointAPIVersion = parseFloat(data.version.ApiVersion);
       state.endpoint.mode = endpointMode;
       state.endpoint.apiVersion = endpointAPIVersion;
-      state.endpoint.extensions = data.extensions;
+      return $q.when(endpointAPIVersion < 1.25 || ExtensionManager.extensions());
+    })
+    .then(function success(data) {
+      state.endpoint.extensions = data instanceof Array ? data : [];
       LocalStorage.storeEndpointState(state.endpoint);
       deferred.resolve();
     })