From fc6019f80f5d9a4e4465f1f8d7978c252d9f23fa Mon Sep 17 00:00:00 2001
From: Meghan Denny <hello@nektro.net>
Date: Wed, 31 May 2023 01:23:49 -0700
Subject: [PATCH] use std.json instead of nektro/zig-json

---
 src/lib.zig | 15 +++++++--------
 zig.mod     |  1 -
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/lib.zig b/src/lib.zig
index 6ad4c8cab4834d130f02c5f5093f5784786dc16a..00980f40905d76272658132fdbae645ea8b9a7dd 100644
--- a/src/lib.zig
+++ b/src/lib.zig
@@ -6,7 +6,6 @@ const http = @import("apple_pie");
 const files = @import("self/files");
 const pek = @import("pek");
 const zfetch = @import("zfetch");
-const json = @import("json");
 const extras = @import("extras");
 const UrlValues = @import("UrlValues");
 const Base = @This();
@@ -280,24 +279,24 @@ pub fn Handlers(comptime T: type) type {
             try req.do(.POST, headers, try params.encode());
             const r = req.reader();
             const body_content = try r.readAllAlloc(alloc, 1024 * 1024 * 5);
-            const val = try json.parse(alloc, body_content);
+            const val = try extras.parse_json(alloc, body_content);
 
-            const at = val.get("access_token") orelse return try fail(response, "Identity Provider Login Error!\n{s}", .{body_content});
+            const at = val.root.object.get("access_token") orelse return try fail(response, body_writer, "Identity Provider Login Error!\n{s}", .{body_content});
 
             const req2 = try zfetch.Request.init(alloc, client.provider.me_url, null);
             var headers2 = zfetch.Headers.init(alloc);
-            try headers2.appendValue("Authorization", try std.fmt.allocPrint(alloc, "Bearer {s}", .{at.String}));
+            try headers2.appendValue("Authorization", try std.fmt.allocPrint(alloc, "Bearer {s}", .{at.string}));
             try headers2.appendValue("Accept", "application/json");
 
             // TODO print error message if this fails
             try req2.do(.GET, headers2, null);
             const r2 = req2.reader();
             const body_content2 = try r2.readAllAlloc(alloc, 1024 * 1024 * 5);
-            const val2 = try json.parse(alloc, body_content2);
+            const val2 = try extras.parse_json(alloc, body_content2);
 
-            const id = try fixId(alloc, val2.get(client.provider.id_prop).?);
-            const name = val2.get(client.provider.name_prop).?.String;
-            try T.saveInfo(response, request, client.provider, id, name, val, val2);
+            const id = try fixId(alloc, val2.root.object.get(client.provider.id_prop).?);
+            const name = val2.root.object.get(client.provider.name_prop).?.string;
+            try T.saveInfo(response, alloc, client.provider, id, name, val.root, val2.root);
 
             try response.headers.put("Location", T.doneUrl);
             try response.writeHeader(.found);
diff --git a/zig.mod b/zig.mod
index bd68f1a95ccd9b506307bf911f957d33c5ed1ae5..834f434925f1772a5f4e48e3a676290b43122804 100644
--- a/zig.mod
+++ b/zig.mod
@@ -9,6 +9,5 @@ dependencies:
   - src: git https://github.com/Luukdegram/apple_pie
   - src: git https://github.com/nektro/zig-pek
   - src: git https://github.com/truemedian/zfetch
-  - src: git https://github.com/nektro/zig-json
   - src: git https://github.com/nektro/zig-extras
   - src: git https://github.com/nektro/zig-UrlValues
-- 
2.54.0