Made the logout route remove the user

jaxoncreed · jaxoncreed · commit 38b129cdcbb9 · 2021-09-09T23:28:37.000-07:00
diff --git a/lib/api/authn/webid-oidc.js b/lib/api/authn/webid-oidc.js
@@ -50,8 +50,6 @@ function initialize (app, argv) {
       .then(webId => {
         if (webId) {
           req.session.userId = webId
-        } else {
-          req.session.userId = null
         }
 
         next()
diff --git a/lib/create-app.js b/lib/create-app.js
@@ -236,6 +236,9 @@ function initWebId (argv, app, ldp) {
       // Ensure this modified session is not saved
       req.session.save = (done) => done()
     }
+    if (isLogoutRequest(req)) {
+      delete req.session.userId
+    }
     next()
   })
 
diff --git a/test/integration/authentication-oidc-with-strict-origins-turned-off-test.js b/test/integration/authentication-oidc-with-strict-origins-turned-off-test.js
@@ -223,7 +223,7 @@ describe('Authentication API (OIDC) - With strict origins turned off', () => {
                 })
             })
 
-            it('should return a 401 even with a cookie', () => expect(response).to.have.property('status', 401))
+            it('should return a 200', () => expect(response).to.have.property('status', 200))
           })
           describe('and our origin', () => {
             before(done => {
@@ -236,7 +236,7 @@ describe('Authentication API (OIDC) - With strict origins turned off', () => {
                 })
             })
 
-            it('should return a 401 even with a cookie', () => expect(response).to.have.property('status', 401))
+            it('should return a 200', () => expect(response).to.have.property('status', 200))
           })
           describe('and trusted origin', () => {
             before(done => {

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,6 @@ function initialize (app, argv) {`
`50`	`50`	`.then(webId => {`
`51`	`51`	`if (webId) {`
`52`	`52`	`req.session.userId = webId`
`53`		`- } else {`
`54`		`- req.session.userId = null`
`55`	`53`	`}`
`56`	`54`
`57`	`55`	`next()`
Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,9 @@ function initWebId (argv, app, ldp) {`
`236`	`236`	`// Ensure this modified session is not saved`
`237`	`237`	`req.session.save = (done) => done()`
`238`	`238`	`}`
	`239`	`+ if (isLogoutRequest(req)) {`
	`240`	`+ delete req.session.userId`
	`241`	`+ }`
`239`	`242`	`next()`
`240`	`243`	`})`
`241`	`244`