From cf510ecdf568d4f88e75df8a71bdc584b11f980b Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Wed, 16 Aug 2023 21:35:21 -0700 Subject: [PATCH] update to Zig 0.11 --- .gitignore | 1 + src/lib.zig | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 71969716e3e9ca87fdafa1839c25c6daf7da7560..2e19bb47619bffa5955be5d4eb92024633890d30 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ zig-* .zigmod deps.zig +files.zig diff --git a/src/lib.zig b/src/lib.zig index 7f9d96cc0e00a8366b182b65f5c57a1c25e1945b..d10c9e5848eec890986c67f06d4dd0687720116a 100644 --- a/src/lib.zig +++ b/src/lib.zig @@ -277,10 +277,10 @@ pub fn Handlers(comptime T: type) type { if (req.status != .ok) return error.OauthBadToken; const val = try extras.parse_json(alloc, body_content); - const tt = val.root.object.get("token_type").?.string; + const tt = val.value.object.get("token_type").?.string; if (!std.mem.eql(u8, tt, "bearer")) return fail(response, body_writer, "oauth2: invalid token type: {s}", .{tt}); - const at = val.root.object.get("access_token") orelse return try fail(response, body_writer, "Identity Provider Login Error!\n{s}", .{body_content}); + const at = val.value.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); @@ -294,9 +294,9 @@ pub fn Handlers(comptime T: type) type { if (req2.status != .ok) return error.OauthBadUserinfo; const val2 = try extras.parse_json(alloc, body_content2); - 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); + const id = try fixId(alloc, val2.value.object.get(client.provider.id_prop).?); + const name = val2.value.object.get(client.provider.name_prop).?.string; + try T.saveInfo(response, alloc, client.provider, id, name, val.value, val2.value); try response.headers.append("Location", T.doneUrl); response.status = .found; -- 2.54.0