Revert "chore: rebase with main. share only at ledger level."

This reverts commit 1a58862.

Author: necrodome

dashboard/backend/api.ts

@@ -1777,7 +1777,19 @@ export class FPApiSQL implements FPApiInterface {
       return Result.Err("Cannot share ledger with yourself");
     }
 
-    // 6. Add user to ledger (no need to add to tenant for sharing)
+    // 6. Add user to tenant first
+    const rAddUserToTenant = await this.addUserToTenant(this.db, {
+      userName: req.email,
+      tenantId: ledger.tenantId,
+      userId: targetUser.userId,
+      role: "member",
+    });
+
+    if (rAddUserToTenant.isErr()) {
+      return Result.Err(rAddUserToTenant.Err());
+    }
+
+    // 7. Add user to ledger
     const rAddUser = await this.addUserToLedger(this.db, {
       userName: req.email,
       ledgerId: ledgerId,
@@ -1791,17 +1803,15 @@ export class FPApiSQL implements FPApiInterface {
       return Result.Err(rAddUser.Err());
     }
 
-    const addedUser = rAddUser.Ok();
-
     return Result.Ok({
       type: "resShareWithUser",
       success: true,
       message: `Successfully shared ledger with ${req.email}`,
-      ledgerId: addedUser.ledgerId,
-      userId: addedUser.userId,
+      ledgerId: ledgerId,
+      userId: targetUser.userId,
       email: req.email,
-      role: addedUser.role,
-      right: addedUser.right,
+      role: req.role || "member",
+      right: req.right || "write",
     });
   }
 

dashboard/backend/cf-serve.ts

@@ -2,6 +2,9 @@ import { drizzle } from "drizzle-orm/d1";
 import { D1Database, Fetcher, Request as CFRequest, Response as CFResponse } from "@cloudflare/workers-types";
 import { DefaultHttpHeaders, createHandler } from "./create-handler.js";
 import { URI } from "@adviser/cement";
+import { Request as CFRequest, Response as CFResponse, D1Database, Fetcher } from "@cloudflare/workers-types";
+import { drizzle } from "drizzle-orm/d1";
+import { CORS, createHandler } from "./create-handler.js";
 import { resWellKnownJwks } from "./well-known-jwks.js";
 
 export interface Env {

dashboard/src/pages/cloud/api/token-auto.tsx

@@ -1,10 +1,10 @@
+import React, { useContext, useEffect, useState } from "react";
 import { URI } from "@adviser/cement";
-import { TenantLedger } from "@fireproof/core-types-protocols-cloud";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { base64url } from "jose";
-import React, { useContext, useEffect, useState } from "react";
 import { Navigate, useSearchParams } from "react-router-dom";
 import { AppContext } from "../../../app-context.jsx";
+import { TenantLedger } from "@fireproof/core-types-protocols-cloud";
 import { ListTenantsLedgersByUser } from "../../../cloud-context.jsx";
 
 interface TenantLedgerWithName {
@@ -51,12 +51,9 @@ export function ApiTokenAuto() {
     );
   }
 
-  // Get user's tenants and ledgers (includes both owned and shared ledgers)
+  // Get user's tenants and ledgers
   const { data: tenantsData, error: tenantsError } = cloud.getListTenantsLedgersByUser();
 
-  // Also get all ledgers user is a member of (including shared ones not in their tenants)
-  const { data: allUserLedgers, error: allUserLedgersError } = cloud.getListLedgersByUser();
-
   // Create ledger mutation
   const createLedgerMutation = useMutation({
     mutationFn: async ({ tenantId, name }: { tenantId: string; name: string }) => {
@@ -73,9 +70,9 @@ export function ApiTokenAuto() {
     },
   });
 
-  // Process ledger data when tenants/ledgers are loaded
+  // Process ledger data when tenants are loaded
   useEffect(() => {
-    if (ledgerInfo) {
+    if (!tenantsData || tenantsData.length === 0 || ledgerInfo) {
       return;
     }
 
@@ -89,45 +86,27 @@ export function ApiTokenAuto() {
       return;
     }
 
-    // Look for existing ledger by name or ID in all user's ledgers (including shared)
+    // Look for existing ledger by name or ID
     let foundLedger: TenantLedgerWithName | null = null;
 
-    // First check in allUserLedgers (includes shared ledgers)
-    if (allUserLedgers?.ledgers) {
-      const matchingLedger = allUserLedgers.ledgers.find(
-        (ledger) => ledger.name === ledgerName || (ledgerId && ledger.ledgerId === ledgerId),
-      );
-
-      if (matchingLedger) {
-        foundLedger = {
-          tenant: matchingLedger.tenantId,
-          ledger: matchingLedger.ledgerId,
-          name: matchingLedger.name,
-        };
-      }
-    }
-
-    // Fallback: check in tenantsData if not found
-    if (!foundLedger && tenantsData && tenantsData.length > 0) {
-      for (const tenant of tenantsData) {
-        for (const ledger of tenant.ledgers) {
-          if (ledger.name === ledgerName || (ledgerId && ledger.ledgerId === ledgerId)) {
-            foundLedger = {
-              tenant: tenant.tenant.tenantId,
-              ledger: ledger.ledgerId,
-              name: ledger.name,
-            };
-            break;
-          }
+    for (const tenant of tenantsData) {
+      for (const ledger of tenant.ledgers) {
+        if (ledger.name === ledgerName || (ledgerId && ledger.ledgerId === ledgerId)) {
+          foundLedger = {
+            tenant: tenant.tenant.tenantId,
+            ledger: ledger.ledgerId,
+            name: ledger.name,
+          };
+          break;
         }
-        if (foundLedger) break;
       }
+      if (foundLedger) break;
     }
 
     if (foundLedger) {
       setLedgerInfo(foundLedger);
-    } else if (tenantsData && tenantsData.length > 0) {
-      // Only create a new ledger if user has tenants (don't create for shared-only users)
+    } else {
+      // Need to create a new ledger
       const targetTenant = tenantId
         ? tenantsData.find((t: ListTenantsLedgersByUser) => t.tenant.tenantId === tenantId)?.tenant
         : tenantsData[0]?.tenant;
@@ -139,7 +118,7 @@ export function ApiTokenAuto() {
         });
       }
     }
-  }, [tenantsData, allUserLedgers, tenantId, ledgerId, ledgerName, ledgerInfo, createLedgerMutation]);
+  }, [tenantsData, tenantId, ledgerId, ledgerName, ledgerInfo, createLedgerMutation]);
 
   // Handle successful ledger creation
   useEffect(() => {
@@ -203,7 +182,7 @@ export function ApiTokenAuto() {
   }, [cloudToken, backUrl, countdownSecs]);
 
   // Show errors
-  const error = tenantsError || allUserLedgersError || createLedgerMutation.error || errorToken;
+  const error = tenantsError || createLedgerMutation.error || errorToken;
   if (error) {
     return (
       <div style={{ padding: "40px", textAlign: "center" }}>