Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
da158c6
Code done
siddharth-lakhara Feb 9, 2018
5461add
fix conflict
siddharth-lakhara Feb 9, 2018
f92d737
seeds not working
siddharth-lakhara Feb 9, 2018
c2e8e16
OTP generation done, OTP not able to add to DB
siddharth-lakhara Feb 9, 2018
24be4fe
Bug with sequelize
siddharth-lakhara Feb 9, 2018
3d56fb1
OTP sent to user
siddharth-lakhara Feb 10, 2018
20ad17c
Bug with update: Always returns request timed out even when password …
siddharth-lakhara Feb 11, 2018
6eeec0d
Bug fixed
siddharth-lakhara Feb 11, 2018
bba0ff3
problem with tests, rest all done
siddharth-lakhara Feb 11, 2018
c345e1d
Forgot password implemented
siddharth-lakhara Feb 12, 2018
148a059
Final commit
siddharth-lakhara Feb 12, 2018
3b4b027
modified server.js for jwt and swagger
siddharth-lakhara Feb 23, 2018
7735daf
merging with userauthentications
siddharth-lakhara Feb 23, 2018
7e1317b
merging with users authentication
siddharth-lakhara Feb 23, 2018
a93f9d5
swagger specs written
siddharth-lakhara Feb 23, 2018
751e569
updated package json
siddharth-lakhara Feb 23, 2018
8b7d08d
swagger specs and tests verified
siddharth-lakhara Feb 23, 2018
c253c4b
joi validation
siddharth-lakhara Feb 23, 2018
3d18abc
user gives new password with OTP
siddharth-lakhara Feb 25, 2018
9db8966
modified tests
siddharth-lakhara Feb 26, 2018
af4c4e4
resolved conflicts with master
siddharth-lakhara Feb 26, 2018
60eea83
resolved conflicts with master
siddharth-lakhara Feb 26, 2018
30b3e5c
resolved conflicts with master
siddharth-lakhara Feb 26, 2018
70c7d20
Merge branch 'ForgetPassword' of https://github.com/TechUniv2018/Wall…
siddharth-lakhara Feb 26, 2018
8cbfe30
minor refactoring
siddharth-lakhara Mar 18, 2018
9dff265
minor refactoring
siddharth-lakhara Mar 18, 2018
0a50787
Merge branch 'ForgetPassword' of https://github.com/TechUniv2018/Wall…
siddharth-lakhara Mar 18, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"env": {
"jest": true
}
}
}
27 changes: 27 additions & 0 deletions migrations/20180209081342-create-auth.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
'use strict';
module.exports = {
up: (queryInterface, Sequelize) => {
return queryInterface.createTable('auths', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER
},
token: {
type: Sequelize.STRING
},
createdAt: {
allowNull: false,
type: Sequelize.DATE
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE
}
});
},
down: (queryInterface, Sequelize) => {
return queryInterface.dropTable('auths');
}
};
29 changes: 29 additions & 0 deletions migrations/20180209140509-create-forgotpassword.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

module.exports = {
up: (queryInterface, Sequelize) => queryInterface.createTable('forgotpasswords', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER,
},
userId: {
type: Sequelize.INTEGER,
},
otp: {
type: Sequelize.INTEGER,
},
timestamp: {
type: Sequelize.STRING,
},
createdAt: {
allowNull: false,
type: Sequelize.DATE,
},
updatedAt: {
allowNull: false,
type: Sequelize.DATE,
},
}),
down: (queryInterface, Sequelize) => queryInterface.dropTable('forgotpasswords'),
};
14 changes: 14 additions & 0 deletions models/auths.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@


module.exports = (sequelize, DataTypes) => {
const auths = sequelize.define('auths', {
token: DataTypes.STRING,
}, {
classMethods: {
associate(models) {
// associations can be defined here
},
},
});
return auths;
};
15 changes: 15 additions & 0 deletions models/forgotpasswords.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@

module.exports = (sequelize, DataTypes) => {
const forgotpasswords = sequelize.define('forgotpasswords', {
userId: DataTypes.INTEGER,
otp: DataTypes.INTEGER,
timestamp: DataTypes.STRING,
}, {
classMethods: {
associate(models) {
// associations can be defined here
},
},
});
return forgotpasswords;
};
Loading