CERBERUS/outline-server
1
0
Fork 0
mirror of https://github.com/OutlineFoundation/outline-server.git synced 2026-08-04 14:37:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Relax checks when loading an existing account

Browse source
This commit is contained in:
Ben Schwartz 2022-05-13 16:36:53 -04:00
parent 84d323b9b9
commit 8a918a3d2f
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/server_manager/web_app/app.ts
View file

@ -347,6 +347,7 @@ export class App {
if (!digitalOceanAccount) {
return [];
}
let showedWarning = false;
try {
this.digitalOceanAccount = digitalOceanAccount;
this.appRoot.digitalOceanAccount = {
@ -354,11 +355,9 @@ export class App {
name: await this.digitalOceanAccount.getName(),
};
const status = await this.digitalOceanAccount.getStatus();
if (status.needsBillingInfo || status.needsEmailVerification) {
return [];
}
if (status.warning) {
this.showDigitalOceanWarning(status);
showedWarning = true;
}
const servers = await this.digitalOceanAccount.listServers();
for (const server of servers) {
@ -367,7 +366,9 @@ export class App {
return servers;
} catch (error) {
// TODO(fortuna): Handle expired token.
this.appRoot.showError(this.appRoot.localize('error-do-account-info'));
if (!showedWarning) {
this.appRoot.showError(this.appRoot.localize('error-do-account-info'));
}
console.error('Failed to load DigitalOcean Account:', error);
}
return [];