From cc2e7a69f981f675ab66ef70ce44db176eca2be9 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Wed, 12 Aug 2015 20:30:08 -0700
Subject: [PATCH] fix loopback migration to new auth scheme

closes #1735
---
 seed/loopbackMigration.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/seed/loopbackMigration.js b/seed/loopbackMigration.js
index d167ccec8b..e300bd217b 100644
--- a/seed/loopbackMigration.js
+++ b/seed/loopbackMigration.js
@@ -86,15 +86,19 @@ var users = dbObservable
   .map(function(user) {
     // flatten user
     assign(user, user.portfolio, user.profile);
-    if (user.username) {
-      return user;
+    if (!user.username) {
+      user.username = 'fcc' + uuid.v4().slice(0, 8);
     }
-    user.username = 'fcc' + uuid.v4().slice(0, 8);
     if (user.github) {
       user.isGithubCool = true;
     } else {
       user.isMigrationGrandfathered = true;
     }
+    providers.forEach(function(provider) {
+      user[provider + 'id'] = user[provider];
+      user[provider] = null;
+    });
+
     return user;
   })
   .shareReplay();
@@ -123,7 +127,7 @@ var userIdentityCount = users
       .map(function(provider) {
         return {
           provider: provider,
-          externalId: user[provider],
+          externalId: user[provider + 'id'],
           userId: user._id || user.id
         };
       })