Rename Credential.Reset*() methods to Credential.ChangePassword*() to reflect the actual functionality

Addresses part 2 of #7

Author: dhui

credential.go

@@ -97,23 +97,23 @@ func (c *Credential) MatchesPasswordWithConfigAndIP(config Config, password stri
 	return
 }
 
-// Reset resets the password for the given Credential and updates the Credential to use the recommended safe key derivation function and parameters
-func (c *Credential) Reset(oldPassword, newPassword string) error {
-	return c.ResetWithConfig(DefaultConfig, oldPassword, newPassword)
+// ChangePassword changes the password for the given Credential and updates the Credential to use the recommended safe key derivation function and parameters
+func (c *Credential) ChangePassword(oldPassword, newPassword string) error {
+	return c.ChangePasswordWithConfig(DefaultConfig, oldPassword, newPassword)
 }
 
-// ResetWithIP resets the password for the given Credential and updates the Credential to use the recommended safe key derivation function and parameters
-func (c *Credential) ResetWithIP(oldPassword, newPassword string, ip net.IP) error {
-	return c.ResetWithConfigAndIP(DefaultConfig, oldPassword, newPassword, ip)
+// ChangePasswordWithIP changes the password for the given Credential and updates the Credential to use the recommended safe key derivation function and parameters
+func (c *Credential) ChangePasswordWithIP(oldPassword, newPassword string, ip net.IP) error {
+	return c.ChangePasswordWithConfigAndIP(DefaultConfig, oldPassword, newPassword, ip)
 }
 
-// ResetWithConfig resets the password for the given Credential and updates the Credential to meet the Config parameters if necessary
-func (c *Credential) ResetWithConfig(config Config, oldPassword, newPassword string) error {
-	return c.ResetWithConfigAndIP(config, oldPassword, newPassword, emptyIP)
+// ChangePasswordWithConfig changes the password for the given Credential and updates the Credential to meet the Config parameters if necessary
+func (c *Credential) ChangePasswordWithConfig(config Config, oldPassword, newPassword string) error {
+	return c.ChangePasswordWithConfigAndIP(config, oldPassword, newPassword, emptyIP)
 }
 
-// ResetWithConfigAndIP resets the password for the given Credential and updates the Credential to meet the Config parameters if necessary
-func (c *Credential) ResetWithConfigAndIP(config Config, oldPassword, newPassword string, ip net.IP) error {
+// ChangePasswordWithConfigAndIP changes the password for the given Credential and updates the Credential to meet the Config parameters if necessary
+func (c *Credential) ChangePasswordWithConfigAndIP(config Config, oldPassword, newPassword string, ip net.IP) error {
 	if !c.matchPassword(oldPassword, config.AuditLogger, ip) {
 		return fmt.Errorf("Old password does not match existing password")
 	}

credential_test.go

@@ -311,74 +311,74 @@ func TestMatchesPasswordUpdateWorkFactor(t *testing.T) {
 	}
 }
 
-func TestReset(t *testing.T) {
+func TestChangePassword(t *testing.T) {
 	userID := UserID(0)
 	password := "insecurepassword"
 	credential, err := NewCredential(userID, password)
 	if err != nil {
 		t.Error("Unable to create new Credential")
 	}
-	if err := credential.Reset(password, "newInsecurePassword"); err != nil {
+	if err := credential.ChangePassword(password, "newInsecurePassword"); err != nil {
 		t.Error("Got error resetting password.", err)
 	}
 }
 
-func TestResetNewPasswordDoesNotMeetPasswordPolicy(t *testing.T) {
+func TestChangePasswordNewPasswordDoesNotMeetPasswordPolicy(t *testing.T) {
 	userID := UserID(0)
 	password := "insecurepassword"
 	credential, err := NewCredential(userID, password)
 	if err != nil {
 		t.Error("Unable to create new Credential")
 	}
-	if err := credential.Reset(password, "tooshort"); err == nil {
+	if err := credential.ChangePassword(password, "tooshort"); err == nil {
 		t.Error("Should have gotten error resetting password")
 	}
 }
 
-func TestResetIncorrectOldPassword(t *testing.T) {
+func TestChangePasswordIncorrectOldPassword(t *testing.T) {
 	userID := UserID(0)
 	password := "insecurepassword"
 	credential, err := NewCredential(userID, password)
 	if err != nil {
 		t.Error("Unable to create new Credential")
 	}
-	if err := credential.Reset("wrongPassword", "newInsecurePassword"); err == nil {
+	if err := credential.ChangePassword("wrongPassword", "newInsecurePassword"); err == nil {
 		t.Error("Should have gotten error resetting password")
 	}
 }
 
-func TestResetWithIP(t *testing.T) {
+func TestChangePasswordWithIP(t *testing.T) {
 	userID := UserID(0)
 	password := "insecurepassword"
 	credential, err := NewCredential(userID, password)
 	if err != nil {
 		t.Error("Unable to create new Credential")
 	}
-	if err := credential.ResetWithIP(password, "newInsecurePassword", emptyIP); err != nil {
+	if err := credential.ChangePasswordWithIP(password, "newInsecurePassword", emptyIP); err != nil {
 		t.Error("Got error resetting password.", err)
 	}
 }
 
-func TestResetWithIPNewPasswordDoesNotMeetPasswordPolicy(t *testing.T) {
+func TestChangePasswordWithIPNewPasswordDoesNotMeetPasswordPolicy(t *testing.T) {
 	userID := UserID(0)
 	password := "insecurepassword"
 	credential, err := NewCredential(userID, password)
 	if err != nil {
 		t.Error("Unable to create new Credential")
 	}
-	if err := credential.ResetWithIP(password, "tooshort", emptyIP); err == nil {
+	if err := credential.ChangePasswordWithIP(password, "tooshort", emptyIP); err == nil {
 		t.Error("Should have gotten error resetting password")
 	}
 }
 
-func TestResetWithIPIncorrectOldPassword(t *testing.T) {
+func TestChangePasswordWithIPIncorrectOldPassword(t *testing.T) {
 	userID := UserID(0)
 	password := "insecurepassword"
 	credential, err := NewCredential(userID, password)
 	if err != nil {
 		t.Error("Unable to create new Credential")
 	}
-	if err := credential.ResetWithIP("wrongPassword", "newInsecurePassword", emptyIP); err == nil {
+	if err := credential.ChangePasswordWithIP("wrongPassword", "newInsecurePassword", emptyIP); err == nil {
 		t.Error("Should have gotten error resetting password")
 	}
 }

passhash_test.go

@@ -101,7 +101,7 @@ func Example() {
 		// store.Marshal(credential)
 	}
 	newPassword := "newinsecurepassword"
-	if err = credential.Reset(password, newPassword); err != nil {
+	if err = credential.ChangePassword(password, newPassword); err != nil {
 		// Handle PasswordPoliciesNotMet error
 	}
 }