diff --git a/api/src/graphql/resolvers/Mutation/index.js b/api/src/graphql/resolvers/Mutation/index.js index 71f7e274c..83fa98d8f 100644 --- a/api/src/graphql/resolvers/Mutation/index.js +++ b/api/src/graphql/resolvers/Mutation/index.js @@ -4,7 +4,7 @@ import { sendTeamMemberInvite, sendTeamCreateConfirmation, verifyInviteToken } f import TEAM_FB_FRAGMENT from '../../fragments/TeamFBFragment' -import { logger } from '../../../logger' +import { logger, AuthenticationError } from '../../../logger' export const resolvers = { Mutation: { diff --git a/client/src/graphql/teams/GetTeamsByOwnerQuery.js b/client/src/graphql/teams/GetTeamsByOwnerQuery.js index adbb28c4a..730769d8b 100644 --- a/client/src/graphql/teams/GetTeamsByOwnerQuery.js +++ b/client/src/graphql/teams/GetTeamsByOwnerQuery.js @@ -2,8 +2,8 @@ import gql from 'graphql-tag' export const GET_TEAMS_BY_OWNER = gql` - query teamsByOwnerQuery($authId: String!) { - teams_TeamsByOwner(ownerId: $authId) { + query teamsByOwnerQuery { + teams_TeamsByOwner { id name slug diff --git a/client/src/views/financial-beings/components/ManageFBEdit.js b/client/src/views/financial-beings/components/ManageFBEdit.js index 6619b342f..03a237456 100644 --- a/client/src/views/financial-beings/components/ManageFBEdit.js +++ b/client/src/views/financial-beings/components/ManageFBEdit.js @@ -41,7 +41,6 @@ export class ManageFBEdit extends Component { this.handleAvatar = this.handleAvatar.bind(this) const avatar = props.fb.avatar || '' - this.authId = props.authId this.state = { open: false, @@ -57,8 +56,7 @@ export class ManageFBEdit extends Component { mutation={UPDATE_FB} refetchQueries={[ { - query: GET_TEAMS_BY_OWNER, - variables: { authId: this.authId } + query: GET_TEAMS_BY_OWNER } ]} > @@ -197,8 +195,7 @@ export class ManageFBEdit extends Component { ManageFBEdit.propTypes = { classes: PropTypes.object.isRequired, slug: PropTypes.string.isRequired, - fb: PropTypes.object, - authId: PropTypes.string.isRequired + fb: PropTypes.object } export default withStyles(styles)(ManageFBEdit) diff --git a/client/src/views/financial-beings/components/ManageFBItem.js b/client/src/views/financial-beings/components/ManageFBItem.js index 26920ecff..aa9660f9a 100644 --- a/client/src/views/financial-beings/components/ManageFBItem.js +++ b/client/src/views/financial-beings/components/ManageFBItem.js @@ -10,7 +10,7 @@ import Typography from '@material-ui/core/Typography' import ManageFBEdit from './ManageFBEdit' -export const ManageFBItem = ({ classes, team, authId }) => { +export const ManageFBItem = ({ classes, team }) => { console.log('ManageFBItem', team, team.fb[0], team.profile.avatar) let avatar if (team.fb[0].avatar !== undefined && team.fb[0].avatar !== 'a') { @@ -36,7 +36,7 @@ export const ManageFBItem = ({ classes, team, authId }) => { - + @@ -46,8 +46,7 @@ export const ManageFBItem = ({ classes, team, authId }) => { ManageFBItem.propTypes = { classes: PropTypes.object.isRequired, - team: PropTypes.object.isRequired, - authId: PropTypes.string.isRequired + team: PropTypes.object.isRequired } export default ManageFBItem diff --git a/client/src/views/financial-beings/components/ManageFBList.js b/client/src/views/financial-beings/components/ManageFBList.js index df0ab0d88..ccb0a91fe 100644 --- a/client/src/views/financial-beings/components/ManageFBList.js +++ b/client/src/views/financial-beings/components/ManageFBList.js @@ -1,15 +1,11 @@ import React from 'react' import PropTypes from 'prop-types' import { Query } from 'react-apollo' -import { withStateHandlers, lifecycle, compose } from 'recompose' import Grid from '@material-ui/core/Grid' import { MessageCard } from '@advancedalgos/web-components' import { withStyles } from '@material-ui/core/styles' -import { isDefined, isString } from '../../../utils/js-helpers' -import { getItem } from '../../../utils/local-storage' - import GET_TEAMS_BY_OWNER from '../../../graphql/teams/GetTeamsByOwnerQuery' import ManageFBItem from './ManageFBItem' @@ -46,94 +42,63 @@ const styles = theme => ({ } }) -export const ManageFBList = ({ classes, user = null }) => { - let owner - let authId = null - console.log('ManageTeamsList: ', user) - if (user !== null && isString(user)) { - owner = JSON.parse(user) - if (isDefined(owner.authId)) authId = owner.authId - } - console.log('ManageTeamsList 2: ', owner, authId) - if (authId === undefined || authId === null) { - return ( - - - - - - ) - } else { - return ( - - {({ loading, error, data }) => { - console.log('GET_TEAMS_BY_OWNER: ', loading, error, data) +export const ManageFBList = ({ classes }) => ( + + {({ loading, error, data }) => { + console.log('GET_TEAMS_BY_OWNER: ', loading, error, data) - let errors = null - if (error) { - errors = error.graphQLErrors.map(({ message }, i) => { - return - }) - } - if (!loading && !error) { - if (data.teams_TeamsByOwner.length > 0) { - return ( - - - {!loading && - data.teams_TeamsByOwner.map(team => ( - - ))} - {errors} - - - ) - } - } else { - return ( + let errors = null + if (error) { + errors = error.graphQLErrors.map(({ message }, i) => { + return + }) + } + if (!loading && !error) { + if (data.teams_TeamsByOwner.length > 0) { + return ( + - - - {errors !== null && } - + {!loading && + data.teams_TeamsByOwner.map(team => ( + + ))} + {errors} - ) - } - }} - - ) - } -} + + ) + } else { + return ( + + + + {errors !== null && } + + + ) + } + } else { + return ( + + + + {errors !== null && } + + + ) + } + }} + +) ManageFBList.propTypes = { - user: PropTypes.any, classes: PropTypes.object.isRequired } -const getUserOnMount = lifecycle({ - componentDidMount () { - getItem('user').then(user => { - this.setState({ user }) - }) // Set user to state - } -}) - -const mapStateToProps = withStateHandlers(() => ({ user: null }), { - user: ({ user }) => () => ({ user }) -}) - -const ManageFBListAuthId = compose( - mapStateToProps, - getUserOnMount -)(ManageFBList) - -export default withStyles(styles)(ManageFBListAuthId) +export default withStyles(styles)(ManageFBList) diff --git a/client/src/views/manage-teams/components/CreateTeamDialog.js b/client/src/views/manage-teams/components/CreateTeamDialog.js index 6da04291b..d6b987a64 100644 --- a/client/src/views/manage-teams/components/CreateTeamDialog.js +++ b/client/src/views/manage-teams/components/CreateTeamDialog.js @@ -66,13 +66,12 @@ export class CreateTeamDialog extends Component { } render () { - const { classes, authId } = this.props + const { classes } = this.props return ( {(createTeam, { loading, error, data }) => { @@ -255,8 +254,7 @@ export class CreateTeamDialog extends Component { } CreateTeamDialog.propTypes = { - classes: PropTypes.object.isRequired, - authId: PropTypes.string + classes: PropTypes.object.isRequired } export default withStyles(styles)(CreateTeamDialog) diff --git a/client/src/views/manage-teams/components/ManageTeamDelete.js b/client/src/views/manage-teams/components/ManageTeamDelete.js index c4cb26614..d81b36f3b 100644 --- a/client/src/views/manage-teams/components/ManageTeamDelete.js +++ b/client/src/views/manage-teams/components/ManageTeamDelete.js @@ -55,14 +55,13 @@ export class ManageTeamDelete extends Component { render () { console.log(this.props, this.props.slug) - const { classes, authId } = this.props + const { classes } = this.props return ( @@ -149,8 +148,7 @@ export class ManageTeamDelete extends Component { ManageTeamDelete.propTypes = { classes: PropTypes.object.isRequired, - slug: PropTypes.string.isRequired, - authId: PropTypes.string.isRequired + slug: PropTypes.string.isRequired } export default withStyles(styles)(ManageTeamDelete) diff --git a/client/src/views/manage-teams/components/ManageTeamEdit.js b/client/src/views/manage-teams/components/ManageTeamEdit.js index 46faafbd6..2d9f68616 100644 --- a/client/src/views/manage-teams/components/ManageTeamEdit.js +++ b/client/src/views/manage-teams/components/ManageTeamEdit.js @@ -47,7 +47,6 @@ export class ManageTeamEdit extends Component { const description = props.team.profile.description || '' const avatar = props.team.profile.avatar || null const banner = props.team.profile.banner || null - this.authId = props.authId this.state = { open: false, @@ -66,8 +65,7 @@ export class ManageTeamEdit extends Component { mutation={UPDATE_TEAM_PROFILE} refetchQueries={[ { - query: GET_TEAMS_BY_OWNER, - variables: { authId: this.authId } + query: GET_TEAMS_BY_OWNER } ]} > @@ -275,7 +273,6 @@ ManageTeamEdit.propTypes = { classes: PropTypes.object.isRequired, slug: PropTypes.string.isRequired, team: PropTypes.object, - authId: PropTypes.string.isRequired, match: PropTypes.object } diff --git a/client/src/views/manage-teams/components/ManageTeamMembersList.js b/client/src/views/manage-teams/components/ManageTeamMembersList.js index ab76199d8..2ff624f3a 100644 --- a/client/src/views/manage-teams/components/ManageTeamMembersList.js +++ b/client/src/views/manage-teams/components/ManageTeamMembersList.js @@ -67,7 +67,6 @@ export const ManageTeamMembersList = ({ classes, user = null }) => { return ( {({ loading, error, data }) => { diff --git a/client/src/views/manage-teams/components/ManageTeamsItem.js b/client/src/views/manage-teams/components/ManageTeamsItem.js index 396f80d19..9d83ff0f2 100644 --- a/client/src/views/manage-teams/components/ManageTeamsItem.js +++ b/client/src/views/manage-teams/components/ManageTeamsItem.js @@ -12,7 +12,7 @@ import ManageTeamDetails from './ManageTeamDetails' import ManageTeamDelete from './ManageTeamDelete' import ManageTeamEdit from './ManageTeamEdit' -export const ManageTeamsItem = ({ classes, team, authId, ...props }) => { +export const ManageTeamsItem = ({ classes, team, ...props }) => { console.log('ManageTeamsItem', team, team.profile, team.profile.avatar) let avatar if (team.profile.avatar !== undefined && team.profile.avatar !== 'a') { @@ -39,8 +39,8 @@ export const ManageTeamsItem = ({ classes, team, authId, ...props }) => { - - + + @@ -50,8 +50,7 @@ export const ManageTeamsItem = ({ classes, team, authId, ...props }) => { ManageTeamsItem.propTypes = { classes: PropTypes.object.isRequired, - team: PropTypes.object.isRequired, - authId: PropTypes.string.isRequired + team: PropTypes.object.isRequired } export default ManageTeamsItem diff --git a/client/src/views/manage-teams/components/ManageTeamsList.js b/client/src/views/manage-teams/components/ManageTeamsList.js index 0fdf78fae..85df118f7 100644 --- a/client/src/views/manage-teams/components/ManageTeamsList.js +++ b/client/src/views/manage-teams/components/ManageTeamsList.js @@ -1,15 +1,11 @@ import React from 'react' import PropTypes from 'prop-types' import { Query } from 'react-apollo' -import { withStateHandlers, lifecycle, compose } from 'recompose' import Grid from '@material-ui/core/Grid' import { MessageCard } from '@advancedalgos/web-components' import { withStyles } from '@material-ui/core/styles' -import { isDefined, isString } from '../../../utils/js-helpers' -import { getItem } from '../../../utils/local-storage' - import GET_TEAMS_BY_OWNER from '../../../graphql/teams/GetTeamsByOwnerQuery' import ManageTeamsItem from './ManageTeamsItem' @@ -47,105 +43,66 @@ const styles = theme => ({ } }) -export const ManageTeamsList = ({ classes, user = null, ...props }) => { - let owner - let authId = null - console.log('ManageTeamsList: ', user) - if (user !== null && isString(user)) { - owner = JSON.parse(user) - if (isDefined(owner.authId)) authId = owner.authId - } - console.log('ManageTeamsList 2: ', owner, authId) - if (authId === undefined || authId === null) { - return ( - - - - - - ) - } else { - return ( - - {({ loading, error, data }) => { - console.log('GET_TEAMS_BY_OWNER: ', loading, error, data) +export const ManageTeamsList = ({ classes, user = null, ...props }) => ( + + {({ loading, error, data }) => { + console.log('GET_TEAMS_BY_OWNER: ', loading, error, data) - let errors = null - if (error) { - errors = error.graphQLErrors.map(({ message }, i) => { - return - }) - } - if (!loading && !error) { - if (data.teams_TeamsByOwner.length > 0) { - return ( - - - {!loading && - data.teams_TeamsByOwner.map(team => ( - - ))} - {errors} - - - ) - } else { - return ( - - - - - - - - ) - } - } else { - return ( + let errors = null + if (error) { + errors = error.graphQLErrors.map(({ message }, i) => { + return + }) + } + if (!loading && !error) { + if (data.teams_TeamsByOwner.length > 0) { + return ( + - - - {errors !== null && } - + {!loading && + data.teams_TeamsByOwner.map(team => ( + + ))} + {errors} - ) - } - }} - - ) - } -} + + ) + } else { + return ( + + + + + + + + ) + } + } else { + return ( + + + + {errors !== null && } + + + ) + } + }} + +) ManageTeamsList.propTypes = { user: PropTypes.any, classes: PropTypes.object.isRequired } -const getUserOnMount = lifecycle({ - componentDidMount () { - getItem('user').then(user => { - this.setState({ user }) - }) // Set user to state - } -}) - -const mapStateToProps = withStateHandlers(() => ({ user: null }), { - user: ({ user }) => () => ({ user }) -}) - -const ManageTeamsListAuthId = compose( - mapStateToProps, - getUserOnMount -)(ManageTeamsList) - -export default withStyles(styles)(ManageTeamsListAuthId) +export default withStyles(styles)(ManageTeamsList)