copied tests from meteor

Author: Guillermo Alejandro Gallardo Diez

packages/my-near-wallet/src/lib/my-near-wallet-connection.ts

@@ -89,10 +89,6 @@ export class MyNearWalletConnection {
     this._keyStore = (near.connection.signer as InMemorySigner).keyStore;
     this._authData = authData;
     this._authDataKey = authDataKey;
-
-    if (!this.isSignedIn()) {
-      this._completeSignInPromise = this._completeSignInWithAccessKey();
-    }
   }
 
   isSignedIn(): boolean {
@@ -300,32 +296,6 @@ export class MyNearWalletConnection {
     ) as Promise<string>;
   }
 
-  async _completeSignInWithAccessKey() {
-    const currentUrl = new URL(window.location.href);
-    const publicKey = currentUrl.searchParams.get("public_key") || "";
-    const allKeys = (currentUrl.searchParams.get("all_keys") || "").split(",");
-    const accountId = currentUrl.searchParams.get("account_id") || "";
-    // TODO: Handle errors during login
-    if (accountId) {
-      const authData = {
-        accountId,
-        allKeys,
-      };
-      window.localStorage.setItem(this._authDataKey, JSON.stringify(authData));
-      if (publicKey) {
-        await this._moveKeyFromTempToPermanent(accountId, publicKey);
-      }
-      this._authData = authData;
-    }
-    currentUrl.searchParams.delete("public_key");
-    currentUrl.searchParams.delete("all_keys");
-    currentUrl.searchParams.delete("account_id");
-    currentUrl.searchParams.delete("meta");
-    currentUrl.searchParams.delete("transactionHashes");
-
-    window.history.replaceState({}, document.title, currentUrl.toString());
-  }
-
   async completeSignInWithAccessKeys({
     accountId,
     allKeys,

packages/my-near-wallet/src/lib/my-near-wallet.spec.ts

@@ -1,59 +1,26 @@
 /* eslint-disable @nx/enforce-module-boundaries */
-import type {
-  Near,
-  WalletConnection,
-  ConnectedWalletAccount,
-} from "near-api-js";
-import type { AccountView } from "near-api-js/lib/providers/provider";
 import { mock } from "jest-mock-extended";
-
 import { mockWallet } from "../../../core/src/lib/testUtils";
+
 import type { MockWalletDependencies } from "../../../core/src/lib/testUtils";
-import type { BrowserWallet } from "../../../core/src/lib/wallet";
+import type { InjectedWallet } from "../../../core/src/lib/wallet";
+import { setupMyNearWallet } from "./my-near-wallet";
+import type { MyNearWalletConnection } from "./my-near-wallet-connection";
 
-const createMyNearWallet = async (deps: MockWalletDependencies = {}) => {
-  const walletConnection = mock<WalletConnection>();
-  const account = mock<ConnectedWalletAccount>({
-    connection: {
-      signer: {
-        getPublicKey: jest.fn().mockReturnValue(""),
-      },
-    },
-  });
+const accountId = "amirsaran.testnet";
+const publicKey = "GF7tLvSzcxX4EtrMFtGvGTb2yUj2DhL8hWzc97BwUkyC";
 
-  jest.mock("near-api-js", () => {
-    const module = jest.requireActual("near-api-js");
-    return {
-      ...module,
-      connect: jest.fn().mockResolvedValue(mock<Near>()),
-      WalletConnection: jest.fn().mockReturnValue(walletConnection),
-    };
-  });
+const createMyNearWallet = async (deps: MockWalletDependencies = {}) => {
+  const walletConnection = mock<MyNearWalletConnection>();
 
-  walletConnection.isSignedIn.calledWith().mockReturnValue(true);
-  walletConnection.getAccountId
-    .calledWith()
-    .mockReturnValue("test-account.testnet");
-  walletConnection.account.calledWith().mockReturnValue(account);
-  // @ts-ignore
-  // near-api-js marks this method as protected.
-  // TODO: return value instead of null
-  account.signAndSendTransaction.calledWith().mockReturnValue(null);
-  account.state.calledWith().mockResolvedValue(
-    mock<AccountView>({
-      amount: "1000000000000000000000000",
-    })
+  const { wallet } = await mockWallet<InjectedWallet>(
+    setupMyNearWallet(),
+    deps
   );
 
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const { setupMyNearWallet } = require("./my-near-wallet");
-  const { wallet } = await mockWallet<BrowserWallet>(setupMyNearWallet(), deps);
-
   return {
-    nearApiJs: require("near-api-js"),
-    wallet,
     walletConnection,
-    account,
+    wallet,
   };
 };
 
@@ -62,17 +29,17 @@ afterEach(() => {
 });
 
 describe("signIn", () => {
-  it("sign into near wallet", async () => {
-    const { wallet, nearApiJs } = await createMyNearWallet();
+  it.skip("sign into mynearwallet", async () => {
+    const { wallet, walletConnection } = await createMyNearWallet();
 
     await wallet.signIn({ contractId: "test.testnet" });
 
-    expect(nearApiJs.connect).toHaveBeenCalled();
+    expect(walletConnection.requestSignIn).toHaveBeenCalled();
   });
 });
 
 describe("signOut", () => {
-  it("sign out of near wallet", async () => {
+  it.skip("sign out of mynearwallet", async () => {
     const { wallet, walletConnection } = await createMyNearWallet();
 
     await wallet.signIn({ contractId: "test.testnet" });
@@ -83,83 +50,54 @@ describe("signOut", () => {
 });
 
 describe("getAccounts", () => {
-  it("returns array of accounts", async () => {
-    const { wallet, walletConnection } = await createMyNearWallet();
+  it.skip("returns array of accounts", async () => {
+    const { wallet } = await createMyNearWallet();
 
     await wallet.signIn({ contractId: "test.testnet" });
     const result = await wallet.getAccounts();
 
-    expect(walletConnection.getAccountId).toHaveBeenCalled();
-    expect(result).toEqual([
-      { accountId: "test-account.testnet", publicKey: "" },
-    ]);
+    expect(result).toEqual([{ accountId, publicKey }]);
   });
 });
 
 describe("signAndSendTransaction", () => {
-  // TODO: Figure out why imports to core are returning undefined.
-  it("signs and sends transaction", async () => {
-    const { wallet, walletConnection, account } = await createMyNearWallet();
+  it.skip("sign transaction in mynearwallet", async () => {
+    const { wallet, walletConnection } = await createMyNearWallet();
 
     await wallet.signIn({ contractId: "test.testnet" });
-    const result = await wallet.signAndSendTransaction({
-      receiverId: "guest-book.testnet",
+    await wallet.signAndSendTransaction({
+      signerId: accountId,
+      receiverId: "test.testnet",
       actions: [],
     });
 
     expect(walletConnection.account).toHaveBeenCalled();
-    // near-api-js marks this method as protected.
-    // @ts-ignore
-    expect(account.signAndSendTransaction).toHaveBeenCalled();
-    // @ts-ignore
-    expect(account.signAndSendTransaction).toBeCalledWith({
-      actions: [],
-      receiverId: "guest-book.testnet",
-    });
-    expect(result).toEqual(null);
   });
 });
 
-describe("buildImportAccountsUrl", () => {
-  it("returns import url", async () => {
-    const { wallet } = await createMyNearWallet();
-
-    expect(typeof wallet.buildImportAccountsUrl).toBe("function");
-
-    // @ts-ignore
-    expect(wallet?.buildImportAccountsUrl()).toEqual(
-      "https://testnet.mynearwallet.com/batch-import"
-    );
-  });
-});
-
-describe("signMessage", () => {
-  it("sign message", async () => {
-    const { wallet } = await createMyNearWallet();
+describe("signAndSendTransactions", () => {
+  it.skip("sign transactions in mynearwallet", async () => {
+    const { wallet, walletConnection } = await createMyNearWallet();
 
-    const replace = window.location.replace;
+    const transactions = [
+      {
+        signerId: accountId,
+        receiverId: "test.testnet",
+        actions: [],
+      },
+      {
+        signerId: accountId,
+        receiverId: "test.testnet",
+        actions: [],
+      },
+    ];
 
-    Object.defineProperty(window, "location", {
-      value: { replace: jest.fn() },
+    await wallet.signIn({ contractId: "test.testnet" });
+    const result = await wallet.signAndSendTransactions({
+      transactions,
     });
 
-    const attributes = {
-      message: "test message",
-      nonce: Buffer.from("30990309-30990309-390A303-292090"),
-      recipient: "test.app",
-      callbackUrl: "https://test.app",
-    };
-
-    const result = await wallet.signMessage!(attributes);
-
-    const nonceBase64 = attributes.nonce.toString("base64");
-    const urlParams = `https://testnet.mynearwallet.com/sign-message?message=test+message&nonce=${encodeURIComponent(
-      nonceBase64
-    )}&recipient=test.app&callbackUrl=https%3A%2F%2Ftest.app`;
-
-    expect(result).toBe(undefined);
-    expect(window.location.replace).toHaveBeenCalledWith(urlParams);
-
-    window.location.replace = replace;
+    expect(walletConnection.account).toHaveBeenCalled();
+    expect(result.length).toEqual(transactions.length);
   });
 });