Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions __tests__/services.oauth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
})
})
})
8 changes: 4 additions & 4 deletions examples/oauth.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ var db = {

async function getRequestToken(req, res) {
const { oauth } = createFlickr({
consumerKey,
consumerSecret,
consumerKey: consumerKey,
consumerSecret: consumerSecret,
oauthToken: false,
oauthTokenSecret: false,
})
Expand Down Expand Up @@ -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,
})
Expand Down
4 changes: 3 additions & 1 deletion src/services/oauth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
}

Expand Down