-
Notifications
You must be signed in to change notification settings - Fork 8
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
ft(helpers): create reusable functions #28
Conversation
@@ -0,0 +1,55 @@ | |||
import jwt from 'jsonwebtoken'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Parsing error: 'import' and 'export' may appear only with 'sourceType: module'
Fix merge conflicts in this PR |
- install jwt and bcrypt - create reusable function for hashing and comparing passwords - create reusable function foir signing and verifying jwt
Fixed |
server/models/rating.js
Outdated
}); | ||
}; | ||
return Rating; | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file is already in develop why is this showing us a change in this PR? @vic3king
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file is already in develop why is this showing us a change in this PR? @vic3king
This is still from my rebase on branch develop. I've not had a reason to work with this file. I just pulled develop and rebased. Those changes are coming probably as a result of that rebase.
}); | ||
}, | ||
down: queryInterface => queryInterface.dropTable('Ratings'), | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same as 👇
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure why. I pulled branch develop, checked out my branch and rebased. I didn't have to touch any of these files. Those files are what @McHardex i worked on. I will have to rebase again since his branch has been merged.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rotimi-babalola I have resolved this.
01bfd3b
to
43e9bce
Compare
What does this PR do?
creates some reusable functions for signing tokens and hashing passwords
Description of Task to be completed?
How should this be manually tested?
NA
Any background context you want to provide?
NA
What are the relevant pivotal tracker stories?
NA
Screenshots
NA
Questions:
NA