fix: assign extraTokenClaims return to the model

panva · Aug 30, 2023 · e296dc7 · e296dc7
1 parent 2870fe0
commit e296dc7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/lib/models/formats/opaque.js b/lib/models/formats/opaque.js
@@ -35,7 +35,8 @@ export default (provider) => ({
     };
 
     if (withExtra.has(this.kind)) {
-      payload.extra = await instance(provider).configuration('extraTokenClaims')(ctxRef.get(this), this);
+      // eslint-disable-next-line no-multi-assign
+      payload.extra = this.extra = await instance(provider).configuration('extraTokenClaims')(ctxRef.get(this), this);
     }
 
     return { value: this.jti, payload };

diff --git a/test/formats/opaque.test.js b/test/formats/opaque.test.js
@@ -84,6 +84,14 @@ describe('opaque storage', () => {
     });
   });
 
+  it('for AccessToken extraTokenClaims gets assigned upon save()', async function () {
+    const client = await this.provider.Client.find(clientId);
+    const token = new this.provider.AccessToken({ client, ...fullPayload, extra: undefined });
+    expect(token.extra).to.eql(undefined);
+    await token.save();
+    expect(token.extra).to.eql(extra);
+  });
+
   it('for AuthorizationCode', async function () {
     const kind = 'AuthorizationCode';
     const upsert = spy(this.TestAdapter.for('AuthorizationCode'), 'upsert');
@@ -244,6 +252,14 @@ describe('opaque storage', () => {
     });
   });
 
+  it('for ClientCredentials extraTokenClaims gets assigned upon save()', async function () {
+    const client = await this.provider.Client.find(clientId);
+    const token = new this.provider.ClientCredentials({ client, ...fullPayload, extra: undefined });
+    expect(token.extra).to.eql(undefined);
+    await token.save();
+    expect(token.extra).to.eql(extra);
+  });
+
   it('for InitialAccessToken', async function () {
     const kind = 'InitialAccessToken';
     const upsert = spy(this.TestAdapter.for('InitialAccessToken'), 'upsert');