[chore] use functions from Utils.String module to work to/from List B…

…its8
idris-community · Nov 23, 2024 · 4c9d665 · 4c9d665
1 parent ed8677b
commit 4c9d665
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/src/Network/HTTP/Authorization.idr b/src/Network/HTTP/Authorization.idr
@@ -1,15 +1,16 @@
 module Network.HTTP.Authorization
 
 import Data.String.Base64
+import Utils.String
 
 private
 buildBasicAuth :  String -- username
                -> String -- password
                -> (String, String)
 buildBasicAuth user passwd =
   let userandpasswd  = user ++ ":" ++ passwd
-      userandpasswd' = map (\x => the Bits8 (cast $ ord x)) (fastUnpack userandpasswd)
-    in ("Authorization", "Basic " ++ (base64EncodeString userandpasswd'))
+      userandpasswd' = utf8_unpack userandpasswd
+    in ("Authorization", "Basic " ++ base64EncodeString userandpasswd')
 
 public export
 applyBasicAuth :  String -- username

diff --git a/tests/src/AuthorizationTest.idr b/tests/src/AuthorizationTest.idr
@@ -5,6 +5,7 @@ import Control.Monad.Error.Either
 import Data.List1
 import Data.String
 import Data.String.Base64
+import Utils.String
 
 %default partial
 
@@ -16,17 +17,20 @@ test_base64_encoding_decoding =
       (_, basicauth) = applyBasicAuth user passwd
       basicauth'     = base64DecodeString $ last $ split ((==) ' ') basicauth
     in case basicauth' of
-      Nothing          =>
+      Nothing =>
         idris_crash "couldn't base64 decode string."
       Just basicauth'' =>
-        let basicauth''' = fastPack $ map (\x => chr $ the Int (cast x)) basicauth''
-            userpasswd = split ((==) ':') basicauth'''
-            user'      = head userpasswd
-            passwd'    = last userpasswd
-          in case basicauth == "Basic YWxhZGRpbjpvcGVuc2VzYW1l" &&
-                  user      == user'                            &&
-                  passwd    == passwd' of
-            True  =>
-              pure ()
-            False =>
-              throwE "base64 encode/decode error: expected \{user} and \{user'}, \{passwd} and \{passwd'} to be equivalent."
+        case utf8_pack basicauth'' of
+          Nothing =>
+            idris_crash "couldn't utf8 pack decoded string."
+          Just basicauth''' =>
+            let userpasswd = split ((==) ':') basicauth'''
+                user'      = head userpasswd
+                passwd'    = last userpasswd
+              in case basicauth == "Basic YWxhZGRpbjpvcGVuc2VzYW1l" &&
+                      user      == user'                            &&
+                      passwd    == passwd' of
+                True  =>
+                  pure ()
+                False =>
+                  throwE "base64 encode/decode error: expected \{user} and \{user'}, \{passwd} and \{passwd'} to be equivalent."