4 files changed, 14 insertions, 10 deletions
diff --git a/src/actions/firebaseAuth.js b/src/actions/firebaseAuth.js
index 37f6643..8f12c73 100644
--- a/src/actions/firebaseAuth.js
+++ b/src/actions/firebaseAuth.js
@@ -38,7 +38,7 @@ export const authSignOut = () => {
 
 export const createAccount = (_email, _password, divison) => (dispatch) => {
   auth.createUserWithEmailAndPassword(_email, _password).then(() => {
-    dispatch(signIn(_email, _password, divison));
+    dispatch(setUserData(_email, _password, divison));
   })
   .catch((error) => {
     alert(error.code + ": " + error.message);
@@ -53,10 +53,11 @@ import {
 
 import {
   adminListener,
-  adminClose
+  adminClose,
+  updateUserInfo
 } from './firebaseAdmin.js'
 
-export const signIn  = (_email, _password, divison) => (dispatch) => {
+export const signIn  = (_email, _password) => (dispatch) => {
   auth.signInWithEmailAndPassword(_email, _password).then(() => {
     var user  = auth.currentUser;
     /* User is signed in.
@@ -69,7 +70,6 @@ export const signIn  = (_email, _password, divison) => (dispatch) => {
     var providerData = user.providerData;
     */
     dispatch(authSuccess(user));
-    if(divison) { dispatch(setUserData(divison)); }
     dispatch(fetchDivison());
     dispatch(snapshotHours())
     dispatch(snapshotRegisteredCompetitions());
diff --git a/src/actions/firebaseFirestore.js b/src/actions/firebaseFirestore.js
index 49e79c7..4234f4a 100644
--- a/src/actions/firebaseFirestore.js
+++ b/src/actions/firebaseFirestore.js
@@ -94,15 +94,19 @@ export const snapshotForums = () => (dispatch) => {
 
 //Do not dipatch to store, only update firebaseFirestore
 
-export const setUserData = (_divison) => (dispatch, getState) => {
+export const setUserData = (_email, _password,_divison) => (dispatch, getState) => {
   const uid   = getState().firebaseAuth.uid;
   var docRef  = firestore.collection('users').doc(uid);
   docRef.set({
     hours:    0,
-    divison: _divison
-  }).catch((error) => {
-    console.log(error);
+    divison:  _divison,
+    username: _email.replace('@communityschoolnaples.org', '')
+  }).then(() => {
+    dispatch(signIn(_email, _password));
   })
+  .catch((error) => {
+    console.log(error);
+  });
 }
 
 export const requestHours = (_time, _trainee, _location, _subject, _date, _pictureName) => (dispatch, getState) => {
diff --git a/src/components/mao-account.js b/src/components/mao-account.js
index 3b47f66..b66f5c8 100644
--- a/src/components/mao-account.js
+++ b/src/components/mao-account.js
@@ -173,7 +173,7 @@ class MaoAccount extends connect(store)(PageViewElement) {
                         + "@communityschoolnaples.org";
       const password  = passwordElement.value;
 
-      store.dispatch(signIn(email,password,null));
+      store.dispatch(signIn(email,password));
 
       emailElement.value    = "";
       passwordElement.value = "";
diff --git a/src/components/mao-admin.js b/src/components/mao-admin.js
index be04fb2..8bdeac0 100644
--- a/src/components/mao-admin.js
+++ b/src/components/mao-admin.js
@@ -233,7 +233,7 @@ class MaoAdmin extends connect(store)(PageViewElement) {
         var tableRow = document.createElement('tr');
 
         var userEle = document.createElement('td');
-        userEle.innerHTML = "Username";
+        userEle.innerHTML = user['username'] ? user['username'] : "Unknown";
 
 
         var hoursEle        = document.createElement('td');