From 0955fbdb533b5848f563bf232cec2cb76a85af71 Mon Sep 17 00:00:00 2001
From: akumar <arun.kumar@n-fuse.co>
Date: Tue, 24 Oct 2023 10:31:41 +0200
Subject: [PATCH] chore: Release v1.4.0 - See CHANGELOG

---
 CHANGELOG.md      | 4 ++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 src/service.ts    | 8 ++++----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aea3c4cb..f7626310 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.4.0 (October 22nd, 2023)
+
+- support request password change and request email change for both name and email as identifier
+
 ## 1.3.9 (October 22nd, 2023)
 
 - fix delete tokens from redis on user deletion
diff --git a/package-lock.json b/package-lock.json
index 2ebaa4c5..96321cdb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@restorecommerce/identity-srv",
-  "version": "1.3.9",
+  "version": "1.4.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@restorecommerce/identity-srv",
-      "version": "1.3.9",
+      "version": "1.4.0",
       "license": "MIT",
       "dependencies": {
         "@restorecommerce/acs-client": "^1.1.20",
diff --git a/package.json b/package.json
index d8bf2c6e..f0c1ab91 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@restorecommerce/identity-srv",
-  "version": "1.3.9",
+  "version": "1.4.0",
   "description": "Restorecommerce identity service",
   "main": "lib/start.js",
   "author": "n-fuse GmbH",
diff --git a/src/service.ts b/src/service.ts
index 2a02d0fd..604cdd7d 100644
--- a/src/service.ts
+++ b/src/service.ts
@@ -1451,8 +1451,8 @@ export class UserService extends ServiceBase<UserListResponse, UserList> impleme
   async requestPasswordChange(request: RequestPasswordChangeRequest, context): Promise<DeepPartial<OperationStatusObj>> {
     const logger = this.logger;
     const identifier = request.identifier;
-    // check for the identifier against name
-    const filters = getNameFilter(identifier);
+    // check for the identifier against name or email
+    const filters = getDefaultFilter(identifier);
     let user;
     const users = await super.read(ReadRequest.fromPartial({ filters }), context);
     if (users.total_count === 1) {
@@ -1562,8 +1562,8 @@ export class UserService extends ServiceBase<UserListResponse, UserList> impleme
     const new_email = request.new_email;
     const subject = request.subject;
     let acsResponse: DecisionResponse;
-    // check for the identifier against name
-    const filters = getNameFilter(identifier);
+    // check for the identifier against name or email
+    const filters = getDefaultFilter(identifier);
     const users = await super.read(ReadRequest.fromPartial({ filters }), context);
     if (!users || users.total_count === 0) {
       logger.debug('user does not exist', { identifier });