cleanup: convert all strings to single quoted

Signed-off-by: Tim Marx <t.marx@proxmox.com>

diff --git a/lib/src/client.dart b/lib/src/client.dart
index 257c82b6f9085f19426faad63e3d3a9385f37d42..bf7ba53f898e136c5ad146d93d9cf8ad0e12fe0c 100644 (file)
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -28,8 +28,8 @@ class ProxmoxApiClient extends http.BaseClient {
     String path, [
     Map<String, String> queryParameters,
   ]) async {
-    if (!path.startsWith("/api2/json")) {
-      path = "/api2/json" + path;
+    if (!path.startsWith('/api2/json')) {
+      path = '/api2/json' + path;
     }
     final baseUrl = Uri.parse(await getPlatformAwareOrigin());
     queryParameters
@@ -44,8 +44,8 @@ class ProxmoxApiClient extends http.BaseClient {
     String path, [
     Map<String, String> parameters,
   ]) async {
-    if (!path.startsWith("/api2/json")) {
-      path = "/api2/json" + path;
+    if (!path.startsWith('/api2/json')) {
+      path = '/api2/json' + path;
     }
     final baseUrl = Uri.parse(await getPlatformAwareOrigin());
     parameters?.removeWhere((key, value) => value == null || value.isEmpty);
@@ -58,8 +58,8 @@ class ProxmoxApiClient extends http.BaseClient {
     String path, [
     Map<String, String> parameters,
   ]) async {
-    if (!path.startsWith("/api2/json")) {
-      path = "/api2/json" + path;
+    if (!path.startsWith('/api2/json')) {
+      path = '/api2/json' + path;
     }
     final baseUrl = Uri.parse(await getPlatformAwareOrigin());
     parameters?.removeWhere((key, value) => value == null || value.isEmpty);
@@ -94,7 +94,7 @@ class ProxmoxApiClient extends http.BaseClient {
 
   Future<ProxmoxApiClient> finishTfaChallenge(String code) async {
     if (!credentials.tfa) {
-      throw StateError("No tfa challange expected");
+      throw StateError('No tfa challange expected');
     }
 
     _credentials = await credentials.tfaChallenge(code, httpClient: this);
@@ -112,8 +112,8 @@ class ProxmoxApiClient extends http.BaseClient {
   Future<http.Response> _getWithValidation(
       String path, Map<String, dynamic> queryParameters,
       {bool extensiveResponseValidation = false}) async {
-    if (!path.startsWith("/api2/json")) {
-      path = "/api2/json" + path;
+    if (!path.startsWith('/api2/json')) {
+      path = '/api2/json' + path;
     }
     final baseUrl = Uri.parse(await getPlatformAwareOrigin());
 
@@ -132,8 +132,8 @@ class ProxmoxApiClient extends http.BaseClient {
   Future<http.Response> _postWithValidation(
       String path, Map<String, dynamic> queryParameters,
       {bool extensiveResponseValidation = false}) async {
-    if (!path.startsWith("/api2/json")) {
-      path = "/api2/json" + path;
+    if (!path.startsWith('/api2/json')) {
+      path = '/api2/json' + path;
     }
     final baseUrl = Uri.parse(await getPlatformAwareOrigin());
 
@@ -148,8 +148,8 @@ class ProxmoxApiClient extends http.BaseClient {
   Future<http.Response> _deleteWithValidation(
       String path, Map<String, dynamic> queryParameters,
       {bool extensiveResponseValidation = false}) async {
-    if (!path.startsWith("/api2/json")) {
-      path = "/api2/json" + path;
+    if (!path.startsWith('/api2/json')) {
+      path = '/api2/json' + path;
     }
     final baseUrl = Uri.parse(await getPlatformAwareOrigin());
 

diff --git a/lib/src/credentials.dart b/lib/src/credentials.dart
index 39e24d1364c8765a10a1cb1a1bf4a97cae83f61a..719fa7a381453b4bd79ae11da3012363438d33e7 100644 (file)
--- a/lib/src/credentials.dart
+++ b/lib/src/credentials.dart
@@ -40,7 +40,7 @@ class Credentials {
     if (ticket == null || ticket.isEmpty)
       throw ArgumentError('Ticket not found');
 
-    final matches = RegExp(r"(?:PVE|PMG|PMGQUAR):(?:(\S+):)?([A-Z0-9]{8})")
+    final matches = RegExp(r'(?:PVE|PMG|PMGQUAR):(?:(\S+):)?([A-Z0-9]{8})')
         .firstMatch(ticket);
     if (matches == null) throw FormatException('invalid cookie format');
 
@@ -91,7 +91,7 @@ class Credentials {
 
     final body = {'response': code};
     final response =
-        await httpClient.post(origin + "/api2/json/access/tfa", body: body);
+        await httpClient.post(origin + '/api2/json/access/tfa', body: body);
     final credentials = await handleTfaChallengeResponse(response, this);
     return credentials;
   }

diff --git a/lib/src/handle_ticket_response.dart b/lib/src/handle_ticket_response.dart
index fe891baf66917be327c3b93a965ffd06bde5e11d..9f065074f54610247cca7106c04be5a45c58a5fe 100644 (file)
--- a/lib/src/handle_ticket_response.dart
+++ b/lib/src/handle_ticket_response.dart
@@ -13,7 +13,7 @@ Future<Credentials> handleAccessTicketResponse(
   final bodyJson = jsonDecode(response.body)['data'];
   final ticket = bodyJson['ticket'];
   final csrfToken = bodyJson['CSRFPreventionToken'];
-  final ticketRegex = RegExp(r"(PVE|PMG)(?:QUAR)?:(?:(\S+):)?([A-Z0-9]{8})::")
+  final ticketRegex = RegExp(r'(PVE|PMG)(?:QUAR)?:(?:(\S+):)?([A-Z0-9]{8})::')
       .firstMatch(bodyJson['ticket']);
   final time = DateTime.fromMillisecondsSinceEpoch(
       int.parse(ticketRegex.group(3), radix: 16) * 1000);
@@ -30,7 +30,7 @@ Future<Credentials> handleTfaChallengeResponse(
   print(response.body);
   final bodyJson = jsonDecode(response.body)['data'];
   final ticket = bodyJson['ticket'];
-  final ticketRegex = RegExp(r"(PVE|PMG)(?:QUAR)?:(?:(\S+):)?([A-Z0-9]{8})::")
+  final ticketRegex = RegExp(r'(PVE|PMG)(?:QUAR)?:(?:(\S+):)?([A-Z0-9]{8})::')
       .firstMatch(bodyJson['ticket']);
   final time = DateTime.fromMillisecondsSinceEpoch(
       int.parse(ticketRegex.group(3), radix: 16) * 1000);

diff --git a/lib/src/models/pve_cluster_resources_model.dart b/lib/src/models/pve_cluster_resources_model.dart
index 53e17626d011b6a8f67224357cda46b5b8e876f0..59fdf1d3504aaa9612668a3e4143638f5b9fff61 100644 (file)
--- a/lib/src/models/pve_cluster_resources_model.dart
+++ b/lib/src/models/pve_cluster_resources_model.dart
@@ -55,15 +55,15 @@ abstract class PveClusterResourcesModel
 
   String get displayName {
     switch (type) {
-      case "node":
+      case 'node':
         return node;
-      case "qemu":
+      case 'qemu':
         return "$vmid ${name ?? ''}";
-      case "lxc":
+      case 'lxc':
         return "$vmid ${name ?? ''}";
-      case "storage":
+      case 'storage':
         return storage;
-      case "pool":
+      case 'pool':
         return pool;
       default:
         return id;

diff --git a/lib/src/models/pve_nodes_model.dart b/lib/src/models/pve_nodes_model.dart
index 844882761a17266b7e3b38c560ad3b6c97f0f741..4a04668f46ff9a505d30fbdfeef3283fd99c724e 100644 (file)
--- a/lib/src/models/pve_nodes_model.dart
+++ b/lib/src/models/pve_nodes_model.dart
@@ -44,7 +44,7 @@ abstract class PveNodesModel
   PveNodesModel._();
 
   String renderMemoryUsagePercent() {
-    if(memoryUsage == null ) return '';
+    if (memoryUsage == null) return '';
     if (memoryUsage == -1) {
       return '';
     }
@@ -54,9 +54,9 @@ abstract class PveNodesModel
         return '';
       }
 
-      return ((memoryUsage * 100) / memoryCount).toStringAsFixed(1) + " %";
+      return ((memoryUsage * 100) / memoryCount).toStringAsFixed(1) + ' %';
     }
-    return (memoryUsage * 100).toStringAsFixed(1) + " %";
+    return (memoryUsage * 100).toStringAsFixed(1) + ' %';
   }
 
   String renderCpuUsage() {

diff --git a/lib/src/utils_web.dart b/lib/src/utils_web.dart
index 8f57d5b40f381fb774546bdbfd0472483526977d..ffec3b1a38abee9da686bce53e06fec1adb49d2e 100644 (file)
--- a/lib/src/utils_web.dart
+++ b/lib/src/utils_web.dart
@@ -14,7 +14,7 @@ Future<String> getTicketFromStorage([String name = 'PVE']) async {
       RegExp(r'(?:(?:^|.*;\s*)' + name + r'AuthCookie\s*\=\s*([^;]*).*$)|^.*$')
               .firstMatch(document.cookie)
               ?.group(1) ??
-          "");
+          '');
 }
 
 Future<void> storeTicket(String ticket, [String name = 'PVE']) async {

diff --git a/test/test.dart b/test/test.dart
index 487b93e7e1fb800d91c628792e5a245e72acc460..1cf22320d206d00608c80eb97460e51c03bb8359 100644 (file)
--- a/test/test.dart
+++ b/test/test.dart
@@ -9,46 +9,46 @@ Matcher throwsProxmoxApiException(message, statusCode) =>
         .having((e) => e.statusCode, 'http status code', statusCode));
 
 void main() {
-  Uri dummyEndpoint = Uri.parse("https://localhost/auth");
+  Uri dummyEndpoint = Uri.parse('https://localhost/auth');
 
   setUp(() {});
-  group("Response validation", () {
+  group('Response validation', () {
     test('pass validation', () {
-      var response = http.Response("no error", 200).validate(false);
-      expect(response.body, equals("no error"));
+      var response = http.Response('no error', 200).validate(false);
+      expect(response.body, equals('no error'));
     });
 
     test('fail >= 400', () {
-      var response = http.Response("", 400);
+      var response = http.Response('', 400);
       expect(
           () => response.validate(false),
           throwsProxmoxApiException(
-              "Request failed with status 400", equals(400)));
+              'Request failed with status 400', equals(400)));
     });
 
     test('fail >= 400 with reason phrase', () {
-      var response = http.Response("", 400, reasonPhrase: "this did not work");
+      var response = http.Response('', 400, reasonPhrase: 'this did not work');
       expect(() => response.validate(false),
-          throwsProxmoxApiException("400: this did not work", equals(400)));
+          throwsProxmoxApiException('400: this did not work', equals(400)));
     });
 
     test('valid credentials extraction', () {
       final ticket =
-          "PVE:root@pam:5DF8EC22::STV4HNO1wplmsyMDM5s6SUsU4cS7sBBBw+HOCEhSSV+6WGtz3zwIzHqBhq/ziJoBs7NqqyLXG4wn9jXJCMdYht+ndqwxtdFQsUNOF1Q/eTWwcyl+Q1fmPNOIIUoxMY8OqGBVozgIimiAJxdqm+2SJnrPEmlJge6m3yf/OEVAkKFCfRMOtSuyVnIbuLx6h6obvezBUP5+ZHzeTMmmXcH4rOsOKgW9XfwryLHbkjjq9Ennx0xjQaBD9Bo5ERquY0hNmWcdPC/p7ZzILTr4xH9sJe9Na2z6GhgJyTgOCAMengyIegySMq7IKIkmsp8odF4/iIC3005/XLF4w/DjPYQUMA==";
-      final csrfToken = "5DF8EDEC:/bb44xdHyVQDo2eD/8ty0WVXwMgwt1HjhVHLZX2YbxQ";
+          'PVE:root@pam:5DF8EC22::STV4HNO1wplmsyMDM5s6SUsU4cS7sBBBw+HOCEhSSV+6WGtz3zwIzHqBhq/ziJoBs7NqqyLXG4wn9jXJCMdYht+ndqwxtdFQsUNOF1Q/eTWwcyl+Q1fmPNOIIUoxMY8OqGBVozgIimiAJxdqm+2SJnrPEmlJge6m3yf/OEVAkKFCfRMOtSuyVnIbuLx6h6obvezBUP5+ZHzeTMmmXcH4rOsOKgW9XfwryLHbkjjq9Ennx0xjQaBD9Bo5ERquY0hNmWcdPC/p7ZzILTr4xH9sJe9Na2z6GhgJyTgOCAMengyIegySMq7IKIkmsp8odF4/iIC3005/XLF4w/DjPYQUMA==';
+      final csrfToken = '5DF8EDEC:/bb44xdHyVQDo2eD/8ty0WVXwMgwt1HjhVHLZX2YbxQ';
       var response = http.Response(
           '{"data":{"clustername":"testcluster","username":"root@pam","CSRFPreventionToken":"5DF8EDEC:/bb44xdHyVQDo2eD/8ty0WVXwMgwt1HjhVHLZX2YbxQ","cap":{"nodes":{"Sys.Modify":1,"Sys.PowerMgmt":1,"Sys.Audit":1,"Sys.Syslog":1,"Sys.Console":1,"Permissions.Modify":1},"access":{"Permissions.Modify":1,"User.Modify":1,"Group.Allocate":1},"vms":{"VM.Backup":1,"Permissions.Modify":1,"VM.Snapshot":1,"VM.Config.Network":1,"VM.Config.Disk":1,"VM.Clone":1,"VM.Config.CDROM":1,"VM.Monitor":1,"VM.Allocate":1,"VM.Config.Options":1,"VM.Console":1,"VM.Migrate":1,"VM.Snapshot.Rollback":1,"VM.PowerMgmt":1,"VM.Audit":1,"VM.Config.CPU":1,"VM.Config.Memory":1,"VM.Config.HWType":1},"storage":{"Permissions.Modify":1,"Datastore.Audit":1,"Datastore.Allocate":1,"Datastore.AllocateTemplate":1,"Datastore.AllocateSpace":1},"dc":{"Sys.Audit":1}},"ticket":"PVE:root@pam:5DF8EC22::STV4HNO1wplmsyMDM5s6SUsU4cS7sBBBw+HOCEhSSV+6WGtz3zwIzHqBhq/ziJoBs7NqqyLXG4wn9jXJCMdYht+ndqwxtdFQsUNOF1Q/eTWwcyl+Q1fmPNOIIUoxMY8OqGBVozgIimiAJxdqm+2SJnrPEmlJge6m3yf/OEVAkKFCfRMOtSuyVnIbuLx6h6obvezBUP5+ZHzeTMmmXcH4rOsOKgW9XfwryLHbkjjq9Ennx0xjQaBD9Bo5ERquY0hNmWcdPC/p7ZzILTr4xH9sJe9Na2z6GhgJyTgOCAMengyIegySMq7IKIkmsp8odF4/iIC3005/XLF4w/DjPYQUMA=="}}',
           200);
       expect(
-          handleAccessTicketResponse(response, "root", dummyEndpoint),
+          handleAccessTicketResponse(response, 'root', dummyEndpoint),
           isA<Credentials>()
               .having((e) => e.ticket, 'Ticket', ticket)
-              .having((e) => e.csrfToken, "CSRF Token", csrfToken)
+              .having((e) => e.csrfToken, 'CSRF Token', csrfToken)
               .having(
                   (e) => e.expiration,
-                  "Token expiration time",
+                  'Token expiration time',
                   DateTime.fromMillisecondsSinceEpoch(
-                      int.parse("5DF8EC22", radix: 16) * 1000)));
+                      int.parse('5DF8EC22', radix: 16) * 1000)));
     });
   });
 }