Handle errors for user not logged in

Author: jaxoncreed

lib/requests/consent-request.js

@@ -65,15 +65,18 @@ class ConsentRequest extends AuthRequest {
    */
   static async get (req, res) {
     const request = ConsentRequest.fromParams(req, res)
+
     const appOrigin = request.getAppOrigin()
     // Check if is already registered or is data browser
-    if (
-      appOrigin === req.app.locals.ldp.serverUri ||
-      await request.isAppRegistered(req.app.locals.ldp, appOrigin, request.authQueryParams.web_id)
-    ) {
-      request.redirectPostConsent()
-    } else {
-      request.renderForm(null, req)
+    if (request.isUserLoggedIn()) {
+      if (
+        appOrigin === req.app.locals.ldp.serverUri ||
+        await request.isAppRegistered(req.app.locals.ldp, appOrigin, request.session.subject._id)
+      ) {
+        request.redirectPostConsent()
+      } else {
+        request.renderForm(null, req)
+      }
     }
   }
 
@@ -96,23 +99,27 @@ class ConsentRequest extends AuthRequest {
 
     let request = ConsentRequest.fromParams(req, res)
 
-    // Ensure the user arrived here by logging in
-    if (!request.session.subject && request.session.subject._id) {
-      const error = new Error('User not logged in')
-      error.statusCode = 401
-      throw error
-    }
+    if (request.isUserLoggedIn()) {
+      const appOrigin = request.getAppOrigin()
+      debug('Providing consent for app sharing')
 
-    const appOrigin = request.getAppOrigin()
-    debug('Providing consent for app sharing')
+      if (consented) {
+        await request.registerApp(req.app.locals.ldp, appOrigin, accessModes, request.session.subject._id)
+      }
 
-    if (consented) {
-      await request.registerApp(req.app.locals.ldp, appOrigin, accessModes, request.session.subject._id)
+      // Redirect once that's all done
+      request.redirectPostConsent()
     }
+  }
 
-    console.log('oh no didnt update')
-    // Redirect once that's all done
-    request.redirectPostConsent()
+  isUserLoggedIn () {
+    // Ensure the user arrived here by logging in
+    if (!this.session.subject || !this.session.subject._id) {
+      this.response.status(401)
+      this.response.send('User not logged in 2')
+      return false
+    }
+    return true
   }
 
   getAppOrigin () {
@@ -136,7 +143,6 @@ class ConsentRequest extends AuthRequest {
 
   async saveProfileGraph (ldp, store, webId) {
     const text = $rdf.serialize(undefined, store, webId, 'text/turtle')
-    console.log(text)
     await ldp.put(webId, intoStream(text), 'text/turtle')
   }
 
@@ -163,7 +169,6 @@ class ConsentRequest extends AuthRequest {
     accessModes.forEach(mode => {
       store.add(application, ACL('mode'), ACL(mode))
     })
-    console.log(store)
     await this.saveProfileGraph(ldp, store, webId)
   }