Commit d573f31

committed

update to constant routes, use dynamic authorizaton rule

1 parent dfe89e0 commit d573f31Copy full SHA for d573f31

File tree

+13

-7

lines changed

+13

-7

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,9 @@ const mapStateToProps = (state) => ({`
`17`	`17`	`authUser: state.sessionState.authUser,`
`18`	`18`	`});`
`19`	`19`
	`20`	`+const authCondition = (authUser) => !!authUser;`
	`21`	`+`
`20`	`22`	`export default compose(`
`21`		`- withAuthorization(true),`
	`23`	`+ withAuthorization(authCondition),`
`22`	`24`	`connect(mapStateToProps)`
`23`	`25`	`)(AccountPage);`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,9 @@ const mapDispatchToProps = (dispatch) => ({`
`49`	`49`	`onSetUsers: (users) => dispatch({ type: 'USERS_SET', users }),`
`50`	`50`	`});`
`51`	`51`
	`52`	`+const authCondition = (authUser) => !!authUser;`
	`53`	`+`
`52`	`54`	`export default compose(`
`53`		`- withAuthorization(true),`
	`55`	`+ withAuthorization(authCondition),`
`54`	`56`	`connect(mapStateToProps, mapDispatchToProps)`
`55`	`57`	`)(HomePage);`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ import React, { Component } from 'react';`
`2`	`2`	`import { Link } from 'react-router-dom';`
`3`	`3`
`4`	`4`	`import { auth } from '../../firebase';`
	`5`	`+import * as routes from '../../constants/routes';`
`5`	`6`
`6`	`7`	`const PasswordForgetPage = () =>`
`7`	`8`	`<div>`
`@@ -67,7 +68,7 @@ class PasswordForgetForm extends Component {`
`67`	`68`
`68`	`69`	`const PasswordForgetLink = () =>`
`69`	`70`	`<p>`
`70`		`- <Link to="/pw-forget">Forgot Password?</Link>`
	`71`	`+ <Link to={routes.PASSWORD_FORGET}>Forgot Password?</Link>`
`71`	`72`	`</p>`
`72`	`73`
`73`	`74`	`export default PasswordForgetPage;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@ import { withRouter } from 'react-router-dom';`
`6`	`6`	`import { firebase } from '../../firebase';`
`7`	`7`	`import * as routes from '../../constants/routes';`
`8`	`8`
`9`		`-const withAuthorization = (needsAuthorization) => (Component) => {`
	`9`	`+const withAuthorization = (condition) => (Component) => {`
`10`	`10`	`class WithAuthorization extends React.Component {`
`11`	`11`	`componentDidMount() {`
`12`	`12`	`firebase.auth.onAuthStateChanged(authUser => {`
`13`		`- if (!authUser&&needsAuthorization) {`
	`13`	`+ if (!condition(authUser)) {`
`14`	`14`	`this.props.history.push(routes.SIGN_IN);`
`15`	`15`	`}`
`16`	`16`	`});`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ class SignUpForm extends Component {`
`76`	`76`	`const isInvalid =`
`77`	`77`	`passwordOne !== passwordTwo \|\|`
`78`	`78`	`passwordOne === '' \|\|`
`79`		`- username === '';`
	`79`	`+ username === '' \|\|`
	`80`	`+ email === '';`
`80`	`81`
`81`	`82`	`return (`
`82`	`83`	`<form onSubmit={this.onSubmit}>`
`@@ -118,7 +119,7 @@ const SignUpLink = () =>`
`118`	`119`	`<p>`
`119`	`120`	`Don't have an account?`
`120`	`121`	`{' '}`
`121`		`- <Link to="/signup">Sign Up</Link>`
	`122`	`+ <Link to={routes.SIGN_UP}>Sign Up</Link>`
`122`	`123`	`</p>`
`123`	`124`
`124`	`125`	`export default withRouter(SignUpPage);`

Comments

(0)