Skip to content

Commit 2a895f9

Browse files
committed
fix role to object instead of array
1 parent 076e79f commit 2a895f9

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

src/components/Admin/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const AdminPage = () => (
2020
);
2121

2222
const condition = authUser =>
23-
authUser && authUser.roles.includes(ROLES.ADMIN);
23+
authUser && !!authUser.roles[ROLES.ADMIN];
2424

2525
export default compose(
2626
withEmailVerification,

src/components/Firebase/firebase.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class Firebase {
7373

7474
// default empty roles
7575
if (!dbUser.roles) {
76-
dbUser.roles = [];
76+
dbUser.roles = {};
7777
}
7878

7979
// merge auth and db user

src/components/Navigation/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const NavigationAuth = ({ authUser }) => (
2929
<li>
3030
<Link to={ROUTES.ACCOUNT}>Account</Link>
3131
</li>
32-
{authUser.roles.includes(ROLES.ADMIN) && (
32+
{!!authUser.roles[ROLES.ADMIN] && (
3333
<li>
3434
<Link to={ROUTES.ADMIN}>Admin</Link>
3535
</li>

src/components/SignIn/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class SignInGoogleBase extends Component {
108108
return this.props.firebase.user(socialAuthUser.user.uid).set({
109109
username: socialAuthUser.user.displayName,
110110
email: socialAuthUser.user.email,
111-
roles: [],
111+
roles: {},
112112
});
113113
})
114114
.then(() => {
@@ -154,7 +154,7 @@ class SignInFacebookBase extends Component {
154154
return this.props.firebase.user(socialAuthUser.user.uid).set({
155155
username: socialAuthUser.additionalUserInfo.profile.name,
156156
email: socialAuthUser.additionalUserInfo.profile.email,
157-
roles: [],
157+
roles: {},
158158
});
159159
})
160160
.then(() => {
@@ -200,7 +200,7 @@ class SignInTwitterBase extends Component {
200200
return this.props.firebase.user(socialAuthUser.user.uid).set({
201201
username: socialAuthUser.additionalUserInfo.profile.name,
202202
email: socialAuthUser.additionalUserInfo.profile.email,
203-
roles: [],
203+
roles: {},
204204
});
205205
})
206206
.then(() => {

src/components/SignUp/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ class SignUpFormBase extends Component {
4141

4242
onSubmit = event => {
4343
const { username, email, passwordOne, isAdmin } = this.state;
44-
const roles = [];
44+
const roles = {};
4545

4646
if (isAdmin) {
47-
roles.push(ROLES.ADMIN);
47+
roles[ROLES.ADMIN] = ROLES.ADMIN;
4848
}
4949

5050
this.props.firebase

0 commit comments

Comments
 (0)