RC-8: update auth service and user slice

This commit is contained in:
2023-07-12 21:49:07 +01:00
parent b0d0579ce7
commit e6dfcc8cf7
3 changed files with 5 additions and 7 deletions

View File

@@ -83,7 +83,7 @@ function SignUpPage({ t }) {
className="mb-28"
label={t('name')}
autoFocus
type="name"
type="text"
error={!!errors.name}
helperText={errors?.name?.message}
variant="outlined"

View File

@@ -63,13 +63,12 @@ export default class AuthService extends FuseUtils.EventEmitter {
}
const userRef = firebaseDb.ref(this.#db, `users/${this.#auth.currentUser.uid}`);
const value = { data: { ...user } };
firebaseDb
.set(userRef, value)
.set(userRef, user)
.then(() => {
if (user.email) {
return firebaseAuth.updateEmail(this.#auth, user.email);
if (user.data.email !== this.#auth.currentUser.email) {
return firebaseAuth.updateEmail(this.#auth, user.data.email);
}
return null;

View File

@@ -22,7 +22,7 @@ export const updateUserSettings = createAsyncThunk(
'user/updateSettings',
async (settings, { dispatch, getState }) => {
const { user } = getState();
const newUser = _.merge({}, user, { data: { settings } });
const newUser = _.merge({}, user, { data: { ...settings } });
dispatch(updateUserData(newUser));
@@ -67,7 +67,6 @@ const initialState = {
role: [], // guest
data: {
displayName: 'John Doe',
photoURL: 'assets/images/avatars/brian-hughes.jpg',
email: 'johndoe@withinpixels.com',
},
};