From 5b83b493f4e4d959ef476f07e534213280a03d55 Mon Sep 17 00:00:00 2001 From: Kherel Date: Tue, 20 Apr 2021 13:44:33 +0200 Subject: [PATCH] fix --- lib/logic/api_maps/hetzner.dart | 7 +++++-- lib/logic/models/user.dart | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/logic/api_maps/hetzner.dart b/lib/logic/api_maps/hetzner.dart index ab0f0bd8a3..a2ba9962b6 100644 --- a/lib/logic/api_maps/hetzner.dart +++ b/lib/logic/api_maps/hetzner.dart @@ -93,14 +93,16 @@ class HetznerApi extends ApiMap { }, ); var dbId = dbCreateResponse.data['volume']['id']; + var data = jsonDecode( - '''{"name":"$domainName","server_type":"cx11","start_after_create":false,"image":"ubuntu-20.04", "volumes":[$dbId], "networks":[],"user_data":"#cloud-config\\nruncmd:\\n- curl https://git.selfprivacy.org/ilchub/selfprivacy-nixos-infect/raw/branch/master/nixos-infect | PROVIDER=hetzner NIX_CHANNEL=nixos-20.09 DOMAIN=$domainName LUSER=${rootUser.login} PASSWORD=${rootUser.password} HASHED_PASSWORD=${rootUser.hashPassword} CF_TOKEN=$cloudFlareKey DB_PASSWORD=$dbPassword bash 2>&1 | tee /tmp/infect.log","labels":{},"automount":true, "location": "fsn1"}''', + '''{"name":"$domainName","server_type":"cx11","start_after_create":false,"image":"ubuntu-20.04", "volumes":[$dbId], "networks":[],"user_data":"#cloud-config\\nruncmd:\\n- curl https://git.selfprivacy.org/ilchub/selfprivacy-nixos-infect/raw/branch/master/nixos-infect | PROVIDER=hetzner NIX_CHANNEL=nixos-20.09 DOMAIN=$domainName LUSER=${rootUser.login} PASSWORD=${rootUser.password} HASHED_PASSWORD=${rootUser.hashPassword.hash} SALT=${rootUser.hashPassword.salt} CF_TOKEN=$cloudFlareKey DB_PASSWORD=$dbPassword bash 2>&1 | tee /tmp/infect.log","labels":{},"automount":true, "location": "fsn1"}''', ); Response serverCreateResponse = await client.post( '/servers', data: data, ); + client.close(); return HetznerServerDetails( id: serverCreateResponse.data['server']['id'], @@ -164,7 +166,8 @@ class HetznerApi extends ApiMap { return server.copyWith(startTime: DateTime.now()); } - Future> getMetrics(DateTime start, DateTime end, String type) async { + Future> getMetrics( + DateTime start, DateTime end, String type) async { var hetznerServer = getIt().hetznerServer; var client = await getClient(); diff --git a/lib/logic/models/user.dart b/lib/logic/models/user.dart index 93440299a3..c50d13fe00 100644 --- a/lib/logic/models/user.dart +++ b/lib/logic/models/user.dart @@ -25,7 +25,7 @@ class User extends Equatable { Color get color => stringToColor(login); - String get hashPassword => Crypt.sha512(password).toString(); + Crypt get hashPassword => Crypt.sha512(password); String toString() { return login;