From 63937c3a56775d018fd00e970c63a4268105a3f8 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 12 Jun 2015 13:14:07 -0700
Subject: [PATCH] fix make usernames required

---
 common/models/user.json | 16 ++++++++++++++--
 server/config.json      |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/common/models/user.json b/common/models/user.json
index 8e15a241dc..ff0cab3495 100644
--- a/common/models/user.json
+++ b/common/models/user.json
@@ -44,7 +44,8 @@
     "username": {
       "type": "string",
       "lowercase": true,
-      "trim": true
+      "trim": true,
+      "id": true
     },
     "bio": {
       "type": "string",
@@ -226,7 +227,18 @@
     }
   },
   "validations": [],
-  "relations": {},
+  "relations": {
+    "credentials": {
+      "type": "hasMany",
+      "model": "userCredential",
+      "foreignKey": ""
+    },
+    "identities": {
+      "type": "hasMany",
+      "model": "userIdentity",
+      "foreignKey": ""
+    }
+  },
   "acls": [
     {
       "accessType": "*",
diff --git a/server/config.json b/server/config.json
index 643481ac45..953b2f37c5 100644
--- a/server/config.json
+++ b/server/config.json
@@ -2,7 +2,7 @@
   "restApiRoot": "/api",
   "host": "0.0.0.0",
   "port": 3000,
-  "legacyExplorer" : false,
+  "legacyExplorer": false,
   "remoting": {
     "context": {
       "enableHttpContext": false