feat: more ctx entities to accomodate #658

closes #658
panva · Feb 28, 2020 · 51b128d · 51b128d
1 parent 655ea29
commit 51b128d
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 10 deletions.
diff --git a/lib/actions/authorization/interactions.js b/lib/actions/authorization/interactions.js
@@ -112,6 +112,7 @@ module.exports = async function interactions(resumeRouteName, ctx, next) {
   });
 
   await interactionSession.save(cookieOptions.maxAge / 1000);
+  ctx.oidc.entity('Interaction', interactionSession);
 
   const destination = await interactionUrl(ctx, interactionSession);
 

diff --git a/lib/actions/authorization/resume.js b/lib/actions/authorization/resume.js
@@ -29,6 +29,7 @@ module.exports = async function resumeAction(whitelist, resumeRouteName, ctx, ne
   if (!interactionSession) {
     throw new errors.SessionNotFound('interaction session not found');
   }
+  ctx.oidc.entity('Interaction', interactionSession);
 
   const {
     result,

diff --git a/lib/models/session.js b/lib/models/session.js
@@ -120,6 +120,10 @@ module.exports = function getSession(provider) {
         }
       }
 
+      if (ctx.oidc instanceof provider.OIDCContext) {
+        ctx.oidc.entity('Session', session);
+      }
+
       return session;
     }
 

diff --git a/test/core/basic/code.authorization.test.js b/test/core/basic/code.authorization.test.js
@@ -52,7 +52,7 @@ describe('BASIC code', () => {
 
       it('populates ctx.oidc.entities', function (done) {
         this.provider.use(this.assertOnce((ctx) => {
-          expect(ctx.oidc.entities).to.have.keys('AuthorizationCode', 'Client', 'Account');
+          expect(ctx.oidc.entities).to.have.keys('AuthorizationCode', 'Client', 'Account', 'Session');
         }, done));
 
         const auth = new this.AuthorizationRequest({

diff --git a/test/core/basic/none.authorization.test.js b/test/core/basic/none.authorization.test.js
@@ -43,7 +43,7 @@ const scope = 'openid';
 
     it('populates ctx.oidc.entities', function (done) {
       this.provider.use(this.assertOnce((ctx) => {
-        expect(ctx.oidc.entities).to.have.keys('Client', 'Account');
+        expect(ctx.oidc.entities).to.have.keys('Client', 'Account', 'Session');
       }, done));
 
       const auth = new this.AuthorizationRequest({

diff --git a/test/core/hybrid/code+id_token+token.authorization.test.js b/test/core/hybrid/code+id_token+token.authorization.test.js
@@ -48,7 +48,7 @@ describe('HYBRID code+id_token+token', () => {
 
       it('populates ctx.oidc.entities', function (done) {
         this.provider.use(this.assertOnce((ctx) => {
-          expect(ctx.oidc.entities).to.have.keys('Client', 'Account', 'AuthorizationCode', 'AccessToken');
+          expect(ctx.oidc.entities).to.have.keys('Client', 'Account', 'AuthorizationCode', 'AccessToken', 'Session');
         }, done));
 
         const auth = new this.AuthorizationRequest({

diff --git a/test/core/hybrid/code+id_token.authorization.test.js b/test/core/hybrid/code+id_token.authorization.test.js
@@ -44,7 +44,7 @@ describe('HYBRID code+id_token', () => {
 
       it('populates ctx.oidc.entities', function (done) {
         this.provider.use(this.assertOnce((ctx) => {
-          expect(ctx.oidc.entities).to.have.keys('Client', 'Account', 'AuthorizationCode');
+          expect(ctx.oidc.entities).to.have.keys('Client', 'Account', 'AuthorizationCode', 'Session');
         }, done));
 
         const auth = new this.AuthorizationRequest({

diff --git a/test/core/hybrid/code+token.authorization.test.js b/test/core/hybrid/code+token.authorization.test.js
@@ -44,7 +44,7 @@ describe('HYBRID code+token', () => {
 
       it('populates ctx.oidc.entities', function (done) {
         this.provider.use(this.assertOnce((ctx) => {
-          expect(ctx.oidc.entities).to.have.keys('Client', 'Account', 'AuthorizationCode', 'AccessToken');
+          expect(ctx.oidc.entities).to.have.keys('Client', 'Account', 'AuthorizationCode', 'AccessToken', 'Session');
         }, done));
 
         const auth = new this.AuthorizationRequest({

diff --git a/test/core/implicit/id_token+token.authorization.test.js b/test/core/implicit/id_token+token.authorization.test.js
@@ -50,7 +50,7 @@ describe('IMPLICIT id_token+token', () => {
 
       it('populates ctx.oidc.entities', function (done) {
         this.provider.use(this.assertOnce((ctx) => {
-          expect(ctx.oidc.entities).to.have.keys('Client', 'Account', 'AccessToken');
+          expect(ctx.oidc.entities).to.have.keys('Client', 'Account', 'AccessToken', 'Session');
         }, done));
 
         const auth = new this.AuthorizationRequest({

diff --git a/test/core/implicit/id_token.authorization.test.js b/test/core/implicit/id_token.authorization.test.js
@@ -33,7 +33,7 @@ describe('IMPLICIT id_token', () => {
 
       it('populates ctx.oidc.entities', function (done) {
         this.provider.use(this.assertOnce((ctx) => {
-          expect(ctx.oidc.entities).to.have.keys('Client', 'Account');
+          expect(ctx.oidc.entities).to.have.keys('Client', 'Account', 'Session');
         }, done));
 
         const auth = new this.AuthorizationRequest({

diff --git a/test/end_session/end_session.test.js b/test/end_session/end_session.test.js
@@ -148,7 +148,7 @@ describe('logout endpoint', () => {
 
           it('populates ctx.oidc.entities', function (done) {
             this.provider.use(this.assertOnce((ctx) => {
-              expect(ctx.oidc.entities).to.have.keys('Client', 'IdTokenHint');
+              expect(ctx.oidc.entities).to.have.keys('Client', 'IdTokenHint', 'Session');
             }, done));
 
             const params = {
@@ -350,7 +350,7 @@ describe('logout endpoint', () => {
 
       it('populates ctx.oidc.entities', function (done) {
         this.provider.use(this.assertOnce((ctx) => {
-          expect(ctx.oidc.entities).to.have.keys('Client');
+          expect(ctx.oidc.entities).to.have.keys('Client', 'Session');
         }, done));
 
         this.getSession().state = { secret: '123', postLogoutRedirectUri: '/', clientId: 'client' };

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -661,11 +661,13 @@ declare class OIDCContext {
     readonly DeviceCode?: DeviceCode;
     readonly IdTokenHint?: { header: AnyObject, payload: AnyObject };
     readonly InitialAccessToken?: InitialAccessToken;
+    readonly Interaction?: Interaction;
+    readonly PushedAuthorizationRequest?: PushedAuthorizationRequest;
     readonly RefreshToken?: RefreshToken;
     readonly RegistrationAccessToken?: RegistrationAccessToken;
-    readonly PushedAuthorizationRequest?: PushedAuthorizationRequest;
     readonly RotatedRefreshToken?: RefreshToken;
     readonly RotatedRegistrationAccessToken?: RegistrationAccessToken;
+    readonly Session?: Session;
     readonly [key: string]: any;
   };
   readonly claims: ClaimsParameter;