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

Show error if client actions don't succeed due to API disabled

Browse Source
This commit is contained in:
Johannes Zellner
2016-06-23 11:25:51 +02:00
parent fd22f0d52b
commit 9a5e66739c
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webadmin/src/views/tokens.js
+30 -5
View File
@@ -55,8 +55,14 @@ angular.module('Application').controller('TokensController', ['$scope', 'Client'
console.error(error); console.error(error);
} }
return; return;
} } else if (error && error.statusCode === 412) {
if (error) return console.error('Unable to create API client.', error.statusCode, error.message); var actionScope = $scope.$new(true);
actionScope.action = '/#/settings';
Client.notify('Not allowed', 'You have to enable the external API in the settings.', false, 'error', actionScope);
return;
} else if (error) return console.error('Unable to create API client.', error.statusCode, error.message);
refresh(); refresh();
@@ -79,9 +85,19 @@ angular.module('Application').controller('TokensController', ['$scope', 'Client'
$scope.clientRemove.busy = true; $scope.clientRemove.busy = true;
Client.delOAuthClient($scope.clientRemove.client.id, function (error) { Client.delOAuthClient($scope.clientRemove.client.id, function (error) {
if (error) console.error(error);
$scope.clientRemove.busy = false; $scope.clientRemove.busy = false;
if (error && error.statusCode === 412) {
var actionScope = $scope.$new(true);
actionScope.action = '/#/settings';
Client.notify('Not allowed', 'You have to enable the external API in the settings.', false, 'error', actionScope);
return;
} else if (error) {
return console.error(error);
}
$scope.clientRemove.client = {}; $scope.clientRemove.client = {};
refresh(); refresh();
@@ -102,7 +118,16 @@ angular.module('Application').controller('TokensController', ['$scope', 'Client'
var expiresAt = Date.now() + 100 * 365 * 24 * 60 * 60 * 1000; // ~100 years from now var expiresAt = Date.now() + 100 * 365 * 24 * 60 * 60 * 1000; // ~100 years from now
Client.createTokenByClientId(client.id, expiresAt, function (error, result) { Client.createTokenByClientId(client.id, expiresAt, function (error, result) {
if (error) console.error(error); if (error && error.statusCode === 412) {
var actionScope = $scope.$new(true);
actionScope.action = '/#/settings';
Client.notify('Not allowed', 'You have to enable the external API in the settings.', false, 'error', actionScope);
return;
} else if (error) {
return console.error(error);
}
$scope.tokenAdd.busy = false; $scope.tokenAdd.busy = false;
$scope.tokenAdd.token = result; $scope.tokenAdd.token = result;