@dhyasama/totem-models 6.21.6 → 6.21.8

package/lib/Organization.js

@@ -1305,39 +1305,7 @@ module.exports = function(mongoose, config) {
 
     if (!value) { return cb(new Error('value must be provided'), null); }
 
-    var getUsername = function getUsername(val) {
-
-      if (!val) { return ''; }
-      if (val.indexOf('@') === 0) { val = val.replace('@', ''); }
-
-      var username = '';
-      var usernameRegExp = new RegExp("^[A-Za-z0-9_.@]{3,}$");
-      var usernameMatch = [];
-      var URL = require('url');
-      var parsedUrl = URL.parse(val);
-      var protocol = parsedUrl.protocol;
-
-      if (!protocol) { parsedUrl = URL.parse('http://' + val); }
-
-      var pathname = parsedUrl.pathname;
-
-      if (pathname.indexOf('/') === 0) { pathname = pathname.replace('/', ''); }
-      if (pathname.indexOf('company/') === 0) { pathname = pathname.replace('company/', ''); }
-      if (pathname.indexOf('organization/') === 0) { pathname = pathname.replace('organization/', ''); }
-      if (pathname.indexOf('/') >= 0) { pathname = pathname.split('/')[0]; }
-
-      if (pathname) { usernameMatch = usernameRegExp.exec(pathname); }
-      else { usernameMatch = usernameRegExp.exec(val); }
-
-      if (usernameMatch.length) { username = usernameMatch[0]; }
-
-      console.log('Username:', val, '-->', username);
-
-      return username;
-
-    };
-
-    var username = getUsername(value);
+    var username = utils.getUsernameFromUrl(value);
 
     if (!username) { return cb(null, []); }
 

package/lib/Person.js

@@ -714,38 +714,7 @@ module.exports = function(mongoose, config) {
 
     if (!value) { return cb(new Error('value must be provided'), null); }
 
-    var getUsername = function getUsername(val) {
-
-      if (!val) { return ''; }
-      if (val.indexOf('@') === 0) { val = val.replace('@', ''); }
-
-      var username = '';
-      var usernameRegExp = new RegExp("^[A-Za-z0-9_.@]{3,}$");
-      var usernameMatch = [];
-      var URL = require('url');
-      var parsedUrl = URL.parse(val);
-      var protocol = parsedUrl.protocol;
-
-      if (!protocol) { parsedUrl = URL.parse('http://' + val); }
-
-      var pathname = parsedUrl.pathname;
-
-      if (pathname.indexOf('/') === 0) { pathname = pathname.replace('/', ''); }
-      if (pathname.indexOf('in/') === 0) { pathname = pathname.replace('in/', ''); }
-      if (pathname.indexOf('/') >= 0) { pathname = pathname.split('/')[0]; }
-
-      if (pathname) { usernameMatch = usernameRegExp.exec(pathname); }
-      else { usernameMatch = usernameRegExp.exec(val); }
-
-      if (usernameMatch.length) { username = usernameMatch[0]; }
-
-      console.log('Username:', val, '-->', username);
-
-      return username;
-
-    };
-
-    var username = getUsername(value);
+    var username = utils.getUsernameFromUrl(value);
 
     if (!username) { return cb(null, []); }
 

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "6.21.3",
+  "version": "6.21.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "6.21.6",
+  "version": "6.21.8",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",