Fixed API Key reset and delete cancel and a crash

joaomgcd · Jul 23, 2021 · a4748ff · a4748ff
1 parent 2345c86
commit a4748ff
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/v2/api/builder/apifield.css b/v2/api/builder/apifield.css
@@ -1,6 +1,3 @@
 #apibuilder .bar:before, #apibuilder .bar:after 	{
     background:white; 
-}
-#apifield{
-    margin-bottom:45px;
 }
diff --git a/v2/api/sender.js b/v2/api/sender.js
@@ -38,8 +38,12 @@ export class SendResults extends Array {
 		this.merge(results)
 	}
 	merge(other){
-		for(var result of other){
-			this.push(new SendResult(result.messageId,result.success,result.message));
+		try{
+			for(var result of other){
+				this.push(new SendResult(result.messageId,result.success,result.message));
+			}
+		}catch{
+			//do nothing if other is not iterable
 		}
 		this.success = this.count(result=>result.success);
 		this.failure = this.count(result=>!result.success);

diff --git a/v2/device/apphelperdevices.js b/v2/device/apphelperdevices.js
@@ -223,7 +223,8 @@ export class AppHelperDevices extends AppHelperBase{
     }
     async onRequestResetApiKey(){
         try{
-            if(!this.confirmApiKeyDelete()) return;
+            const shouldReset = await this.confirmApiKeyDelete();
+            if(!shouldReset) return;
 
             this._apiKey = await ApiServer.resetApiKey();   
             app.showToast({text:`API Key reset!`});
@@ -234,7 +235,9 @@ export class AppHelperDevices extends AppHelperBase{
     }
     async onRequestDeleteApiKey(){
         try{
-            if(!this.confirmApiKeyDelete()) return;
+            const shouldReset = await this.confirmApiKeyDelete();
+            if(!shouldReset) return;
+
             await ApiServer.deleteApiKey();
             this._apiKey = null;
             await this.apiBuilder.generateUrl(null);