jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Save appstore config after login

Browse Source
This commit is contained in:
Johannes Zellner
2016-07-26 15:48:09 +02:00
parent a8d04028f3
commit 2a64764deb
2 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webadmin/src/js/appstore.js
View File

@@ -123,7 +123,7 @@ angular.module('Application').service('AppStore', ['$http', '$base64', 'Client',
$http.get(Client.getConfig().apiServerOrigin + '/api/v1/login', { headers: headers }).success(function (data, status) {
if (status !== 200) return callback(new AppStoreError(status, data));
return callback(null, data.accessToken);
return callback(null, data);
}).error(function (data, status) {
return callback(new AppStoreError(status, data));
});

48
webadmin/src/views/settings.js
View File

@@ -338,38 +338,34 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
console.log('submit', $scope.appstoreLogin.email, $scope.appstoreLogin.password)
AppStore.login($scope.appstoreLogin.email, $scope.appstoreLogin.password, function (error, result) {
$scope.appstoreLogin.busy = false;
if (error && error.statusCode === 403) {
$scope.appstoreLogin.error.password = 'Wrong email or password';
$scope.appstoreLogin.password = '';
$('#inputAppstoreLoginPassword').focus();
$scope.appstoreLoginForm.password.$setPristine();
if (error) {
$scope.appstoreLogin.busy = false;
if (error.statusCode === 403) {
$scope.appstoreLogin.error.password = 'Wrong email or password';
$scope.appstoreLogin.password = '';
$('#inputAppstoreLoginPassword').focus();
$scope.appstoreLoginForm.password.$setPristine();
} else {
console.error(error);
}
return;
}
console.log('---', error, result);
var config = {
userId: result.userId,
token: result.accessToken
};
Client.setAppstoreConfig(config, function (error) {
if (error) return console.error(error);
$scope.appstoreLogin.reset();
$('#appstoreLoginModal').modal('hide');
});
});
// var user = {
// id: $scope.user.id,
// displayName: $scope.appstoreLogin.displayName
// };
// Client.updateUser(user, function (error) {
// if (error) {
// console.error('Unable log into appstore.', error);
// return;
// }
// // update user info in the background
// Client.refreshUserInfo();
// $scope.appstoreLogin.reset();
// $('#appstoreLoginModal').modal('hide');
// });
}
};