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

Cleanup

Browse source
This commit is contained in:
Vinicius Fortuna 2019-06-07 19:19:15 -04:00
parent 9a070778c4
commit 182c0fd90e
3 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/server_manager/web_app/app.spec.ts
View file

@ -222,7 +222,6 @@ function createTestApp(
manualServerRepo?: server.ManualServerRepository,
displayServerRepository?: FakeDisplayServerRepository,
managedServerRepository?: FakeManagedServerRepository) {
const WEB_APP_URL = 'outline://fakefakefake/';
const VERSION = '0.0.1';
const fakeDigitalOceanSessionFactory = (accessToken: string) => {
return new FakeDigitalOceanSession(accessToken);
@ -242,7 +241,7 @@ function createTestApp(
displayServerRepository = new FakeDisplayServerRepository();
}
return new App(
polymerAppRoot, WEB_APP_URL, VERSION, fakeDigitalOceanSessionFactory,
polymerAppRoot, VERSION, fakeDigitalOceanSessionFactory,
fakeDigitalOceanServerRepositoryFactory, manualServerRepo, displayServerRepository,
digitalOceanTokenManager);
}

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

@ -32,10 +32,6 @@ interface PolymerEvent extends Event {
detail: any;
}
// The Outline DigitalOcean team's referral code:
// https://www.digitalocean.com/help/referral-program/
const DIGITALOCEAN_REFERRAL_CODE = '5ddb4219b716';
const TOS_ACK_LOCAL_STORAGE_KEY = 'tos-ack';
interface UiAccessKey {
@ -60,10 +56,6 @@ function convertToUiAccessKey(remoteAccessKey: server.AccessKey): UiAccessKey {
};
}
const DIGITAL_OCEAN_CREATION_ERROR_MESSAGE = `Sorry! We couldn't create a server this time.
If this problem persists, it might be that your account needs to be reviewed by DigitalOcean.
Please log in to www.digitalocean.com and follow their instructions.`;
function isManagedServer(testServer: server.Server): testServer is server.ManagedServer {
return !!(testServer as server.ManagedServer).getHost;
}
@ -86,7 +78,7 @@ export class App {
private serverBeingCreated: server.ManagedServer;
constructor(
private appRoot: Polymer, private readonly appUrl: string, private readonly version: string,
private appRoot: Polymer, private readonly version: string,
private createDigitalOceanSession: DigitalOceanSessionFactory,
private createDigitalOceanServerRepository: DigitalOceanServerRepositoryFactory,
private manualServerRepository: server.ManualServerRepository,
@ -95,7 +87,7 @@ export class App {
appRoot.setAttribute('outline-version', this.version);
appRoot.addEventListener('TermsOfServiceAccepted', (event: PolymerEvent) => {
window.localStorage[TOS_ACK_LOCAL_STORAGE_KEY] = Date.now();
localStorage.setItem(TOS_ACK_LOCAL_STORAGE_KEY, Date.now().toString());
});
appRoot.addEventListener('ConnectToDigitalOcean', (event: PolymerEvent) => {
@ -224,7 +216,7 @@ export class App {
}
async start(): Promise<void> {
if (!window.localStorage[TOS_ACK_LOCAL_STORAGE_KEY]) {
if (!localStorage.getItem(TOS_ACK_LOCAL_STORAGE_KEY)) {
this.appRoot.$.tosDialog.open();
}
this.showIntro();

7
src/server_manager/web_app/main.ts
View file

@ -48,10 +48,9 @@ document.addEventListener('WebComponentsReady', () => {
// Create and start the app.
new App(
document.getElementById('appRoot'), document.URL, version,
digitalocean_api.createDigitalOceanSession, digitalOceanServerRepositoryFactory,
new ManualServerRepository('manualServers'), new DisplayServerRepository(),
new DigitalOceanTokenManager())
document.getElementById('appRoot'), version, digitalocean_api.createDigitalOceanSession,
digitalOceanServerRepositoryFactory, new ManualServerRepository('manualServers'),
new DisplayServerRepository(), new DigitalOceanTokenManager())
.start();
});