Skip to content

Commit aa0644e

Browse files
committed
fix API routes
1 parent 5ad4375 commit aa0644e

File tree

3 files changed

+22
-23
lines changed

3 files changed

+22
-23
lines changed

src/components/Session/authUserListener.js

+14-12
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,23 @@ import { firebase, db } from '../../firebase';
33
export default (next, fallback = () => {}) =>
44
firebase.auth.onAuthStateChanged(authUser => {
55
if (authUser) {
6-
db.onceGetUser(authUser.uid).then(snapshot => {
7-
let dbUser = snapshot.val();
6+
db.user(authUser.uid)
7+
.once('value')
8+
.then(snapshot => {
9+
let dbUser = snapshot.val();
810

9-
if (!dbUser.roles) {
10-
dbUser.roles = [];
11-
}
11+
if (!dbUser.roles) {
12+
dbUser.roles = [];
13+
}
1214

13-
authUser = {
14-
id: authUser.uid,
15-
email: authUser.email,
16-
...dbUser,
17-
};
15+
authUser = {
16+
id: authUser.uid,
17+
email: authUser.email,
18+
...dbUser,
19+
};
1820

19-
next(authUser);
20-
});
21+
next(authUser);
22+
});
2123
} else {
2224
fallback();
2325
}

src/components/SignUp/index.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,12 @@ class SignUpForm extends Component {
4242
.doCreateUserWithEmailAndPassword(email, passwordOne)
4343
.then(authUser => {
4444
// Create a user in your own accessible Firebase Database too
45-
db.doCreateUser(authUser.user.uid, username, email, roles)
45+
db.user(authUser.user.id)
46+
.set({
47+
username,
48+
email,
49+
roles,
50+
})
4651
.then(() => {
4752
this.setState(() => ({ ...INITIAL_STATE }));
4853
history.push(ROUTES.HOME);

src/firebase/db.js

+2-10
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,8 @@ import { db } from './firebase';
22

33
// User API
44

5-
export const doCreateUser = (id, username, email, roles) =>
6-
db.ref(`users/${id}`).set({
7-
id,
8-
username,
9-
email,
10-
roles,
11-
});
5+
export const user = id => db.ref(`users/${id}`);
126

13-
export const onceGetUser = id => db.ref(`users/${id}`).once('value');
14-
15-
export const onceGetUsers = () => db.ref('users').once('value');
7+
export const users = () => db.ref('users');
168

179
// Other db APIs ...

0 commit comments

Comments
 (0)