Skip to content

corrected change password bug #9

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

corrected change password bug #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c3623b
corrected change password bug
shantanuo Mar 5, 2017
ca47312
removed references to cognito
shantanuo Mar 8, 2017
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
179 changes: 86 additions & 93 deletions Chapter09/SampleAuth/fn/sampleAuthChangePassword/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,103 +9,96 @@ var config = require('./config');
var dynamodb = new AWS.DynamoDB();

function getUser(email, fn) {
dynamodb.getItem({
TableName: config.DDB_TABLE,
Key: {
email: {
S: email
}
}
}, function(err, data) {
if (err) return fn(err);
else {
if ('Item' in data) {
var hash = data.Item.passwordHash.S;
var salt = data.Item.passwordSalt.S;
fn(null, hash, salt);
} else {
fn(null, null); // User not found
}
}
});
dynamodb.getItem({
TableName: config.DDB_TABLE,
Key: {
email: {
S: email
}
}
}, function(err, data) {
if (err) return fn(err);
else {
if ('Item' in data) {
var hash = data.Item.passwordHash.S;
var salt = data.Item.passwordSalt.S;
fn(null, hash, salt);
} else {
fn(null, null); // User not found
}
}
});
}

function updateUser(email, password, salt, fn) {
dynamodb.updateItem({
TableName: config.DDB_TABLE,
Key: {
email: {
S: email
}
},
AttributeUpdates: {
passwordHash: {
Action: 'PUT',
Value: {
S: password
}
},
passwordSalt: {
Action: 'PUT',
Value: {
S: salt
}
}
}
},
fn);
dynamodb.updateItem({
TableName: config.DDB_TABLE,
Key: {
email: {
S: email
}
},
AttributeUpdates: {
passwordHash: {
Action: 'PUT',
Value: {
S: password
}
},
passwordSalt: {
Action: 'PUT',
Value: {
S: salt
}
}
}
},
fn);
}

exports.handler = function(event, context) {
exports.handler = (event, context, callback) => {
var email = event.email;
var oldPassword = event.oldPassword;
var newPassword = event.newPassword;

var email = event.email;
var oldPassword = event.oldPassword;
var newPassword = event.newPassword;

getUser(email, function(err, correctHash, salt) {
if (err) {
context.fail('Error in getUser: ' + err);
} else {
if (correctHash == null) {
// User not found
console.log('User not found: ' + email);
context.succeed({
changed: false
});
} else {
computeHash(oldPassword, salt, function(err, salt, hash) {
if (err) {
context.fail('Error in hash: ' + err);
} else {
if (hash == correctHash) {
// Login ok
console.log('User logged in: ' + email);
computeHash(newPassword, function(err, newSalt, newHash) {
if (err) {
context.fail('Error in computeHash: ' + err);
} else {
updateUser(email, newHash, newSalt, function(err, data) {
if (err) {
context.fail('Error in updateUser: ' + err);
} else {
console.log('User password changed: ' + email);
context.succeed({
changed: true
});
}
});
}
});
} else {
// Login failed
console.log('User login failed: ' + email);
context.succeed({
changed: false
});
}
}
});
}
}
});
getUser(email, function(err, correctHash, salt) {
if (err) {
callback('Error in getUser: ' + err);
} else {
if (correctHash == null) {
// User not found
console.log('User not found: ' + email);
callback(null, { changed: false });
} else {
cryptoUtils.computeHash(oldPassword, salt, function(err, salt, hash) {
if (err) {
callback('Error in hash: ' + err);
} else {
if (hash == correctHash) {
// Login ok
console.log('User logged in: ' + email);
cryptoUtils.computeHash(newPassword, function(err, newSalt, newHash) {
if (err) {
callback('Error in cryptoUtils.computeHash: ' + err);
} else {
updateUser(email, newHash, newSalt, function(err, data) {
if (err) {
callback('Error in updateUser: ' + err);
} else {
console.log('User password changed: ' + email);
callback(null, { changed: true });
}
});
}
});
} else {
// Login failed
console.log('User login failed: ' + email);
callback(null, { changed: false });
}
}
});
}
}
});
}
81 changes: 26 additions & 55 deletions Chapter09/SampleAuth/www/js/changePassword.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
AWS.config.region = '<REGION>';
// Initialize the Amazon Cognito credentials provider
AWS.config.region = 'us-east-1'; // Region
AWS.config.credentials = new AWS.CognitoIdentityCredentials({
IdentityPoolId: '<IDENTITY_POOL_ID>'
IdentityPoolId: 'us-east-1:51d8f08c-a0d8-4607-9895-f2849ecec37a',
});

var lambda = new AWS.Lambda();

function changePassword() {
Expand All @@ -23,60 +23,31 @@ function changePassword() {
result.innerHTML = 'Please specify a new password.';
} else if (newPassword.value != verifyNewPassword.value) {
result.innerHTML = 'The new passwords are <b>different</b>, please check.';
} else {

var input = {
email: email.value,
password: oldPassword.value
};

lambda.invoke({
FunctionName: 'sampleAuthLogin',
Payload: JSON.stringify(input)
}, function(err, data) {
if (err) console.log(err, err.stack);
else {
var output = JSON.parse(data.Payload);
console.log('identityId: ' + output.identityId);
console.log('token: ' + output.token);
if (!output.login) {
result.innerHTML = '<b>Not</b> logged in';
} else {
result.innerHTML = 'Logged in with identityId: ' + output.identityId + '<br>';

var creds = AWS.config.credentials;
creds.params.IdentityId = output.identityId;
creds.params.Logins = {
'cognito-identity.amazonaws.com': output.token
};
creds.expired = true;

var input = {
email: email.value,
oldPassword: oldPassword.value,
newPassword: newPassword.value
};

lambda.invoke({
FunctionName: 'sampleAuthChangePassword',
Payload: JSON.stringify(input)
}, function(err, data) {
if (err) console.log(err, err.stack);
else {
var output = JSON.parse(data.Payload);
if (!output.changed) {
result.innerHTML = 'Password <b>not</b> changed.';
} else {
result.innerHTML = 'Password changed.';
}
}
});
} else

var input = {
email: email.value,
oldPassword: oldPassword.value,
newPassword: newPassword.value
};


lambda.invoke({
FunctionName: 'sampleAuthChangePassword',
Payload: JSON.stringify(input)
}, function(err, data) {
if (err) console.log(err, err.stack);
else {
var output = JSON.parse(data.Payload);
if (!output.changed) {
result.innerHTML = 'Password <b>not</b> changed.';
} else {
result.innerHTML = 'Password changed.';
}
}
});

}
}
});

}
}

var form = document.getElementById('change-password-form');
Expand Down