@mezo-org/passport 0.4.0-dev.4 → 0.4.0-dev.41

package/dist/src/utils/numbers.js

@@ -0,0 +1,132 @@
+/**
+ * Formats a number or bigint into compact string with K, M, B, or T suffix.
+ * @param value The number or bigint to format.
+ * @param decimals Number of decimal places to include (ignored for bigint to avoid floating point issues).
+ * @returns The formatted number as a string.
+ */
+export function formatNumberToCompactString(value, decimals = 4) {
+    return value.toLocaleString("en-US", {
+        notation: "compact",
+        compactDisplay: "short",
+        maximumFractionDigits: decimals,
+    });
+}
+/**
+ * Formats a number or string into a locale-sensitive string with the desired number of decimals.
+ * @param value The number or string to format.
+ * @param desiredDecimals The number of decimal places to include.
+ * @returns The formatted number as a string.
+ * @see https://github.com/thesis/acre/blob/2078d339f4ddce79e69c78529c9d72910dd2640a/dapp/src/utils/numbersUtils.ts#L5-L19
+ */
+export function formatNumberToLocaleString(value, desiredDecimals = 0) {
+    const number = typeof value === "number" ? value : parseFloat(value);
+    if (number === 0 && desiredDecimals === 0)
+        return "0";
+    if (number === 0)
+        return `0.${"0".repeat(desiredDecimals)}`;
+    return number.toLocaleString("en-US", {
+        minimumFractionDigits: desiredDecimals,
+        maximumFractionDigits: desiredDecimals,
+    });
+}
+/**
+ * Returns a number rounded up to the desired number of decimals.
+ * @param amount The number to round up.
+ * @param desiredDecimals The number of decimals to round up to.
+ * @returns The rounded up number.
+ * @see https://github.com/thesis/acre/blob/2078d339f4ddce79e69c78529c9d72910dd2640a/dapp/src/utils/numbersUtils.ts#L1-L3
+ */
+export function roundUpNumber(amount, desiredDecimals = 2) {
+    return Math.ceil(amount * 10 ** desiredDecimals) / 10 ** desiredDecimals;
+}
+/**
+ * Convert a fixed point bigint with precision `fixedPointDecimals` to a
+ * floating point number truncated to `desiredDecimals`.
+ * @param fixedPoint The fixed point bigint to convert.
+ * @param fixedPointDecimals The number of decimals in the fixed point bigint.
+ * @param desiredDecimals The number of decimals in the output number.
+ * @returns The floating point number truncated to `desiredDecimals`.
+ * @see https://github.com/tahowallet/extension/blob/f6b26b7cb4a0a0278b1fccc6319626638f1a6dfa/background/lib/fixed-point.ts#L216-L239
+ */
+export function fromFixedPoint(fixedPoint, fixedPointDecimals, desiredDecimals = 4) {
+    const fixedPointDesiredDecimalsAmount = fixedPoint /
+        10n ** BigInt(Math.max(1, fixedPointDecimals - desiredDecimals));
+    const formattedAmount = Number(fixedPointDesiredDecimalsAmount) /
+        10 ** Math.min(desiredDecimals, fixedPointDecimals);
+    return formattedAmount;
+}
+/**
+ * Display a token amount correctly with desired decimals.
+ * The function returns a string with a language-sensitive representation of this number.
+ * @param amount The fixed point number to convert.
+ * @param decimals The number of decimals in the fixed point number.
+ * @param desiredDecimals The number of decimals to display.
+ * @param withRoundUp Whether to round up the number.
+ * @returns The formatted number as a string.
+ * @see https://github.com/thesis/acre/blob/2078d339f4ddce79e69c78529c9d72910dd2640a/dapp/src/utils/numbersUtils.ts#L57-L87
+ */
+export const fromFixedPointToString = (amount, decimals = 18, desiredDecimals = 4, withRoundUp = false) => {
+    const fixedPoint = BigInt(amount);
+    if (fixedPoint === 0n) {
+        return `0.${"0".repeat(desiredDecimals)}`;
+    }
+    const formattedAmount = fromFixedPoint(fixedPoint, decimals, 
+    // To round the amount up, let's increase the precision by one.
+    // The desired decimal numbers will be set later anyway.
+    withRoundUp ? desiredDecimals + 1 : desiredDecimals);
+    const minAmountToDisplay = 1 / 10 ** Math.min(desiredDecimals, decimals);
+    if (minAmountToDisplay > formattedAmount) {
+        return `<0.${"0".repeat(desiredDecimals - 1)}1`;
+    }
+    const finalFormattedAmount = withRoundUp
+        ? Math.ceil(formattedAmount * 10 ** desiredDecimals) / 10 ** desiredDecimals
+        : formattedAmount;
+    return formatNumberToLocaleString(finalFormattedAmount, desiredDecimals);
+};
+/**
+ * Converts a floating-point number or string to a bigint representation
+ * scaled by the specified number of decimal places (default: 18).
+ *
+ * This function avoids floating-point precision issues by manually
+ * parsing and scaling the number.
+ *
+ * @param amount - A number or string containing a floating point number.
+ * @param decimals - Number of decimals to scale to (default: 18).
+ * @returns A bigint representation scaled to the given decimal places.
+ * @see https://github.com/thesis/mezo-portal/blob/3bd4f39cb77c39948af2886a6ce7415a0c60307a/dapp/src/shared/utils/numbers.ts#L55
+ */
+export const fromFloatToBigInt = (amount, decimals = 18) => {
+    const FLOATING_POINT_REGEX = /^-?\d{1,3}(,\d{3})*(\.\d+)?$|^-?\d+(\.\d+)?$/;
+    const parseToFixedPointNumber = (floatingPointString) => {
+        if (!floatingPointString.match(FLOATING_POINT_REGEX)) {
+            return undefined;
+        }
+        const [whole, decimalsPart, ...extra] = floatingPointString.split(".");
+        if (extra.length > 0)
+            return undefined;
+        const noThousandsSeparatorWhole = whole.replace(/,/g, "");
+        const setDecimals = decimalsPart ?? "";
+        try {
+            return {
+                amount: BigInt([noThousandsSeparatorWhole, setDecimals].join("")),
+                decimals: setDecimals.length,
+            };
+        }
+        catch {
+            return undefined;
+        }
+    };
+    const convertFixedPoint = (fixedPoint, fixedPointDecimals, targetDecimals) => {
+        if (fixedPointDecimals >= targetDecimals) {
+            return fixedPoint / 10n ** BigInt(fixedPointDecimals - targetDecimals);
+        }
+        return fixedPoint * 10n ** BigInt(targetDecimals - fixedPointDecimals);
+    };
+    const parsedAmount = amount.toString();
+    const fixedPointAmount = parseToFixedPointNumber(parsedAmount);
+    if (typeof fixedPointAmount === "undefined") {
+        return 0n;
+    }
+    return convertFixedPoint(fixedPointAmount.amount, fixedPointAmount.decimals, decimals);
+};
+//# sourceMappingURL=numbers.js.map

package/dist/src/utils/numbers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"numbers.js","sourceRoot":"","sources":["../../../src/utils/numbers.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/numbers.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=numbers.test.d.ts.map

package/dist/src/utils/numbers.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"numbers.test.d.ts","sourceRoot":"","sources":["../../../src/utils/numbers.test.ts"],"names":[],"mappings":""}

package/dist/src/utils/numbers.test.js

@@ -0,0 +1,170 @@
+import { formatNumberToCompactString, fromFixedPoint, roundUpNumber, formatNumberToLocaleString, fromFixedPointToString, } from "./numbers";
+describe("formatNumberToCompactString", () => {
+    it("formats number less than 1000 with decimals", () => {
+        expect(formatNumberToCompactString(123.456789, 2)).toBe("123.46");
+    });
+    it("formats thousands with K", () => {
+        expect(formatNumberToCompactString(12_345, 2)).toBe("12.35K");
+    });
+    it("formats millions with M", () => {
+        expect(formatNumberToCompactString(12_345_678, 2)).toBe("12.35M");
+    });
+    it("formats billions with B", () => {
+        expect(formatNumberToCompactString(12_345_678_901, 2)).toBe("12.35B");
+    });
+    it("formats trillions with T", () => {
+        expect(formatNumberToCompactString(12_345_678_901_234, 2)).toBe("12.35T");
+    });
+    it("formats bigint as readable number", () => {
+        expect(formatNumberToCompactString(1234567890123456789n, 2)).toBe("1,234,567.89T");
+    });
+    it("caps at > 1000T for huge numbers", () => {
+        const hugeNumber = 10 ** 18; // 1e18
+        expect(formatNumberToCompactString(hugeNumber, 2)).toBe("1,000,000T");
+    });
+    it("formats numbers with trailing zeros correctly", () => {
+        expect(formatNumberToCompactString(1_000, 2)).toBe("1K");
+    });
+});
+describe("roundUpNumber", () => {
+    it("rounds up to 2 decimals", () => {
+        expect(roundUpNumber(1.234)).toBe(1.24);
+    });
+    it("rounds up to 3 decimals", () => {
+        expect(roundUpNumber(9.87654, 3)).toBe(9.877);
+    });
+    it("rounds up exact decimal", () => {
+        expect(roundUpNumber(2.5, 1)).toBe(2.5);
+    });
+});
+describe("fromFixedPoint", () => {
+    it("converts fixed point with 18 decimals to float", () => {
+        const raw = 1234567890000000000n; // 1.23456789 ETH in 18 decimals
+        expect(fromFixedPoint(raw, 18)).toBe(1.2345);
+    });
+    it("converts with truncation to 2 decimals", () => {
+        const raw = 987654321000000000n; // ~0.987654321 ETH
+        expect(fromFixedPoint(raw, 18, 2)).toBe(0.98);
+    });
+    it("handles large fixedPoint decimals", () => {
+        const raw = 1000000000000000000000000n; // 1M with 6 decimals
+        expect(fromFixedPoint(raw, 6, 2)).toBe(1000000000000000000);
+    });
+});
+describe("formatNumberToLocaleString", () => {
+    it("formats zero with 0 decimals", () => {
+        expect(formatNumberToLocaleString(0, 0)).toBe("0");
+    });
+    it("formats zero with >0 decimals", () => {
+        expect(formatNumberToLocaleString(0, 2)).toBe("0.00");
+        expect(formatNumberToLocaleString(0, 4)).toBe("0.0000");
+    });
+    it("formats small decimal number", () => {
+        expect(formatNumberToLocaleString(0.123456, 2)).toBe("0.12");
+        expect(formatNumberToLocaleString(0.123456, 4)).toBe("0.1235");
+    });
+    it("formats number just above 1", () => {
+        expect(formatNumberToLocaleString(1.000001, 3)).toBe("1.000");
+        expect(formatNumberToLocaleString(1.234567, 2)).toBe("1.23");
+    });
+    it("formats whole number", () => {
+        expect(formatNumberToLocaleString(1234, 0)).toBe("1,234");
+        expect(formatNumberToLocaleString(1000, 2)).toBe("1,000.00");
+    });
+    it("formats number with trailing decimal zeroes", () => {
+        expect(formatNumberToLocaleString(10.1, 3)).toBe("10.100");
+        expect(formatNumberToLocaleString(5.0, 2)).toBe("5.00");
+    });
+    it("formats string input", () => {
+        expect(formatNumberToLocaleString("123.456", 2)).toBe("123.46");
+        expect(formatNumberToLocaleString("0.00123", 4)).toBe("0.0012");
+    });
+    it("formats negative number", () => {
+        expect(formatNumberToLocaleString(-123.456, 2)).toBe("-123.46");
+        expect(formatNumberToLocaleString("-0.00999", 3)).toBe("-0.010");
+    });
+    it("formats large number with commas", () => {
+        expect(formatNumberToLocaleString(12345678.9, 2)).toBe("12,345,678.90");
+    });
+    it("handles max decimals safely", () => {
+        expect(formatNumberToLocaleString(1.123456789, 8)).toBe("1.12345679");
+        expect(formatNumberToLocaleString("0.000000000000000001", 18)).toBe("0.000000000000000001");
+    });
+    it("defaults to 0 decimals if not passed", () => {
+        expect(formatNumberToLocaleString(1234.567)).toBe("1,235"); // rounds up by default
+    });
+});
+describe("fromFixedPointToString", () => {
+    const toFixedPoint = (num) => BigInt(Math.round(num * 1e18));
+    const cases = [
+        { input: 2.0, expected: "2.000" },
+        { input: 2.009, expected: "2.009" },
+        { input: 2.01, expected: "2.010" },
+        { input: 2.015, expected: "2.016" },
+        { input: 2.05, expected: "2.050" },
+        { input: 2.09, expected: "2.090" },
+    ];
+    describe("withRoundUp: true", () => {
+        cases.forEach(({ input, expected }) => {
+            it(`formats ${input} → ${expected}`, () => {
+                const fixed = toFixedPoint(input);
+                expect(fromFixedPointToString(fixed, 18, 3, true)).toBe(expected);
+            });
+        });
+    });
+    describe("withRoundUp: false", () => {
+        const noRoundCases = [
+            { input: 2.0099, expected: "2.009" },
+            { input: 2.0159, expected: "2.015" },
+            { input: 2.0101, expected: "2.010" },
+            { input: 2.0199, expected: "2.019" },
+        ];
+        noRoundCases.forEach(({ input, expected }) => {
+            it(`formats ${input} → ${expected} (no rounding)`, () => {
+                const fixed = toFixedPoint(input);
+                expect(fromFixedPointToString(fixed, 18, 3, false)).toBe(expected);
+            });
+        });
+    });
+    describe("zero handling", () => {
+        it("formats 0 → 0.000 (3 decimals)", () => {
+            expect(fromFixedPointToString(0n, 18, 3)).toBe("0.000");
+        });
+        it("formats 0 → 0.0000 (4 decimals)", () => {
+            expect(fromFixedPointToString(0n, 18, 4)).toBe("0.0000");
+        });
+    });
+    describe("very small numbers below display threshold", () => {
+        it("returns <0.0001 for small number (3 decimals)", () => {
+            const small = BigInt(123); // ~1.23e-16
+            expect(fromFixedPointToString(small, 18, 4)).toBe("<0.0001");
+        });
+        it("returns <0.01 for small number with only 2 decimals", () => {
+            const tiny = BigInt(9999999999999); // <0.01
+            expect(fromFixedPointToString(tiny, 18, 2)).toBe("<0.01");
+        });
+    });
+    describe("input types", () => {
+        it("accepts bigint", () => {
+            const amount = 2100000000000000000n;
+            expect(fromFixedPointToString(amount, 18, 3)).toBe("2.100");
+        });
+        it("accepts string", () => {
+            expect(fromFixedPointToString("2000000000000000000", 18, 3)).toBe("2.000");
+        });
+        it("accepts number", () => {
+            expect(fromFixedPointToString(Number("1000000000000000000"), 18, 3)).toBe("1.000");
+        });
+    });
+    describe("high values", () => {
+        it("formats 1_000_000.123456789 correctly", () => {
+            const big = toFixedPoint(1_000_000.123456789);
+            expect(fromFixedPointToString(big, 18, 6)).toBe("1,000,000.123456");
+        });
+        it("formats 1e12 ETH", () => {
+            const big = BigInt("1000000000000000000000000000000");
+            expect(fromFixedPointToString(big, 18, 2)).toBe("1,000,000,000,000.00");
+        });
+    });
+});
+//# sourceMappingURL=numbers.test.js.map

package/dist/src/utils/numbers.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"numbers.test.js","sourceRoot":"","sources":["../../../src/utils/numbers.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@mezo-org/passport",
-  "version": "0.4.0-dev.4",
+  "version": "0.4.0-dev.41",
   "main": "dist/src/index.js",
   "license": "GPL-3.0-only",
   "scripts": {
     "build": "tsc",
+    "dev": "tsc --watch",
     "format": "npm run lint:js && npm run lint:config",
     "format:fix": "npm run lint:js:fix && npm run lint:config:fix",
     "lint:js": "eslint .",
@@ -23,21 +24,28 @@
     "directory": "typescript/passport"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.23.7",
     "@thesis-co/eslint-config": "github:thesis/eslint-config#7b9bc8c",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.11.30",
     "@types/react": "^18.2.64",
     "eslint": "^8.57.1",
     "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "prettier": "^3.2.5",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.3"
+    "typescript": "^5.8.2"
   },
   "dependencies": {
-    "@mezo-org/orangekit": "1.0.0-beta.40-dev.0",
-    "@mezo-org/sign-in-with-wallet": "1.0.0-beta.8"
+    "@mezo-org/mezo-clay": "0.1.0-dev.27",
+    "@mezo-org/mezod-contracts": "^1.0.0",
+    "@mezo-org/musd-contracts": "^1.0.1",
+    "@mezo-org/orangekit": "1.0.0-beta.40-dev.3",
+    "@mezo-org/sign-in-with-wallet": "1.0.0-beta.8",
+    "qrcode.react": "^4.2.0",
+    "styletron-engine-monolithic": "^1.0.0",
+    "usehooks-ts": "^3.1.1",
+    "zustand": "^5.0.3"
   },
   "peerDependencies": {
     "@rainbow-me/rainbowkit": "2.0.2",

package/src/api/auth.ts

@@ -1,151 +1,88 @@
-type RequestHandlerOptions = Omit<RequestInit, "credentials" | "body"> & {
-  body?: Record<string, unknown>
-  queryParams?: Record<string, string | undefined>
-}
-type PassportIdentityProvider = "wallet" | "discord" | "email"
+import { ApiClient } from "./client"
+import { FetchError } from "./fetch-error"
 
-type AccountPublicData = {
-  mezoId?: string
-  btcAddress: string
+type AuthProvider = "discord"
+
+export type LinkedWalletAccount = {
+  type: "wallet"
+  btcAddress?: string
   evmAddress: string
 }
 
-type AuthUser = {
+export type LinkedProviderAccount = {
+  type: AuthProvider
+  name: string
   id: string
-  app_metadata: {
-    provider: PassportIdentityProvider
-    providers: PassportIdentityProvider[]
-  }
-  user_metadata: AccountPublicData
+  avatarUrl: string
 }
 
-type AuthProvider = "discord"
-
-export type LinkedAccount =
-  | {
-      type: "wallet"
-      btcAddress?: string
-      evmAddress: string
-    }
-  | {
-      type: AuthProvider
-      name: string
-      id: string
-      avatarUrl: string
-    }
+export type LinkedAccount = LinkedWalletAccount | LinkedProviderAccount
 
 type Account = {
   mezoId: string
   hasModifiedMezoId: boolean
   linkedAccounts: LinkedAccount[]
-  authUser: AuthUser
 }
 
-type Session = {
+export type Session = {
   expiresIn: number
   expiresAt: number
   sessionLinks: {
     _links: {
-      account: "/session/account"
+      account: string
     }
   }
 }
 
-type AuthenticationProviderRedirectResponse = {
+export type AuthenticationProviderRedirectResponse = {
   redirectTo: string
 }
 
-type WalletAccountCredentials = {
-  type: "wallet"
+type SignatureData = {
   message: string
   signature: string
 }
 
+// Request and Response types
+export type GetSessionResponse = Session | { nonce: string }
+
 export type CreateSessionRequest =
-  | WalletAccountCredentials
+  | ({ type: "wallet" } & SignatureData)
   | { type: "discord" }
+export type CreateSessionResponse =
+  | Session
+  | AuthenticationProviderRedirectResponse
 
-export type LinkAccountRequest = CreateSessionRequest
-
-export type CreateAccountRequest = WalletAccountCredentials
-
-export type GetSessionResponse = Session | { nonce: string }
+export type DeleteSessionResponse = { message: string }
 
 export type GetCurrentAccountResponse = Partial<Account> | null
 
 export type GetAccountByMezoIdOrAddressResponse = {
   mezoId?: string
-  linkedAccounts?: LinkedAccount[]
+  linkedAccounts?: Extract<LinkedAccount, { type: "wallet" }>[]
 }
 
-export const API_ENDPOINTS_BY_ENV = {
-  mainnet: "https://api.mezo.org",
-  testnet: "https://api.test.mezo.org",
-}
+export type LinkAccountRequest = CreateSessionRequest
+export type LinkAccountResponse =
+  | Account
+  | AuthenticationProviderRedirectResponse
 
-export class AuthApiClient {
-  private apiUrl: string
+export type CreateAccountRequest = { type: "wallet" } & SignatureData
+export type CreateAccountResponse = Account
 
-  constructor(apiUrl?: string) {
-    this.apiUrl = apiUrl ?? API_ENDPOINTS_BY_ENV.mainnet
-  }
+export type UpdateMezoIdResponse = Account
 
-  /**
-   * The request handler for the Passport API. It accepts an API endpoint and
-   * request options.
-   * @dev Generic type `D` is a type of returned object from the function
-   * @dev WARNING: This function hardcodes `credentials: "include"`, meaning
-   * cookies and authentication headers will be sent with every request. Ensure
-   * this is safe if you plan to use it in other contexts than auth api worker.
-   * @param endpoint - The API endpoint to request. Should start with
-   * forward slash ("/")
-   * @param options - The request options, the `RequestInit` type with
-   * additional type-safe properties
-   * @returns The promise of the API response
-   */
-  protected async handleRequest<D>(
-    endpoint: `/${string}`,
-    options: RequestHandlerOptions,
-  ): Promise<D> {
-    const {
-      method,
-      headers,
-      body,
-      queryParams = {},
-      ...restOptions
-    } = options || {}
-
-    // If last character in apiUrl is forward slash we are removing it
-    const authApiUrlRoute = this.apiUrl.replace(/\/$/, "")
-    const url = new URL(`${authApiUrlRoute}${endpoint}`)
-
-    // Removes falsy values (e.g. null, undefined etc.) from query params and
-    // appends remaining ones to the URL
-    Object.entries(queryParams)
-      .filter(([, value]) => value) // Remove falsy values
-      .forEach(([key, value]) => url.searchParams.append(key, value!))
-
-    const response = await fetch(url, {
-      method,
-      credentials: "include",
-      headers: {
-        "Content-Type": "application/json",
-        ...headers,
-      },
-      body: body ? JSON.stringify(body) : undefined,
-      ...restOptions,
-    })
-
-    const data = await response.json()
-
-    if (!response.ok || data?.error) {
-      const error =
-        data?.error ||
-        `An error occurred when handling API request: ${JSON.stringify(data)}`
-      throw new Error(`Error [${response.status}]: ${error}`)
-    }
+export const AUTH_API_ENDPOINTS_BY_ENV = {
+  mainnet: "https://api.mezo.org",
+  testnet: "https://api.test.mezo.org",
+}
 
-    return data as D
+export class AuthApiClient extends ApiClient {
+  constructor(
+    environment: keyof typeof AUTH_API_ENDPOINTS_BY_ENV = "mainnet",
+    apiUrl?: string,
+  ) {
+    super(apiUrl ?? AUTH_API_ENDPOINTS_BY_ENV[environment])
   }
 
   async getSession(code?: string) {
@@ -158,21 +95,16 @@ export class AuthApiClient {
   }
 
   async createSession(createSessionRequest: CreateSessionRequest) {
-    const data = await this.handleRequest<Session | { redirectTo: string }>(
-      "/session",
-      {
-        method: "POST",
-        body: createSessionRequest,
-      },
-    )
+    const data = await this.handleRequest<CreateSessionResponse>("/session", {
+      method: "POST",
+      body: createSessionRequest,
+    })
 
     return data
   }
 
   async deleteSession() {
-    const data = await this.handleRequest<{
-      message: string
-    }>("/session", {
+    const data = await this.handleRequest<DeleteSessionResponse>("/session", {
       method: "DELETE",
     })
 
@@ -191,29 +123,40 @@ export class AuthApiClient {
   }
 
   async getAccountByMezoIdOrAddress(mezoIdOrAddress: string) {
-    const data = await this.handleRequest<GetAccountByMezoIdOrAddressResponse>(
-      `/accounts/${mezoIdOrAddress}`,
-      {
-        method: "GET",
-      },
-    )
+    let data
+    try {
+      data = await this.handleRequest<GetAccountByMezoIdOrAddressResponse>(
+        `/accounts/${mezoIdOrAddress}`,
+        {
+          method: "GET",
+        },
+      )
+    } catch (error) {
+      // Return null if account is not found instead of throwing an error
+      if (error instanceof FetchError && error.status === 404) {
+        data = null
+      } else {
+        throw error
+      }
+    }
 
     return data
   }
 
   async linkAccount(linkAccountRequest: LinkAccountRequest) {
-    const data = await this.handleRequest<
-      Account | AuthenticationProviderRedirectResponse
-    >("/session/account/linked-accounts", {
-      method: "POST",
-      body: linkAccountRequest,
-    })
+    const data = await this.handleRequest<LinkAccountResponse>(
+      "/session/account/linked-accounts",
+      {
+        method: "POST",
+        body: linkAccountRequest,
+      },
+    )
 
     return data
   }
 
   async createAccount(createAccountRequest: CreateAccountRequest) {
-    const data = await this.handleRequest<Account>("/accounts", {
+    const data = await this.handleRequest<CreateAccountResponse>("/accounts", {
       method: "POST",
       body: createAccountRequest,
     })
@@ -222,7 +165,7 @@ export class AuthApiClient {
   }
 
   async updateMezoId(newMezoId: string) {
-    const data = await this.handleRequest<Partial<Account> | null>(
+    const data = await this.handleRequest<UpdateMezoIdResponse>(
       "/session/account",
       {
         method: "PATCH",