Make backwards compat with 0.3.40

cartridge-gg · Aug 20, 2024 · c942610 · c942610
1 parent 9e69d51
commit c942610
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 19 deletions.
diff --git a/packages/controller/src/index.ts b/packages/controller/src/index.ts
@@ -30,7 +30,7 @@ import { KEYCHAIN_URL, RPC_SEPOLIA } from "./constants";
 
 class Controller {
   private url: URL;
-  private policies?: Policy[];
+  private policies: Policy[];
   private paymaster?: PaymasterOptions;
   private connection?: Connection<Keychain>;
   private modal?: Modal;
@@ -51,13 +51,11 @@ class Controller {
     this.url = new URL(url || KEYCHAIN_URL);
     this.rpc = new URL(rpc || RPC_SEPOLIA);
     this.paymaster = paymaster;
-
-    if (policies?.length) {
-      this.policies = policies.map((policy) => ({
+    this.policies =
+      policies?.map((policy) => ({
         ...policy,
         target: addAddressPadding(policy.target),
-      }));
-    }
+      })) || [];
 
     this.setTheme(theme, config?.presets);
     if (colorMode) {
@@ -190,8 +188,8 @@ class Controller {
 
     try {
       let response = await this.keychain.connect({
-        rpcUrl: this.rpc.toString(),
         policies: this.policies,
+        rpcUrl: this.rpc.toString(),
       });
       if (response.code !== ResponseCodes.SUCCESS) {
         throw new Error(response.message);

diff --git a/packages/controller/src/types.ts b/packages/controller/src/types.ts
@@ -61,9 +61,12 @@ export type ProbeReply = {
 
 export interface Keychain {
   probe(rpcUrl?: string): Promise<ProbeReply | ConnectError>;
-  connect(args: {
+  connect({
+    rpcUrl,
+    policies,
+  }: {
     rpcUrl: string;
-    policies?: Policy[];
+    policies: Policy[];
   }): Promise<ConnectReply | ConnectError>;
   disconnect(): void;
 

diff --git a/packages/keychain/src/components/connect/Login.tsx b/packages/keychain/src/components/connect/Login.tsx
@@ -50,6 +50,7 @@ function Form({
   const [isValidating, setIsValidating] = useState(false);
 
   const onSubmit = useCallback(async () => {
+    console.log(policies);
     setIsValidating(true);
     const error = await validateUsernameFor("login")(usernameField.value);
     if (error) {
@@ -81,7 +82,7 @@ function Form({
         credentialId,
       });
 
-      if (mode === LoginMode.Controller && policies.length > 0) {
+      if (mode === LoginMode.Controller && policies?.length > 0) {
         await controller.approve(origin, expiresAt, policies);
       } else {
         await doLogin(usernameField.value, credentialId);

diff --git a/packages/keychain/src/components/layout/Footer/index.tsx b/packages/keychain/src/components/layout/Footer/index.tsx
@@ -32,7 +32,7 @@ export function Footer({
   const isExpandable = useMemo(
     () =>
       !!origin &&
-      !!policies?.length &&
+      !!policies.length &&
       variant === "connect" &&
       !isSignup &&
       !hideTxSummary,
@@ -100,7 +100,7 @@ export function Footer({
           onClick={footer.onToggle}
           _hover={{ cursor: "pointer" }}
         >
-          {!hideTxSummary && !!policies?.length && (
+          {!hideTxSummary && !!policies.length && (
             <TransactionSummary
               isSlot={isSlot}
               createSession={createSession}

diff --git a/packages/keychain/src/hooks/connection.tsx b/packages/keychain/src/hooks/connection.tsx
@@ -33,7 +33,7 @@ type ConnectionContextValue = {
   rpcUrl: string;
   chainId: string;
   chainName: string;
-  policies?: Policy[];
+  policies: Policy[];
   prefunds: Prefund[];
   hasPrefundRequest: boolean;
   error: Error;

diff --git a/packages/keychain/src/utils/connection/connect.ts b/packages/keychain/src/utils/connection/connect.ts
@@ -19,14 +19,11 @@ export function connectFactory({
       policies,
     }: {
       rpcUrl: string;
-      policies?: Policy[];
+      policies: Policy[];
     }): Promise<ConnectReply> => {
       setOrigin(origin);
       setRpcUrl(rpcUrl);
-
-      if (policies?.length) {
-        setPolicies(policies);
-      }
+      setPolicies(policies);
 
       return new Promise((resolve, reject) => {
         setContext({

diff --git a/packages/keychain/src/utils/connection/types.ts b/packages/keychain/src/utils/connection/types.ts
@@ -26,7 +26,7 @@ export type ConnectionCtx =
 export type ConnectCtx = {
   origin: string;
   type: "connect";
-  policies?: Policy[];
+  policies: Policy[];
   resolve: (res: ConnectReply | ConnectError) => void;
   reject: (reason?: unknown) => void;
 };