Skip to content

Commit 29445e3

Browse files
author
Oleksii Korshenko
committed
Merge remote-tracking branch 'connect/MAGETWO-44924-Merge-to-mainline' into magento2
2 parents ed3fb33 + 31ad276 commit 29445e3

34 files changed

+559
-395
lines changed

‎dev/tests/integration/testsuite/Magento/Setup/Controller/ComponentGridTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use Magento\Setup\Model\UpdatePackagesCache;
1313
use Magento\Framework\Module\FullModuleList;
1414
use Magento\Framework\Module\ModuleList;
15-
use Magento\Setup\Model\ConnectManager;
15+
use Magento\Setup\Model\MarketplaceManager;
1616

1717
class ComponentGridTest extends \PHPUnit_Framework_TestCase
1818
{
@@ -56,9 +56,9 @@ class ComponentGridTest extends \PHPUnit_Framework_TestCase
5656
private $controller;
5757

5858
/**
59-
* @var ConnectManager
59+
* @var MarketplaceManager
6060
*/
61-
private $connectManagerMock;
61+
private $marketplaceManagerMock;
6262

6363
/**
6464
* @var array
@@ -126,13 +126,13 @@ public function setUp()
126126
]);
127127
$this->packageInfo = $this->getMock('Magento\Framework\Module\PackageInfo', [], [], '', false);
128128
$this->updatePackagesCacheMock = $this->getMock('Magento\Setup\Model\UpdatePackagesCache', [], [], '', false);
129-
$this->connectManagerMock = $this->getMock('Magento\Setup\Model\ConnectManager', [], [], '', false);
129+
$this->marketplaceManagerMock = $this->getMock('Magento\Setup\Model\MarketplaceManager', [], [], '', false);
130130
$this->packageInfoFactoryMock->expects($this->once())->method('create')->willReturn($this->packageInfo);
131131
$this->controller = new ComponentGrid(
132132
$this->composerInformationMock,
133133
$objectManagerProvider,
134134
$this->updatePackagesCacheMock,
135-
$this->connectManagerMock
135+
$this->marketplaceManagerMock
136136
);
137137
}
138138

‎setup/config/di.config.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@
3535
'Magento\Setup\Controller\Maintenance',
3636
'Magento\Setup\Controller\OtherComponentsGrid',
3737
'Magento\Setup\Controller\DataOption',
38-
'Magento\Setup\Controller\Connect',
38+
'Magento\Setup\Controller\Marketplace',
3939
'Magento\Setup\Controller\SystemConfig',
4040
'Magento\Setup\Controller\InstallExtensionGrid',
41+
'Magento\Setup\Controller\Session'
4142
],
4243
'instance' => [
4344
'preference' => [

‎setup/config/connect.config.php renamed to ‎setup/config/marketplace.config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
return ['connect' => ['check_credentials_url' => 'repo.magento.com']];
7+
return ['marketplace' => ['check_credentials_url' => 'repo.magento.com']];

‎setup/config/states.extensionManager.config.php

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
'header' => 'Step 1: Readiness Check',
2020
'nav' => true,
2121
'order' => 2,
22-
'type' => 'install'
22+
'type' => 'install',
23+
'wrapper' => 1
2324
],
2425
[
2526
'id' => 'root.readiness-check-install.progress',
@@ -30,7 +31,8 @@
3031
'controller' => 'readinessCheckController',
3132
'nav' => false,
3233
'order' => 3,
33-
'type' => 'install'
34+
'type' => 'install',
35+
'wrapper' => 1
3436
],
3537
[
3638
'id' => 'root.create-backup-install',
@@ -42,7 +44,8 @@
4244
'nav' => true,
4345
'validate' => true,
4446
'order' => 4,
45-
'type' => 'install'
47+
'type' => 'install',
48+
'wrapper' => 1
4649
],
4750
[
4851
'id' => 'root.create-backup-install.progress',
@@ -53,7 +56,8 @@
5356
'controller' => 'completeBackupController',
5457
'nav' => false,
5558
'order' => 5,
56-
'type' => 'install'
59+
'type' => 'install',
60+
'wrapper' => 1
5761
],
5862
[
5963
'id' => 'root.start-updater-install',
@@ -64,7 +68,8 @@
6468
'header' => 'Step 3: Component Install',
6569
'nav' => true,
6670
'order' => 6,
67-
'type' => 'install'
71+
'type' => 'install',
72+
'wrapper' => 1
6873
],
6974
],
7075
];

‎setup/config/states.home.config.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
'nav' => false,
4444
'noMenu' => true,
4545
'order' => 1,
46-
'type' => 'install'
46+
'type' => 'install',
47+
'wrapper' => 1
4748
],
4849
[
4950
'id' => 'root.upgrade',

‎setup/pub/magento/setup/auth-dialog.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@ angular.module('auth-dialog', ['ngStorage', 'ngDialog'])
88
.controller('authDialogController', ['$rootScope', '$scope', '$state', '$http', 'ngDialog', '$localStorage',
99
function ($rootScope, $scope, $state, $http, ngDialog, $localStorage) {
1010
$scope.user = {
11-
username : $localStorage.connectUsername ? $localStorage.connectUsername : '',
11+
username : $localStorage.marketplaceUsername ? $localStorage.marketplaceUsername : '',
1212
password : '',
1313
submitted : ''
1414
};
1515
$scope.errors = false;
1616
if (!$rootScope.authRequest) {
1717
$rootScope.isAuthLoadingComplete = false;
18-
$http.post('index.php/connect/check-auth', [])
18+
$http.post('index.php/marketplace/check-auth', [])
1919
.success(function (response) {
2020
if (response.success) {
21-
$localStorage.connectUsername = $scope.user.username = response.data.username;
22-
$localStorage.isConnectAuthorized = true;
21+
$localStorage.marketplaceUsername = $scope.user.username = response.data.username;
22+
$localStorage.isMarketplaceAuthorized = true;
2323
} else {
24-
$localStorage.isConnectAuthorized = false;
24+
$localStorage.isMarketplaceAuthorized = false;
2525
}
2626
$rootScope.isAuthLoadingComplete = true;
2727
$rootScope.authRequest = true;
28-
$rootScope.isConnectAuthorized = $localStorage.isConnectAuthorized;
28+
$rootScope.isMarketplaceAuthorized = $localStorage.isMarketplaceAuthorized;
2929
})
3030
.error(function (data) {
3131
$rootScope.isAuthLoadingComplete = true;
3232
});
3333
} else {
34-
$rootScope.isConnectAuthorized = $localStorage.isConnectAuthorized;
34+
$rootScope.isMarketplaceAuthorized = $localStorage.isMarketplaceAuthorized;
3535
$rootScope.isAuthLoadingComplete = true;
3636
}
3737

@@ -42,7 +42,7 @@ angular.module('auth-dialog', ['ngStorage', 'ngDialog'])
4242
$scope.saveAuthJson = function () {
4343
if ($scope.auth.$valid) {
4444
$rootScope.saveAuthProccessed = true;
45-
$http.post('index.php/connect/save-auth-json', $scope.user)
45+
$http.post('index.php/marketplace/save-auth-json', $scope.user)
4646
.success(function (data) {
4747
$scope.saveAuthJson.result = data;
4848
if ($scope.saveAuthJson.result.success) {
@@ -53,14 +53,14 @@ angular.module('auth-dialog', ['ngStorage', 'ngDialog'])
5353
ngDialog.close();
5454
$scope.errors = false;
5555
$scope.logout = false;
56-
$localStorage.isConnectAuthorized = true;
56+
$localStorage.isMarketplaceAuthorized = true;
5757
} else {
5858
$scope.errors = true;
59-
$localStorage.isConnectAuthorized = false;
59+
$localStorage.isMarketplaceAuthorized = false;
6060
}
61-
$rootScope.isConnectAuthorized = $localStorage.isConnectAuthorized;
61+
$rootScope.isMarketplaceAuthorized = $localStorage.isMarketplaceAuthorized;
6262
$rootScope.saveAuthProccessed = false;
63-
$localStorage.connectUsername = $scope.user.username;
63+
$localStorage.marketplaceUsername = $scope.user.username;
6464
})
6565
.error(function (data) {
6666
$scope.saveAuthJson.failed = data;
@@ -72,11 +72,11 @@ angular.module('auth-dialog', ['ngStorage', 'ngDialog'])
7272
};
7373

7474
$scope.reset = function () {
75-
$http.post('index.php/connect/remove-credentials', [])
75+
$http.post('index.php/marketplace/remove-credentials', [])
7676
.success(function (response) {
7777
if (response.success) {
7878
$scope.logout = true;
79-
$localStorage.isConnectAuthorized = $rootScope.isConnectAuthorized = false;
79+
$localStorage.isMarketplaceAuthorized = $rootScope.isMarketplaceAuthorized = false;
8080
}
8181
})
8282
.error(function (data) {

‎setup/pub/magento/setup/component-grid.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ angular.module('component-grid', ['ngStorage'])
7575
});
7676
};
7777
$scope.isAvailableUpdatePackage = function(packageName) {
78-
$localStorage.isConnectAuthorized = typeof $localStorage.isConnectAuthorized !== 'undefined' ? $localStorage.isConnectAuthorized : false;
78+
$localStorage.isMarketplaceAuthorized = typeof $localStorage.isMarketplaceAuthorized !== 'undefined' ? $localStorage.isMarketplaceAuthorized : false;
7979
var isAvailable = typeof $scope.availableUpdatePackages !== 'undefined'
80-
&& $localStorage.isConnectAuthorized
80+
&& $localStorage.isMarketplaceAuthorized
8181
&& packageName in $scope.availableUpdatePackages;
8282
return isAvailable;
8383
};

‎setup/pub/magento/setup/install-extension-grid.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ angular.module('install-extension-grid', ['ngStorage', 'clickOut'])
108108
$scope.isHiddenSpinner = true;
109109
$scope.installAll = function() {
110110
$scope.checkAuth();
111-
$localStorage.isConnectAuthorized = typeof $localStorage.isConnectAuthorized !== 'undefined' ? $localStorage.isConnectAuthorized : false;
112-
if ($localStorage.isConnectAuthorized === false) {
111+
$localStorage.isMarketplaceAuthorized = typeof $localStorage.isMarketplaceAuthorized !== 'undefined' ? $localStorage.isMarketplaceAuthorized : false;
112+
if ($localStorage.isMarketplaceAuthorized === false) {
113113
$scope.open();
114114
} else {
115115
if ($scope.getObjectSize($scope.selectedExtensions) > 0) {
@@ -129,8 +129,8 @@ angular.module('install-extension-grid', ['ngStorage', 'clickOut'])
129129

130130
$scope.install = function(extension) {
131131
$scope.checkAuth();
132-
$localStorage.isConnectAuthorized = typeof $localStorage.isConnectAuthorized !== 'undefined' ? $localStorage.isConnectAuthorized : false;
133-
if ($localStorage.isConnectAuthorized === false) {
132+
$localStorage.isMarketplaceAuthorized = typeof $localStorage.isMarketplaceAuthorized !== 'undefined' ? $localStorage.isMarketplaceAuthorized : false;
133+
if ($localStorage.isMarketplaceAuthorized === false) {
134134
$scope.open();
135135
} else {
136136
if (extension === 'undefined') {
@@ -154,16 +154,16 @@ angular.module('install-extension-grid', ['ngStorage', 'clickOut'])
154154
};
155155

156156
$scope.checkAuth = function() {
157-
$http.post('index.php/connect/check-auth', [])
157+
$http.post('index.php/marketplace/check-auth', [])
158158
.success(function (response) {
159159
if (response.success) {
160-
$localStorage.isConnectAuthorized = true;
160+
$localStorage.isMarketplaceAuthorized = true;
161161
} else {
162-
$localStorage.isConnectAuthorized = false;
162+
$localStorage.isMarketplaceAuthorized = false;
163163
}
164164
})
165165
.error(function() {
166-
$localStorage.isConnectAuthorized = false;
166+
$localStorage.isMarketplaceAuthorized = false;
167167
$scope.error = true;
168168
$scope.errorMessage = 'Internal server error';
169169
});

‎setup/pub/magento/setup/main.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,19 @@ main.controller('navigationController',
3636
]
3737
)
3838
.controller('mainController', [
39-
'$scope', '$state', 'navigationService', '$localStorage',
40-
function ($scope, $state, navigationService, $localStorage) {
39+
'$scope', '$state', 'navigationService', '$localStorage', '$interval', '$http',
40+
function ($scope, $state, navigationService, $localStorage, $interval, $http) {
41+
$interval(
42+
function () {
43+
$http.post('/setup/index.php/session/prolong')
44+
.success(function (result) {
45+
})
46+
.error(function (result) {
47+
});
48+
},
49+
120000
50+
);
51+
4152
$scope.moduleName = $localStorage.moduleName;
4253
$scope.$on('$stateChangeSuccess', function (event, state) {
4354
$scope.valid = true;

‎setup/pub/magento/setup/start-updater.js

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
'use strict';
77
angular.module('start-updater', ['ngStorage'])
88
.controller('startUpdaterController', ['$scope', '$state', '$localStorage', '$http', '$window', function ($scope, $state, $localStorage, $http, $window) {
9-
$scope.maintenanceCalled = false;
10-
$scope.maintenanceStatus = false;
119

1210
$scope.type = $state.current.type;
1311
$scope.buttonText = $scope.type.charAt(0).toUpperCase() + $scope.type.slice(1);
@@ -26,21 +24,7 @@ angular.module('start-updater', ['ngStorage'])
2624
if ($localStorage.titles) {
2725
$scope.title = $localStorage.titles[$state.current.type];
2826
}
29-
if (!$scope.backupInfoPassed.options.code && !$scope.backupInfoPassed.options.media && !$scope.backupInfoPassed.options.db) {
30-
$scope.maintenanceCalled = true;
31-
$http.post('index.php/maintenance/index', $scope.backupInfoPassed)
32-
.success(function (data) {
33-
if (data['responseType'] === 'success') {
34-
$scope.maintenanceStatus = true;
35-
} else {
36-
$scope.errorMsg = data['error'];
37-
}
38-
})
39-
.error(function (data) {
40-
$scope.errorMsg = data;
41-
});
4227

43-
}
4428
$scope.started = false;
4529
$scope.errorMessage = '';
4630
$scope.update = function() {
@@ -62,7 +46,7 @@ angular.module('start-updater', ['ngStorage'])
6246
.error(function (data) {
6347
$scope.errorMessage = 'Something went wrong. Please try again.';
6448
});
65-
}
49+
};
6650
$scope.goToPreviousState = function() {
6751
if ($state.current.type === 'uninstall') {
6852
$state.go('root.data-option');

0 commit comments

Comments
 (0)