From d78fe77f32a6ea0a81632e61a6461beb0d45a73a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Thu, 25 Feb 2021 15:17:18 +0100
Subject: request: Parse JSON responses.

* aws/request.scm (make-operation->request): Inspect content-type of
server response.
---
 aws/request.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'aws')

diff --git a/aws/request.scm b/aws/request.scm
index d311ec2..7ccb6c6 100644
--- a/aws/request.scm
+++ b/aws/request.scm
@@ -26,8 +26,10 @@
   #:use-module (gcrypt hmac)
   #:use-module (rnrs bytevectors)
   #:use-module (web client)
+  #:use-module ((web response) #:select (response-content-type))
   #:use-module ((web http) #:select (header-writer declare-header!))
   #:use-module (sxml simple)
+  #:use-module (json)
   #:export (make-operation->request serialize-aws-value))
 
 ;;; Commentary:
@@ -264,7 +266,13 @@
                           (_ ""))
                         #:headers new-headers))
       (lambda (response body)
-        (xml->sxml (match body
-                     ((? bytevector? bv)
-                      (utf8->string bv))
-                     ((? string? s) s)))))))
+        (let ((server-text (match body
+                             ((? bytevector? bv)
+                              (utf8->string bv))
+                             ((? string? s) s))))
+          (match (response-content-type response)
+            (('application/x-amz-json-1.1 . rest)
+             (json-string->scm server-text))
+            (('text/xml . rest)
+             (xml->sxml server-text))
+            (_ server-text)))))))
-- 
cgit v1.2.3