From c20def19448ad08765cd6d1a60011386ec813716 Mon Sep 17 00:00:00 2001
From: alex-seville <seville@smugmug.com>
Date: Fri, 20 Jun 2025 21:15:16 -0700
Subject: [PATCH] Make code change, update test, and fix example

---
 __tests__/services.oauth.ts | 6 ++++--
 examples/oauth.mjs          | 8 ++++----
 src/services/oauth.ts       | 4 +++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/__tests__/services.oauth.ts b/__tests__/services.oauth.ts
index c05d787..6d419b1 100644
--- a/__tests__/services.oauth.ts
+++ b/__tests__/services.oauth.ts
@@ -25,19 +25,21 @@ describe("OAuthService", function () {
   describe("#verify", function () {
     it("resolves with the access token, secret, and user nsid", async function () {
       const transport = new MockTransport(
-        "user_nsid=1234@N01&oauth_token=1234&oauth_token_secret=5678",
+        "user_nsid=1234@N01&oauth_token=1234&oauth_token_secret=5678&fullname=Jamal%20Fanaian&username=jamalfanaian",
       )
 
       const auth = new NullAuth()
 
       const service = new OAuthService(transport, auth)
 
-      const { nsid, oauthToken, oauthTokenSecret } =
+      const { nsid, oauthToken, oauthTokenSecret, fullname, username } =
         await service.verify("1234")
 
       assert.strictEqual(nsid, "1234@N01")
       assert.strictEqual(oauthToken, "1234")
       assert.strictEqual(oauthTokenSecret, "5678")
+      assert.strictEqual(fullname, "Jamal Fanaian")
+      assert.strictEqual(username, "jamalfanaian")
     })
   })
 })
diff --git a/examples/oauth.mjs b/examples/oauth.mjs
index c7d1b25..bcd5f7c 100644
--- a/examples/oauth.mjs
+++ b/examples/oauth.mjs
@@ -42,8 +42,8 @@ var db = {
 
 async function getRequestToken(req, res) {
   const { oauth } = createFlickr({
-    consumerKey,
-    consumerSecret,
+    consumerKey: consumerKey,
+    consumerSecret: consumerSecret,
     oauthToken: false,
     oauthTokenSecret: false,
   })
@@ -83,8 +83,8 @@ async function verifyRequestToken(req, res, searchParams) {
   const requestTokenSecret = db.oauth.get(requestToken)
 
   const { oauth } = createFlickr({
-    consumerKey,
-    consumerSecret,
+    consumerKey: consumerKey,
+    consumerSecret: consumerSecret,
     oauthToken: requestToken,
     oauthTokenSecret: requestTokenSecret,
   })
diff --git a/src/services/oauth.ts b/src/services/oauth.ts
index 1016cb8..6bee0da 100644
--- a/src/services/oauth.ts
+++ b/src/services/oauth.ts
@@ -40,13 +40,15 @@ export class OAuthService {
     const res = await this.transport.get(url, params)
     const parser = new FormParser()
 
-    const { user_nsid, oauth_token, oauth_token_secret } =
+    const { user_nsid, oauth_token, oauth_token_secret, username, fullname } =
       await parser.parse(res)
 
     return {
       nsid: user_nsid,
       oauthToken: oauth_token,
       oauthTokenSecret: oauth_token_secret,
+      username: username,
+      fullname: fullname,
     }
   }