Fix create user error handling

Author: dmitrizagidulin

lib/identity-provider.js

@@ -532,23 +532,24 @@ IdentityProvider.prototype.getGraph = function (uri, callback) {
 }
 
 /**
-<<<<<<< 6477d67eec3b591c4dd226307ff634c1a26e40c6
  * Sends a request to the OIDC Provider's Users API endpoint, to create a new
  * user record with the provider.
  * @method createOIDCUser
- * @param trustedClient {OidcRpClient} Local/trusted OIDC client
+ * @param oidcRpClient {OidcRpClient} Local/trusted OIDC client
  * @param webId {String} WebID URL of the new user to be created
  * @param options {Object} User options hashmap
  * @param options.password {String} User's signin password. NOTE: Must be 8+
  *   characters, mix of alpha and numeric
  * @param [options.email] {String} User's email address (for recovery etc)
  * @param [options.name] {String} User's name
+ * @throws {Error} HTTP 400 on missing required params, and HTTP 500 if no
+ *   oidcRpClient has been configured.
  * @return {Promise}
  */
 IdentityProvider.prototype.createOIDCUser =
-  function createOIDCUser (trustedClient, webId, options = {}) {
-    if (!trustedClient) {
-      let error = new Error('No OIDC Trusted client configured')
+  function createOIDCUser (oidcRpClient, webId, options = {}) {
+    if (!oidcRpClient) {
+      let error = new Error('No OIDC RP client configured')
       error.status = 500
       return Promise.reject(error)
     }
@@ -569,14 +570,20 @@ IdentityProvider.prototype.createOIDCUser =
       name: options.name,
       password: options.password
     }
-    return trustedClient.client
+    var client = oidcRpClient.trustedClient.client
+    return client
       .token({
         grant_type: 'client_credentials',
         scope: 'realm'
       })
       .then((tokenResponse) => {
         let createOptions = { token: tokenResponse.access_token }
-        return trustedClient.client.users.create(userData, createOptions)
+        return client.users.create(userData, createOptions)
+      })
+      .catch((err) => {
+        err.status = err.status || err.statusCode || 400
+        err.message = err.error.message || err.error.error
+        return Promise.reject(err)
       })
   }
 
@@ -610,18 +617,19 @@ IdentityProvider.prototype.post = function post (req, res, next) {
   var agent = self.agent(options)
   var spkac = null
   var cert = null
-  debug('Create account with settings ', options)
 
   waterfall([
     (callback) => {
       // This is for OIDC user creation only. Move on to next step, otherwise
       if (this.auth !== 'oidc') {
         return callback()
       }
-      const trustedClient = req.app.locals.oidc
-      return this.createOIDCUser(trustedClient, agent, options)
+      const oidcRpClient = req.app.locals.oidc
+      return this.createOIDCUser(oidcRpClient, agent, options)
         .then(() => callback())
-        .catch((err) => { callback(err) })
+        .catch((err) => {
+          callback(err)
+        })
     },
     (callback) => {
       // Generate a new WebID-TLS certificate, if appropriate