Move createOIDCUser to oidc-rp-client (from identity-provider)

Author: dmitrizagidulin

lib/identity-provider.js

@@ -531,62 +531,6 @@ IdentityProvider.prototype.getGraph = function (uri, callback) {
     })
 }
 
-/**
- * Sends a request to the OIDC Provider's Users API endpoint, to create a new
- * user record with the provider.
- * @method createOIDCUser
- * @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 (oidcRpClient, webId, options = {}) {
-    if (!oidcRpClient) {
-      let error = new Error('No OIDC RP client configured')
-      error.status = 500
-      return Promise.reject(error)
-    }
-    if (!webId) {
-      let error = new Error('No WebID Url provided')
-      error.status = 400
-      return Promise.reject(error)
-    }
-    if (!options.password) {
-      let error = new Error('No password provided')
-      error.status = 400
-      return Promise.reject(error)
-    }
-    var userData = {
-      _id: webId,
-      email: options.email,
-      profile: webId,
-      name: options.name,
-      password: options.password
-    }
-    var client = oidcRpClient.trustedClient.client
-    return client
-      .token({
-        grant_type: 'client_credentials',
-        scope: 'realm'
-      })
-      .then((tokenResponse) => {
-        let createOptions = { token: tokenResponse.access_token }
-        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)
-      })
-  }
-
 /**
  * Handles POST requests to /api/accounts/new, creates a new user account.
  * @param req
@@ -600,6 +544,7 @@ IdentityProvider.prototype.createOIDCUser =
  * @param [req.body.url] {String} User account URL (`username.databox.com`)
  * @param [req.body.username] {String} Username, passed through to `agent()` and
  *   used in WebID URL creation if the `url` parameter is missing.
+ * @throws {Error} HTTP 400 on missing required params, HTTP 500 on misc errors
  * @method post
  */
 IdentityProvider.prototype.post = function post (req, res, next) {
@@ -625,7 +570,12 @@ IdentityProvider.prototype.post = function post (req, res, next) {
         return callback()
       }
       const oidcRpClient = req.app.locals.oidc
-      return this.createOIDCUser(oidcRpClient, agent, options)
+      if (!oidcRpClient) {
+        let error = new Error('No OIDC RP client configured')
+        error.status = 500
+        return callback(error)
+      }
+      return oidcRpClient.createOIDCUser(agent, options)
         .then(() => callback())
         .catch((err) => {
           callback(err)

lib/oidc-rp-client.js

@@ -67,6 +67,54 @@ module.exports = class OidcRpClient {
       })
   }
 
+  /**
+   * Sends a request to the OIDC Provider's Users API endpoint, to create a new
+   * user record with the provider.
+   * @method createOIDCUser
+   * @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.
+   * @return {Promise}
+   */
+  createOIDCUser (webId, options = {}) {
+    if (!webId) {
+      let error = new Error('No WebID Url provided')
+      error.status = 400
+      return Promise.reject(error)
+    }
+    if (!options.password) {
+      let error = new Error('No password provided')
+      error.status = 400
+      return Promise.reject(error)
+    }
+    var userData = {
+      _id: webId,
+      email: options.email,
+      profile: webId,
+      name: options.name,
+      password: options.password
+    }
+    var client = this.trustedClient.client
+    return client
+      .token({
+        grant_type: 'client_credentials',
+        scope: 'realm'
+      })
+      .then((tokenResponse) => {
+        let createOptions = { token: tokenResponse.access_token }
+        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)
+      })
+  }
+
   clientForIssuer (issuer) {
     var trustedClient = this.trustedClient.client
     var baseRedirectUri = trustedClient.redirect_uri