Fix update password

cloudtrust · Oct 8, 2019 · 277569c · 277569c
1 parent 2c143b5
commit 277569c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/pkg/account/component.go b/pkg/account/component.go
@@ -75,6 +75,10 @@ func (c *component) UpdatePassword(ctx context.Context, currentPassword, newPass
 	}
 
 	_, err := c.keycloakAccountClient.UpdatePassword(accessToken, realm, currentPassword, newPassword, confirmPassword)
+	if err != nil {
+		c.logger.Warn("err", err.Error())
+		return err
+	}
 
 	//store the API call into the DB
 	errEvent := c.reportEvent(ctx, "PASSWORD_RESET", database.CtEventRealmName, realm, database.CtEventUserID, userID, database.CtEventUsername, username)
@@ -90,7 +94,7 @@ func (c *component) UpdatePassword(ctx context.Context, currentPassword, newPass
 
 	}
 
-	return err
+	return nil
 }
 
 func (c *component) GetAccount(ctx context.Context) (api.AccountRepresentation, error) {

diff --git a/pkg/account/component_test.go b/pkg/account/component_test.go
@@ -86,14 +86,14 @@ func TestUpdatePasswordWrongPwd(t *testing.T) {
 	ctx = context.WithValue(ctx, cs.CtContextUsername, username)
 
 	mockKeycloakAccountClient.EXPECT().UpdatePassword(accessToken, realm, oldPasswd, newPasswd, newPasswd).Return("", fmt.Errorf("invalidPasswordExistingMessage")).Times(1)
-	mockEventDBModule.EXPECT().ReportEvent(gomock.Any(), "PASSWORD_RESET", "self-service", gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Times(1)
+	mockLogger.EXPECT().Warn("err", "invalidPasswordExistingMessage")
 
 	err := component.UpdatePassword(ctx, oldPasswd, newPasswd, newPasswd)
 
 	assert.True(t, err != nil)
 
 	mockKeycloakAccountClient.EXPECT().UpdatePassword(accessToken, realm, oldPasswd, newPasswd, newPasswd).Return("", fmt.Errorf("invalid")).Times(1)
-	mockEventDBModule.EXPECT().ReportEvent(gomock.Any(), "PASSWORD_RESET", "self-service", gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Times(1)
+	mockLogger.EXPECT().Warn("err", "invalid")
 
 	err = component.UpdatePassword(ctx, oldPasswd, newPasswd, newPasswd)