Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix persist #81

Merged
merged 28 commits into from
Jun 29, 2016
Merged

Fix persist #81

merged 28 commits into from
Jun 29, 2016

Conversation

mattkrick
Copy link
Member

fixes #80, and gets us awfully close to #77.

mattkrick added 23 commits June 16, 2016 11:36
removed piping (kept throwing address in use errors)
added getAuth cashay helper
added loginWithToken
added requireAuth
made welcome async
added teamMembers to schema
refactor email factory
upgrade to latest cashay
add invitation table
add auth to graphql queries
add auth
upgrade packages
ready for merging!
# Conflicts:
#	package.json
#	src/client/client.js
#	src/server/utils/getCashaySchema.js
# Conflicts:
#	package.json
#	src/client/client.js
#	src/server/graphql/models/CachedUser/cachedUserSchema.js
#	src/universal/modules/landing/containers/Landing/LandingContainer.js
#	webpack/webpack.config.prod.js
# Conflicts:
#	package.json
#	src/client/client.js
#	src/universal/decorators/requireAuth/requireAuth.js
@@ -17,7 +17,7 @@
"start": "NODE_ENV=production node ./src/server/server.babel.js",
"dev": "NODE_ENV=development node ./src/server/server.babel.js",
"build": "rimraf build && concurrently \"npm run build:client\" \"npm run build:server\"",
"bs": "rimraf build && concurrently \"npm run build:client\" \"npm run build:server\" \"npm run start\"",
"bs": "npm run build && npm start",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't want a race condition between creating prerender.js and requiring it.

@jordanh
Copy link
Contributor

jordanh commented Jun 29, 2016

Address at least adding that silly comment and I'll merge this post-haste.

After it's merged, I'll pull it into the branch I'm working on.

# Conflicts:
#	package.json
#	src/client/client.js
#	src/universal/decorators/requireAuth/requireAuth.js
@mattkrick
Copy link
Member Author

Oh man, my last push never made it into this yesterday. Give the HOCs, a once over, now @requireAuth needs to come after a @connect so it can grab the authToken.

To test, clear your authToken & head to /welcome. See the notification + redirect. Then head to /graphql and see a different message. I think authentication vs authorization is a good line to draw early since if they're not authorized we can be rude (and put troublemakers into server logs, etc).

@jordanh
Copy link
Contributor

jordanh commented Jun 29, 2016

Ok. I'll pull it down.

@jordanh
Copy link
Contributor

jordanh commented Jun 29, 2016

Found a couple of small things, sending you a PR 😉

@jordanh
Copy link
Contributor

jordanh commented Jun 29, 2016

👍

@jordanh jordanh merged commit 29b10c4 into ParabolInc:master Jun 29, 2016
@jordanh jordanh removed the pr review label Jun 29, 2016
@mattkrick
Copy link
Member Author

nice! will PR the other PR in a min or 2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

persist + devtool = broken
2 participants