add test for receive code meassage

webresto · Nov 10, 2023 · 688adba · 688adba
1 parent 7558adf
commit 688adba
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 24 deletions.
diff --git a/adapters/index.d.ts b/adapters/index.d.ts
@@ -17,6 +17,10 @@ export declare class Captcha {
  * retruns OTP-adapter
  */
 export declare class OTP {
+    /**
+     * @deprecated use Adapter.getOTPAdapter instead
+     * @param adapterName
+     */
     static getAdapter(adapterName?: string): Promise<OTPAdapter>;
 }
 /** TODO: move other Adapters to one class adapter */
@@ -26,6 +30,7 @@ export declare class Adapter {
     private static instanceDeliveryAdapter;
     private static instanceMF;
     static WEBRESTO_MODULES_PATH: string;
+    static getOTPAdapter(adapterName?: string): Promise<OTPAdapter>;
     static getPromotionAdapter(adapter?: string | PromotionAdapter, initParams?: {
         [key: string]: string | number | boolean;
     }): PromotionAdapter;

diff --git a/adapters/index.js b/adapters/index.js
@@ -68,7 +68,18 @@ exports.Captcha = Captcha;
  * retruns OTP-adapter
  */
 class OTP {
+    /**
+     * @deprecated use Adapter.getOTPAdapter instead
+     * @param adapterName
+     */
     static async getAdapter(adapterName) {
+        return Adapter.getOTPAdapter(adapterName);
+    }
+}
+exports.OTP = OTP;
+/** TODO: move other Adapters to one class adapter */
+class Adapter {
+    static async getOTPAdapter(adapterName) {
         if (!adapterName) {
             adapterName = (await Settings.get("DEFAULT_OTP_ADAPTER"));
         }
@@ -87,10 +98,6 @@ class OTP {
             throw new Error("Module " + adapterLocation + " not found");
         }
     }
-}
-exports.OTP = OTP;
-/** TODO: move other Adapters to one class adapter */
-class Adapter {
     static getPromotionAdapter(adapter, initParams) {
         let adapterName;
         if (adapter) {

diff --git a/adapters/index.ts b/adapters/index.ts
@@ -49,7 +49,26 @@ export class Captcha {
  * retruns OTP-adapter
  */
 export class OTP {
+  /**
+   * @deprecated use Adapter.getOTPAdapter instead
+   * @param adapterName 
+   */
   public static async getAdapter(adapterName?: string): Promise<OTPAdapter> {
+    return Adapter.getOTPAdapter(adapterName);
+  }
+}
+
+/** TODO: move other Adapters to one class adapter */
+export class Adapter {
+  // Singletons
+  private static instanceRMS: RMSAdapter;
+  private static instancePromotionAdapter: PromotionAdapter;
+  private static instanceDeliveryAdapter: DeliveryAdapter;
+  private static instanceMF: MediaFileAdapter;
+
+  public static WEBRESTO_MODULES_PATH = process.env.WEBRESTO_MODULES_PATH === undefined ? "@webresto" : process.env.WEBRESTO_MODULES_PATH;
+
+  public static async getOTPAdapter(adapterName?: string): Promise<OTPAdapter> {
     if (!adapterName) {
       adapterName = (await Settings.get("DEFAULT_OTP_ADAPTER")) as string;
     }
@@ -70,17 +89,7 @@ export class OTP {
       throw new Error("Module " + adapterLocation + " not found");
     }
   }
-}
-
-/** TODO: move other Adapters to one class adapter */
-export class Adapter {
-  // Singletons
-  private static instanceRMS: RMSAdapter;
-  private static instancePromotionAdapter: PromotionAdapter;
-  private static instanceDeliveryAdapter: DeliveryAdapter;
-  private static instanceMF: MediaFileAdapter;
-
-  public static WEBRESTO_MODULES_PATH = process.env.WEBRESTO_MODULES_PATH === undefined ? "@webresto" : process.env.WEBRESTO_MODULES_PATH;
+
   public static getPromotionAdapter(adapter?: string | PromotionAdapter, initParams?: {[key: string]:string | number | boolean}): PromotionAdapter {
 
     let adapterName: string;

diff --git a/libs/NotificationManager.js b/libs/NotificationManager.js
@@ -37,14 +37,17 @@ class NotificationManager {
     static async sendMessageToUser(badge, text, user, type, subject, data) {
         let populatedUser;
         if (typeof user === "string") {
-            populatedUser = await User.find({ where: { or: [{ id: user }, { login: user }] } }).populate('devices');
+            const populatedUsers = await User.find({ where: { or: [{ id: user }, { login: user }] } }).populate('devices');
+            if (populatedUsers.length === 1) {
+                populatedUser = populatedUsers[0];
+            }
+            else {
+                throw new Error(`User not found`);
+            }
         }
         else {
             populatedUser = user;
         }
-        if (populatedUser.length !== 1) {
-            throw new Error(`User not found`);
-        }
         await NotificationManager.send(badge, "user", text, populatedUser, type, subject, data);
     }
 }

diff --git a/libs/NotificationManager.ts b/libs/NotificationManager.ts
@@ -78,14 +78,15 @@ export class NotificationManager {
     let populatedUser;
 
     if(typeof user === "string") {
-      populatedUser = await User.find({ where: { or: [{ id: user }, { login: user }] }}).populate('devices');
+      const populatedUsers = await User.find({ where: { or: [{ id: user }, { login: user }] }}).populate('devices');
+      if (populatedUsers.length === 1) {
+        populatedUser = populatedUsers[0];  
+      } else {
+        throw new Error(`User not found`);
+      }
     } else {
       populatedUser = user;
     }
-
-    if (populatedUser.length !== 1) {
-      throw new Error(`User not found`);
-    }
 
     await NotificationManager.send(badge, "user", text, populatedUser, type, subject, data);
   }

diff --git a/test/integration/notification_manager.test.js b/test/integration/notification_manager.test.js
@@ -31,4 +31,11 @@ describe("NotificationManager", function () {
         if (!result)
             throw `Not exist??`;
     });
+    it("OTP recive to user", async () => {
+        const otpAdapter = await Adapter.getOTPAdapter();
+        await otpAdapter.get("1123");
+        var match = testChannel.lastMessage.match(/Your code is (\d+)/);
+        if (!match)
+            throw `Not match with "Your code is ..."`;
+    });
 });
diff --git a/test/integration/notification_manager.test.ts b/test/integration/notification_manager.test.ts
@@ -30,4 +30,11 @@ describe("NotificationManager", function () {
     let result = NotificationManager.isChannelExist('sms');
     if(!result) throw `Not exist??`
   });
+
+  it("OTP recive to user", async () => {
+    const otpAdapter = await Adapter.getOTPAdapter();
+    await otpAdapter.get("1123");
+    var match = testChannel.lastMessage.match(/Your code is (\d+)/);
+    if(!match) throw `Not match with "Your code is ..."`
+  });
 });