Conditionally enforcing acceptToc when creating account

Author: megoth

lib/create-app.js

@@ -124,6 +124,8 @@ function initAppLocals (app, argv, ldp) {
   app.locals.authMethod = argv.auth
   app.locals.localAuth = argv.localAuth
   app.locals.tokenService = new TokenService()
+  app.locals.enforceToc = argv.enforceToc
+  app.locals.tocUri = argv.tocUri
 
   if (argv.email && argv.email.host) {
     app.locals.emailService = new EmailService(argv.templates.email, argv.email)

lib/requests/auth-request.js

@@ -88,6 +88,7 @@ class AuthRequest {
 
     let authQueryParams = AuthRequest.extractAuthParams(req)
     let returnToUrl = AuthRequest.parseParameter(req, 'returnToUrl')
+    const acceptToc = AuthRequest.parseParameter(req, 'acceptToc')
 
     let options = {
       response: res,
@@ -96,7 +97,8 @@ class AuthRequest {
       accountManager,
       returnToUrl,
       authQueryParams,
-      localAuth
+      localAuth,
+      acceptToc
     }
 
     return options

lib/requests/create-account-request.js

@@ -29,12 +29,14 @@ class CreateAccountRequest extends AuthRequest {
    *   this url on successful account creation
    * @param [options.enforceToc] {boolean} Whether or not to enforce the service provider's T&C
    * @param [options.tocUri] {string} URI to the service provider's T&C
+   * @param [options.acceptToc] {boolean} Whether or not user has accepted T&C
    */
   constructor (options) {
     super(options)
 
     this.username = options.username
     this.userAccount = options.userAccount
+    this.acceptToc = options.acceptToc === 'true'
   }
 
   /**
@@ -48,7 +50,7 @@ class CreateAccountRequest extends AuthRequest {
    *   `userAccountFrom()`), or it encounters an unsupported authentication
    *   scheme.
    *
-   * @return {CreateAccountRequest|CreateTlsAccountRequest}
+   * @return {CreateOidcAccountRequest|CreateTlsAccountRequest}
    */
   static fromParams (req, res) {
     let options = AuthRequest.requestOptions(req, res)
@@ -64,9 +66,8 @@ class CreateAccountRequest extends AuthRequest {
       options.userAccount = accountManager.userAccountFrom(body)
     }
 
-    const config = require('../../config')
-    options.enforceToc = config.enforceToc
-    options.tocUri = config.tocUri
+    options.enforceToc = locals.enforceToc
+    options.tocUri = locals.tocUri
 
     switch (authMethod) {
       case 'oidc':
@@ -80,13 +81,15 @@ class CreateAccountRequest extends AuthRequest {
     }
   }
 
-  static post (req, res) {
+  static async post (req, res) {
     let request = CreateAccountRequest.fromParams(req, res)
 
-    return Promise.resolve()
-      .then(() => request.validate())
-      .then(() => request.createAccount())
-      .catch(error => request.error(error))
+    try {
+      request.validate()
+      await request.createAccount()
+    } catch (error) {
+      request.error(error)
+    }
   }
 
   static get (req, res) {
@@ -251,6 +254,7 @@ class CreateOidcAccountRequest extends CreateAccountRequest {
    *
    * @param [options={}] {Object} See `CreateAccountRequest` constructor docstring
    * @param [options.password] {string} Password, as entered by the user at signup
+   * @param [options.acceptToc] {boolean} Whether or not user has accepted T&C
    */
   constructor (options) {
     super(options)
@@ -278,6 +282,13 @@ class CreateOidcAccountRequest extends CreateAccountRequest {
       error.statusCode = 400
       throw error
     }
+
+    // console.log(this.enforceToc, this.acceptToc)
+    if (this.enforceToc && !this.acceptToc) {
+      error = new Error('Accepting Terms & Conditions are required for this service')
+      error.statusCode = 400
+      throw error
+    }
   }
 
   /**
@@ -317,6 +328,7 @@ class CreateTlsAccountRequest extends CreateAccountRequest {
    *
    * @param [options={}] {Object} See `CreateAccountRequest` constructor docstring
    * @param [options.spkac] {string}
+   * @param [options.acceptToc] {boolean} Whether or not user has accepted T&C
    */
   constructor (options) {
     super(options)
@@ -326,7 +338,7 @@ class CreateTlsAccountRequest extends CreateAccountRequest {
   }
 
   /**
-   * Validates the Login request (makes sure required parameters are present),
+   * Validates the Signup request (makes sure required parameters are present),
    * and throws an error if not.
    *
    * @throws {Error} If missing required params
@@ -339,6 +351,12 @@ class CreateTlsAccountRequest extends CreateAccountRequest {
       error.statusCode = 400
       throw error
     }
+
+    if (this.enforceToc && !this.acceptToc) {
+      error = new Error('Accepting Terms & Conditions are required for this service')
+      error.statusCode = 400
+      throw error
+    }
   }
 
   /**