From 0d6ea57b2b58111110f3a578b8ac7a14772d809b Mon Sep 17 00:00:00 2001 From: Michael Foiani Date: Sat, 15 Sep 2018 13:30:34 -0400 Subject: Created basic fix for new accounts to update username info when creatiing account. --- src/actions/firebaseAuth.js | 8 ++++---- src/actions/firebaseFirestore.js | 12 ++++++++---- src/components/mao-account.js | 2 +- src/components/mao-admin.js | 2 +- 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'); -- cgit v1.2.3-70-g09d2 From 5afa931ec2d48ed6aefafcb122b63be435e734ed Mon Sep 17 00:00:00 2001 From: Michael Foiani Date: Sat, 15 Sep 2018 21:43:51 +0000 Subject: Revert "Created basic fix for new accounts to update username info when creatiing account." This reverts commit 0d6ea57b2b58111110f3a578b8ac7a14772d809b --- src/actions/firebaseAuth.js | 8 ++++---- src/actions/firebaseFirestore.js | 12 ++++-------- src/components/mao-account.js | 2 +- src/components/mao-admin.js | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/actions/firebaseAuth.js b/src/actions/firebaseAuth.js index 8f12c73..37f6643 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(setUserData(_email, _password, divison)); + dispatch(signIn(_email, _password, divison)); }) .catch((error) => { alert(error.code + ": " + error.message); @@ -53,11 +53,10 @@ import { import { adminListener, - adminClose, - updateUserInfo + adminClose } from './firebaseAdmin.js' -export const signIn = (_email, _password) => (dispatch) => { +export const signIn = (_email, _password, divison) => (dispatch) => { auth.signInWithEmailAndPassword(_email, _password).then(() => { var user = auth.currentUser; /* User is signed in. @@ -70,6 +69,7 @@ export const signIn = (_email, _password) => (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 4234f4a..49e79c7 100644 --- a/src/actions/firebaseFirestore.js +++ b/src/actions/firebaseFirestore.js @@ -94,19 +94,15 @@ export const snapshotForums = () => (dispatch) => { //Do not dipatch to store, only update firebaseFirestore -export const setUserData = (_email, _password,_divison) => (dispatch, getState) => { +export const setUserData = (_divison) => (dispatch, getState) => { const uid = getState().firebaseAuth.uid; var docRef = firestore.collection('users').doc(uid); docRef.set({ hours: 0, - divison: _divison, - username: _email.replace('@communityschoolnaples.org', '') - }).then(() => { - dispatch(signIn(_email, _password)); - }) - .catch((error) => { + divison: _divison + }).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 b66f5c8..3b47f66 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)); + store.dispatch(signIn(email,password,null)); emailElement.value = ""; passwordElement.value = ""; diff --git a/src/components/mao-admin.js b/src/components/mao-admin.js index 8bdeac0..be04fb2 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 = user['username'] ? user['username'] : "Unknown"; + userEle.innerHTML = "Username"; var hoursEle = document.createElement('td'); -- cgit v1.2.3-70-g09d2