From 2c9273b4de16a01ead4c3669024ae654721cbbae Mon Sep 17 00:00:00 2001
From: Tom Sommer <tomsommer@users.noreply.github.com>
Date: Tue, 24 Aug 2021 09:32:16 +0200
Subject: [PATCH] Fix simply.com API

- Rename API to dns_simplycom.sh, since "simply" is ambiguous, the name of the company is "Simply.com".
- Normalize JSON and fix not handling return code correctly
- Add some information to comments
- Fix trailing slash on URIs
---
 dnsapi/{dns_simply.sh => dns_simplycom.sh} | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
 rename dnsapi/{dns_simply.sh => dns_simplycom.sh} (93%)

diff --git a/dnsapi/dns_simply.sh b/dnsapi/dns_simplycom.sh
similarity index 93%
rename from dnsapi/dns_simply.sh
rename to dnsapi/dns_simplycom.sh
index e0e05017..efe7ee88 100644
--- a/dnsapi/dns_simply.sh
+++ b/dnsapi/dns_simplycom.sh
@@ -1,15 +1,15 @@
 #!/usr/bin/env sh
 
-#
+# API-integration for Simply.com (https://www.simply.com)
+
 #SIMPLY_AccountName="accountname"
-#
 #SIMPLY_ApiKey="apikey"
 #
 #SIMPLY_Api="https://api.simply.com/1/[ACCOUNTNAME]/[APIKEY]"
 SIMPLY_Api_Default="https://api.simply.com/1"
 
 #This is used for determining success of REST call
-SIMPLY_SUCCESS_CODE='"status": 200'
+SIMPLY_SUCCESS_CODE='"status":200'
 
 ########  Public functions #####################
 #Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
@@ -51,7 +51,7 @@ dns_simply_rm() {
 
   _simply_save_config
 
-  _debug "First detect the root zone"
+  _debug "Find the DNS zone"
 
   if ! _get_root "$fulldomain"; then
     _err "invalid domain"
@@ -151,7 +151,7 @@ _simply_save_config() {
 _simply_get_all_records() {
   domain=$1
 
-  if ! _simply_rest GET "my/products/$domain/dns/records"; then
+  if ! _simply_rest GET "my/products/$domain/dns/records/"; then
     return 1
   fi
 
@@ -169,7 +169,7 @@ _get_root() {
       return 1
     fi
 
-    if ! _simply_rest GET "my/products/$h/dns"; then
+    if ! _simply_rest GET "my/products/$h/dns/"; then
       return 1
     fi
 
@@ -193,7 +193,7 @@ _simply_add_record() {
 
   data="{\"name\": \"$sub_domain\", \"type\":\"TXT\", \"data\": \"$txtval\", \"priority\":0, \"ttl\": 3600}"
 
-  if ! _simply_rest POST "my/products/$domain/dns/records" "$data"; then
+  if ! _simply_rest POST "my/products/$domain/dns/records/" "$data"; then
     _err "Adding record not successfull!"
     return 1
   fi
@@ -214,7 +214,7 @@ _simply_delete_record() {
 
   _debug record_id "Delete record with id $record_id"
 
-  if ! _simply_rest DELETE "my/products/$domain/dns/records/$record_id"; then
+  if ! _simply_rest DELETE "my/products/$domain/dns/records/$record_id/"; then
     _err "Deleting record not successfull!"
     return 1
   fi
@@ -244,6 +244,8 @@ _simply_rest() {
   else
     response="$(_get "$SIMPLY_Api/$SIMPLY_AccountName/$SIMPLY_ApiKey/$ep")"
   fi
+  
+  response="$(echo "$response" | _normalizeJson)"
 
   if [ "$?" != "0" ]; then
     _err "error $ep"