Include `misc` in `JWT.Claims` struct. Use `InMemoryKeyManager()` by default in `DIDJWK.create()` #45

jiyoonie9 · 2024-04-01T02:04:37Z

closes #42
closes #40

kirahsapong

nice work!! prob just need to pull in FlatMap and then will be g2g!

kirahsapong · 2024-04-01T02:11:34Z

Sources/Web5/Crypto/JOSE/JWT.swift

@@ -44,6 +44,10 @@ public struct JWT {
        /// [Spec](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.7)
        let jwtID: String?

+        /// "misc" Miscellaneous claim is a map to store any additional claims
+        ///
+        let miscellaneous: [String: AnyCodable]


Nice work! We can use FlatMap for this: https://github.com/TBD54566975/web5-swift/blob/main/Sources/Web5/Common/FlatMap.swift

We can rename wrappedValue to misc since that sounds better anyway

ah, i think wrappedValue is required by swift! just tried changing the name and it yelled at me ._.

try this!

enum CodingKeys: String, CodingKey { case wrappedValue = "misc" }

maybe we can also rename the whole file Misc 🤔 I dont think FlatMap actually ended up being used anywhere!

kirahsapong · 2024-04-01T02:12:35Z

Sources/Web5/Crypto/JOSE/JWT.swift

+// MARK: - JWT Claims Encoding
+
+extension JWT.Claims {
+    public func encode(to encoder: Encoder) throws {


once we add FlatMap we wont need these

kirahsapong · 2024-04-01T02:12:50Z

Sources/Web5/Dids/Methods/DIDJWK.swift

@@ -30,7 +30,7 @@ public enum DIDJWK {
    ///   - options: Options configuring how the DIDJWK is created
    /// - Returns: `BearerDID` that represents the created DIDJWK
    public static func create(
-        keyManager: KeyManager,
+        keyManager: KeyManager = InMemoryKeyManager(),


🚀 🚀 🚀

…ling

jiyoonie9 · 2024-04-01T18:16:40Z

Sources/Web5/Crypto/JOSE/JWT.swift

@@ -26,33 +26,38 @@ public struct JWT {
        /// or after which the JWT must not be accepted for processing.
        ///
        /// [Spec](https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.4)
-        @ISO8601Date private(set) var expiration: Date?


are date fields in jwt claims supposed to be a numeric value? is there any value in saving it as a date?

issue created: #46

jiyoonie9 · 2024-04-01T18:38:03Z

Sources/Web5/Credentials/PresentationExchange.swift

@@ -141,7 +141,7 @@ public enum PresentationExchange {
    ) throws -> [InputDescriptorV2: [String]] {
        let vcJWTListMap: [VCDataModel] = try vcJWTList.map { vcJWT in
                let parsedJWT  = try JWT.parse(jwtString: vcJWT)
-                guard let vcJSON = parsedJWT.payload["vc"]?.value as? [String: Any] else {


kirahsapong

amahzin

Sources/Web5/Crypto/JOSE/JWT.swift

KendallWeihe · 2024-04-01T18:48:00Z

Sources/Web5/Crypto/JOSE/JWT.swift

+            try container.encodeIfPresent(issuedAt, forKey: .issuedAt)
+            try container.encodeIfPresent(jwtID, forKey: .jwtID)
+
+            // Dynamically encode the miscellaneous properties at the top level


at the top level

So this means the claims body won't look like this, right?

{ // existing well-defined claims properties "misc": { "something": "else" } }

and instead will look like this, right?

{ // existing well-defined claims properties "something": "else" }

(idk Swift so apologies in advance)

yes thats right! in swift we don't get the affordance of [k:string: any] type like in ts, so we effectively encode/decode to/from a known property that does have a dictionary of [String: Any]

so exactly as you said:

{ // known property with codingKey "issuer" "iss": "abcCorp", // dynamic properties with unknown codingKeys "something": "else", "and": "something", "else": "again" }

while in Swift it will look like

// maps to known codingKeys "issuer": "abcCorp", "miscellaneous": { "something": "else", "and": "something", "else", "again" }

KendallWeihe

idk swift but nothing stands out to me as glaringly wrong

added one comment with a question around how encoding works

Tests/Web5Tests/Crypto/JOSE/JWTTests.swift

Co-authored-by: kirahsapong <[email protected]>

kirahsapong · 2024-04-01T19:16:34Z

Sources/Web5/Crypto/JOSE/JWT.swift

-            notBefore: Date? = nil,
-            issuedAt: Date? = nil,
-            jwtID: String? = nil
+            expiration: Int? = nil,


let's make these Date and do the conversion for consumers

kirahsapong · 2024-04-01T19:16:49Z

Sources/Web5/Crypto/JOSE/JWT.swift

@@ -61,9 +66,11 @@ public struct JWT {
            self.notBefore = notBefore


... self.expiration = expiration != nil ? Int(expiration!.timeIntervalSince1970) : nil self.notBefore = notBefore != nil ? Int(notBefore!.timeIntervalSince1970) : nil self.issuedAt = issuedAt != nil ? Int(issuedAt!.timeIntervalSince1970) : nil ...

kirahsapong · 2024-04-01T19:28:28Z

cc: @EbonyLouis @acekyd

attempting jwt encoder and decoder

6c63dd6

jiyoonie9 requested review from kirahsapong and nitro-neal as code owners April 1, 2024 02:04

jiyoonie9 marked this pull request as draft April 1, 2024 02:05

kirahsapong reviewed Apr 1, 2024

View reviewed changes

jiyoonie9 changed the title ~~jwt encoder and decoder~~ [wip] jwt encoder and decoder Apr 1, 2024

jiyoonie9 added 2 commits March 31, 2024 23:05

modifying a test. changing payload to be of JWT.claims type. test fai…

80e0643

…ling

wow, tests pass

9b52b6e

jiyoonie9 commented Apr 1, 2024

View reviewed changes

refactoring a little

d8e7eb4

jiyoonie9 changed the title ~~[wip] jwt encoder and decoder~~ Include misc in JWT.Claims struct. Use InMemoryKeyManager() by default in DIDJWK.create() Apr 1, 2024

jiyoonie9 commented Apr 1, 2024

View reviewed changes

putting timeout back to 1

9f17182

jiyoonie9 marked this pull request as ready for review April 1, 2024 18:39

kirahsapong approved these changes Apr 1, 2024

View reviewed changes

Sources/Web5/Crypto/JOSE/JWT.swift Outdated Show resolved Hide resolved

KendallWeihe reviewed Apr 1, 2024

View reviewed changes

KendallWeihe approved these changes Apr 1, 2024

View reviewed changes

kirahsapong reviewed Apr 1, 2024

View reviewed changes

Tests/Web5Tests/Crypto/JOSE/JWTTests.swift Outdated Show resolved Hide resolved

Jiyoon Koo and others added 2 commits April 1, 2024 14:59

Update Sources/Web5/Crypto/JOSE/JWT.swift

68e74b0

Co-authored-by: kirahsapong <[email protected]>

Update Tests/Web5Tests/Crypto/JOSE/JWTTests.swift

fc80f9a

Co-authored-by: kirahsapong <[email protected]>

kirahsapong reviewed Apr 1, 2024

View reviewed changes

refactor claims date to int props

b916df5

kirahsapong merged commit 5208605 into main Apr 1, 2024
6 checks passed

kirahsapong deleted the 40-add-nonce branch April 1, 2024 19:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Include `misc` in `JWT.Claims` struct. Use `InMemoryKeyManager()` by default in `DIDJWK.create()` #45

Include `misc` in `JWT.Claims` struct. Use `InMemoryKeyManager()` by default in `DIDJWK.create()` #45

jiyoonie9 commented Apr 1, 2024 •

edited

Loading

kirahsapong left a comment

kirahsapong Apr 1, 2024

jiyoonie9 Apr 1, 2024 •

edited

Loading

kirahsapong Apr 1, 2024

kirahsapong Apr 1, 2024

kirahsapong Apr 1, 2024

kirahsapong Apr 1, 2024

jiyoonie9 Apr 1, 2024

jiyoonie9 Apr 1, 2024 •

edited

Loading

jiyoonie9 Apr 1, 2024

kirahsapong left a comment

KendallWeihe Apr 1, 2024

kirahsapong Apr 1, 2024

KendallWeihe left a comment

kirahsapong Apr 1, 2024

kirahsapong Apr 1, 2024

kirahsapong commented Apr 1, 2024

		@@ -61,9 +66,11 @@ public struct JWT {
		self.notBefore = notBefore

Include misc in JWT.Claims struct. Use InMemoryKeyManager() by default in DIDJWK.create() #45

Include misc in JWT.Claims struct. Use InMemoryKeyManager() by default in DIDJWK.create() #45

Conversation

jiyoonie9 commented Apr 1, 2024 • edited Loading

kirahsapong left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jiyoonie9 Apr 1, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jiyoonie9 Apr 1, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kirahsapong left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

KendallWeihe left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kirahsapong commented Apr 1, 2024

Include `misc` in `JWT.Claims` struct. Use `InMemoryKeyManager()` by default in `DIDJWK.create()` #45

Include `misc` in `JWT.Claims` struct. Use `InMemoryKeyManager()` by default in `DIDJWK.create()` #45

jiyoonie9 commented Apr 1, 2024 •

edited

Loading

jiyoonie9 Apr 1, 2024 •

edited

Loading

jiyoonie9 Apr 1, 2024 •

edited

Loading