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

Improve error reporting in demo mode

Browse Source
This commit is contained in:
Johannes Zellner
2022-04-27 14:09:07 +02:00
parent 74de921b00
commit db185c9146
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/network.html
+2
View File
@@ -11,6 +11,7 @@
<div class="form-group">
<label class="control-label">{{ 'network.ip.provider' | tr }} <sup><a ng-href="https://docs.cloudron.io/networking/#ipv4" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
<select class="form-control" ng-model="sysinfo.newProvider" ng-options="a.value as a.name for a in sysinfoProvider"></select>
<p class="has-error" ng-show="sysinfo.error.generic">{{ sysinfo.error.generic }}</p>
</div>
<div ng-show="sysinfo.newProvider === 'generic'">
@@ -83,6 +84,7 @@
<div class="form-group">
<label class="control-label">{{ 'network.ip.provider' | tr }} <sup><a ng-href="https://docs.cloudron.io/networking/#ipv6" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
<select class="form-control" ng-model="ipv6Configure.newProvider" ng-options="a.value as a.name for a in ipv6ConfigureProvider"></select>
<p class="has-error" ng-show="ipv6Configure.error.generic">{{ ipv6Configure.error.generic }}</p>
</div>
<div ng-show="ipv6Configure.newProvider === 'generic'">
src/views/network.js
+5 -1
View File
@@ -62,7 +62,7 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
$scope.ipv6Configure = {
busy: false,
error: {},
displayError: null,
displayError: '',
serverIPv6: '',
@@ -134,6 +134,9 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
$scope.ipv6ConfigureForm.$setUntouched();
return;
} else if (error) {
$scope.ipv6Configure.error.generic = error.message;
$scope.ipv6ConfigureForm.$setPristine();
$scope.ipv6ConfigureForm.$setUntouched();
console.error(error);
return;
}
@@ -256,6 +259,7 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
$scope.sysinfoForm.$setUntouched();
return;
} else if (error) {
$scope.sysinfo.error.generic = error.message;
console.error(error);
return;
}
src/views/profile.html
+4 -1
View File
@@ -187,9 +187,12 @@
<h4 class="modal-title">{{ 'profile.enable2FA.title' | tr }}</h4>
</div>
<p class="modal-body" ng-show="twoFactorAuthentication.mandatory2FAHelp && !twoFactorAuthentication.secret">{{ 'profile.enable2FA.description' | tr }}</p>
<div class="modal-body text-center" ng-show="!twoFactorAuthentication.mandatory2FAHelp && !twoFactorAuthentication.secret">
<div class="modal-body text-center" ng-show="!twoFactorAuthentication.mandatory2FAHelp && !twoFactorAuthentication.secret && !twoFactorAuthentication.notSupportedError">
<h2><i class="fa fa-circle-notch fa-spin"></i></h2>
</div>
<div class="modal-body" ng-show="twoFactorAuthentication.notSupportedError">
<p class="text-danger">{{ twoFactorAuthentication.notSupportedError }}</p>
</div>
<div class="modal-body" ng-show="twoFactorAuthentication.secret">
<p ng-bind-html="'profile.enable2FA.authenticatorAppDescription' | tr:{ googleAuthenticatorPlayStoreLink: 'https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2', googleAuthenticatorITunesLink: 'https://itunes.apple.com/us/app/google-authenticator/id388497605', freeOTPPlayStoreLink: 'https://play.google.com/store/apps/details?id=org.fedorahosted.freeotp', freeOTPITunesLink: 'https://itunes.apple.com/us/app/freeotp-authenticator/id872559395' }"></p>
<center>
src/views/profile.js
+4 -1
View File
@@ -28,6 +28,7 @@ angular.module('Application').controller('ProfileController', ['$scope', '$trans
$scope.twoFactorAuthentication = {
busy: false,
error: null,
notSupportedError: null,
password: '',
totpToken: '',
secret: '',
@@ -38,6 +39,7 @@ angular.module('Application').controller('ProfileController', ['$scope', '$trans
reset: function () {
$scope.twoFactorAuthentication.busy = false;
$scope.twoFactorAuthentication.error = null;
$scope.twoFactorAuthentication.notSupportedError = null;
$scope.twoFactorAuthentication.password = '';
$scope.twoFactorAuthentication.totpToken = '';
$scope.twoFactorAuthentication.secret = '';
@@ -54,7 +56,8 @@ angular.module('Application').controller('ProfileController', ['$scope', '$trans
$scope.twoFactorAuthentication.mandatory2FAHelp = false;
Client.setTwoFactorAuthenticationSecret(function (error, result) {
if (error) return console.error(error);
if (error && error.statusCode === 400) return $scope.twoFactorAuthentication.notSupportedError = error.message;
else if (error) return console.error(error);
$scope.twoFactorAuthentication.secret = result.secret;
$scope.twoFactorAuthentication.qrcode = result.qrcode;
src/views/users.js
+2 -2
View File
@@ -920,7 +920,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$timeout(function () {
$scope.profileConfig.busy = false;
}, 3000);
}, 500);
});
}
};
@@ -1108,7 +1108,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.externalLdap.busy = false;
if (error) {
console.error(error);
if (error.statusCode === 424) {
if (error.code === 'SELF_SIGNED_CERT_IN_CHAIN') $scope.externalLdap.error.acceptSelfSignedCerts = true;
else $scope.externalLdap.error.url = true;
@@ -1127,6 +1126,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
} else if (error.statusCode === 400 && error.message === 'invalid usernameField') {
$scope.externalLdap.error.usernameField = true;
} else {
console.error('Failed to set external LDAP config:', error);
$scope.externalLdap.error.generic = error.message;
}
} else {