-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #16 from andela/feat/166816205-password-reset-feature
166816205 Set up password reset feature
- Loading branch information
Showing
15 changed files
with
452 additions
and
145 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,5 +35,4 @@ node_modules | |
# Optional REPL history | ||
.node_repl_history | ||
|
||
# NYC output | ||
.nyc_output |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
module.exports = { | ||
up: (queryInterface, Sequelize) => queryInterface | ||
.addColumn('Users', 'passwordResetToken', { | ||
type: Sequelize.STRING, | ||
allowNull: true, | ||
}) | ||
.then(() => queryInterface.addColumn('Users', 'passwordResetExpire', { | ||
type: Sequelize.DATE, | ||
allowNull: true, | ||
})), | ||
down: queryInterface => queryInterface.removeColumn('Users', 'passwordResetToken').then(() => queryInterface.removeColumn('Users', 'passwordResetExpire')), | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,65 +1,66 @@ | ||
{ | ||
"name": "express-authorshaven", | ||
"version": "1.0.0", | ||
"description": "A Social platform for the creative at heart", | ||
"author": "Andela Simulations Programme", | ||
"license": "MIT", | ||
"entry": "server/index.js", | ||
"scripts": { | ||
"test": "NODE_ENV=test npm run migrate && nyc --reporter=html --reporter=text mocha \"tests/**/*.spec.js\" --require @babel/register --timeout 20000 --recursive --exit", | ||
"prettier": "prettier **/**/*.{js,json} --write", | ||
"dev": "NODE_ENV=development nodemon --exec babel-node server/index", | ||
"migrate": "node_modules/.bin/sequelize db:migrate", | ||
"seed": "node_modules/.bin/sequelize db:seed:all", | ||
"coverage": "nyc report --reporter=text-lcov | coveralls" | ||
}, | ||
"husky": { | ||
"hooks": { | ||
"pre-commit": "lint-staged" | ||
} | ||
}, | ||
"lint-staged": { | ||
"*.js": [ | ||
"eslint --ext .json --ext .js --fix", | ||
"git add" | ||
] | ||
}, | ||
"devDependencies": { | ||
"@babel/cli": "^7.4.4", | ||
"@babel/core": "^7.4.5", | ||
"@babel/node": "^7.4.5", | ||
"@babel/preset-env": "^7.4.5", | ||
"chai": "^4.2.0", | ||
"chai-http": "^4.3.0", | ||
"coveralls": "^3.0.4", | ||
"eslint": "^5.3.0", | ||
"eslint-config-airbnb-base": "^13.1.0", | ||
"eslint-config-prettier": "^6.0.0", | ||
"eslint-plugin-import": "^2.18.0", | ||
"eslint-plugin-prettier": "^3.1.0", | ||
"husky": "^2.5.0", | ||
"lint-staged": "^8.2.1", | ||
"mocha": "^6.1.4", | ||
"nodemon": "^1.19.1", | ||
"nyc": "^14.1.1", | ||
"prettier": "^1.18.2", | ||
"sequelize-cli": "^5.5.0" | ||
}, | ||
"dependencies": { | ||
"bcryptjs": "^2.4.3", | ||
"body-parser": "^1.19.0", | ||
"consola": "^2.9.0", | ||
"dotenv": "^8.0.0", | ||
"express": "^4.17.1", | ||
"indicative": "^5.0.8", | ||
"jsonwebtoken": "^8.5.1", | ||
"pg": "^7.11.0", | ||
"pg-hstore": "^2.3.3", | ||
"sequelize": "^5.8.12", | ||
"swagger-ui-express": "^4.0.6", | ||
"parse-database-url": "^0.3.0", | ||
"sinon": "^7.3.2", | ||
"sequelize-slugify": "^0.7.0", | ||
"yamljs": "^0.3.0" | ||
} | ||
} | ||
"name": "express-authorshaven", | ||
"version": "1.0.0", | ||
"description": "A Social platform for the creative at heart", | ||
"author": "Andela Simulations Programme", | ||
"license": "MIT", | ||
"entry": "server/index.js", | ||
"scripts": { | ||
"test": "NODE_ENV=test npm run migrate && nyc --reporter=html --reporter=text mocha \"tests/**/*.spec.js\" --require @babel/register --timeout 20000 --recursive --exit", | ||
"prettier": "prettier **/**/*.{js,json} --write", | ||
"dev": "nodemon --exec babel-node server/index", | ||
"migrate": "sequelize db:migrate", | ||
"seed": "sequelize db:seed:all", | ||
"coverage": "nyc report --reporter=text-lcov | coveralls" | ||
}, | ||
"husky": { | ||
"hooks": { | ||
"pre-commit": "lint-staged" | ||
} | ||
}, | ||
"lint-staged": { | ||
"*.js": [ | ||
"eslint --ext .json --ext .js --fix", | ||
"git add" | ||
] | ||
}, | ||
"devDependencies": { | ||
"@babel/cli": "^7.4.4", | ||
"@babel/core": "^7.4.5", | ||
"@babel/node": "^7.4.5", | ||
"@babel/preset-env": "^7.4.5", | ||
"chai": "^4.2.0", | ||
"chai-http": "^4.3.0", | ||
"coveralls": "^3.0.4", | ||
"eslint": "^5.3.0", | ||
"eslint-config-airbnb-base": "^13.1.0", | ||
"eslint-config-prettier": "^6.0.0", | ||
"eslint-plugin-import": "^2.18.0", | ||
"eslint-plugin-prettier": "^3.1.0", | ||
"husky": "^2.5.0", | ||
"lint-staged": "^8.2.1", | ||
"mocha": "^6.1.4", | ||
"nodemon": "^1.19.1", | ||
"nyc": "^14.1.1", | ||
"prettier": "^1.18.2", | ||
"sequelize-cli": "^5.5.0" | ||
}, | ||
"dependencies": { | ||
"bcryptjs": "^2.4.3", | ||
"body-parser": "^1.19.0", | ||
"consola": "^2.9.0", | ||
"dotenv": "^8.0.0", | ||
"express": "^4.17.1", | ||
"indicative": "^5.0.8", | ||
"jsonwebtoken": "^8.5.1", | ||
"nodemailer": "^6.2.1", | ||
"pg": "^7.11.0", | ||
"pg-hstore": "^2.3.3", | ||
"sequelize": "^5.8.12", | ||
"swagger-ui-express": "^4.0.6", | ||
"parse-database-url": "^0.3.0", | ||
"sinon": "^7.3.2", | ||
"sequelize-slugify": "^0.7.0", | ||
"yamljs": "^0.3.0" | ||
} | ||
} |
Oops, something went wrong.