Akhil/remove org

apps/backend/app/api/router.py

@@ -23,6 +23,8 @@
 from app.api.routes.redis_commander.api import router as redis_commander_router
 from app.api.routes.url_shortener.api import router as url_shortener_router
 from app.api.routes.dns_lookup.api import router as dns_lookup_router
+from app.api.routes.whois.api import router as whois_router
+from app.api.routes.webhook_tester.api import router as webhook_tester_router
 from app.api.routes.audit_log.api import router as audit_log_router
 from app.api.routes.workspaces.api import router as workspaces_router
 
@@ -50,5 +52,7 @@
 api_router.include_router(redis_commander_router)
 api_router.include_router(url_shortener_router)
 api_router.include_router(dns_lookup_router)
+api_router.include_router(whois_router)
+api_router.include_router(webhook_tester_router)
 api_router.include_router(audit_log_router)
 api_router.include_router(workspaces_router)

apps/backend/app/api/routes/api_client/services.py

@@ -86,7 +86,6 @@ async def list_collections(*, ctx: WorkspaceContext) -> list[ApiClientCollection
 async def create_collection(ctx: WorkspaceContext, body: ApiClientCollectionCreate) -> ApiClientCollectionOut:
     doc: dict[str, Any] = {
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "name": body.name,
@@ -133,7 +132,6 @@ async def list_environments(*, ctx: WorkspaceContext) -> list[ApiClientEnvironme
 async def create_environment(ctx: WorkspaceContext, body: ApiClientEnvironmentCreate) -> ApiClientEnvironmentOut:
     doc: dict[str, Any] = {
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "name": body.name,
@@ -213,7 +211,6 @@ async def create_history(ctx: WorkspaceContext, body: ApiClientHistoryCreate) ->
     ts = body.timestamp if body.timestamp is not None else int(time.time() * 1000)
     doc: dict[str, Any] = {
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "method": body.method,
@@ -257,7 +254,7 @@ async def clear_history(ctx: WorkspaceContext) -> None:
 #   2. Scoping by workspace_id would break the anonymous read path.
 #   3. The mock_id token (~144 bits of entropy) is the access control boundary.
 # Ownership is tracked by `created_by` only; the collection is NOT stamped with
-# org_id / workspace_id / owner_uid.
+# workspace_id / owner_uid.
 
 
 def _mock_doc_to_out(doc: dict[str, Any]) -> ApiClientPublicMockOut:
@@ -315,7 +312,7 @@ async def get_public_mock_anonymous(mock_id: str) -> ApiClientPublicMockOut | No
 #
 # API_CLIENT_WORKSPACES stores the API Client tool's own "workspace" concept
 # (grouping of API requests) — completely separate from our global Workspaces
-# feature. These are per-user data so they ARE stamped with org_id/workspace_id.
+# feature. These are per-user data so they ARE stamped with workspace_id.
 
 
 def _ws_doc_to_out(doc: dict[str, Any]) -> ApiClientWorkspaceOut:
@@ -340,7 +337,6 @@ async def list_workspaces(*, ctx: WorkspaceContext) -> list[ApiClientWorkspaceOu
 async def create_workspace(ctx: WorkspaceContext, body: ApiClientWorkspaceCreate) -> ApiClientWorkspaceOut:
     doc: dict[str, Any] = {
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "name": body.name,

apps/backend/app/api/routes/api_key_vault/services.py

@@ -52,7 +52,6 @@ async def create_entry(ctx: WorkspaceContext, body: ApiKeyEntryCreate) -> ApiKey
     doc: dict[str, Any] = {
         "_id": eid,
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "encryptedData": body.encryptedData,

apps/backend/app/api/routes/bookmarks/services.py

@@ -93,7 +93,6 @@ async def create_bookmark(ctx: WorkspaceContext, body: BookmarkCreate) -> Bookma
     doc: dict[str, Any] = {
         "_id": bid,
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "title": body.title,
@@ -155,7 +154,6 @@ async def import_bookmarks(ctx: WorkspaceContext, body: BookmarkImportBody) -> d
             doc = {
                 "_id": fid,
                 "created_by": ctx.uid,
-                "org_id": ctx.org_id,
                 "workspace_id": ctx.workspace_id,
                 "owner_uid": ctx.uid,
                 "name": folder.name,
@@ -174,7 +172,6 @@ async def import_bookmarks(ctx: WorkspaceContext, body: BookmarkImportBody) -> d
             doc = {
                 "_id": bid,
                 "created_by": ctx.uid,
-                "org_id": ctx.org_id,
                 "workspace_id": ctx.workspace_id,
                 "owner_uid": ctx.uid,
                 "title": bookmark.title,
@@ -237,7 +234,6 @@ async def create_folder(ctx: WorkspaceContext, body: BookmarkFolderCreate) -> Bo
     doc: dict[str, Any] = {
         "_id": fid,
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "name": body.name,

apps/backend/app/api/routes/code_snippets/services.py

@@ -53,7 +53,6 @@ async def create_code_snippet(ctx: WorkspaceContext, body: CodeSnippetCreate) ->
     doc: dict[str, Any] = {
         "_id": sid,
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "title": body.title,

apps/backend/app/api/routes/environment_manager/services.py

@@ -52,7 +52,6 @@ async def create_entry(ctx: WorkspaceContext, body: EnvSetEntryCreate) -> EnvSet
     doc: dict[str, Any] = {
         "_id": eid,
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "encryptedData": body.encryptedData,

apps/backend/app/api/routes/json_formatter/services.py

@@ -81,7 +81,6 @@ async def create_document(ctx: WorkspaceContext, body: JsonFormatterDocumentCrea
     now = datetime.now(timezone.utc)
     doc: dict[str, Any] = {
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "title": body.title,

apps/backend/app/api/routes/nosql/services.py

@@ -48,7 +48,6 @@ async def create_connection(ctx: WorkspaceContext, body: ConnectionCreate) -> Co
     doc: dict[str, Any] = {
         "_id": _id,
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "encryptedData": body.encryptedData,

apps/backend/app/api/routes/notes/services.py

@@ -82,7 +82,6 @@ async def create_note(ctx: WorkspaceContext, body: NoteCreate) -> NoteOut:
     doc = {
         "_id": note_id,
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "title": body.title or "Untitled",

apps/backend/app/api/routes/passwords/services.py

@@ -79,7 +79,6 @@ async def setup_vault(ctx: WorkspaceContext, body: VaultSetupRequest) -> VaultOu
 
     doc: dict[str, Any] = {
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "salt": body.salt,
@@ -113,7 +112,6 @@ async def create_entry(ctx: WorkspaceContext, body: PasswordEntryCreate) -> Pass
     doc: dict[str, Any] = {
         "_id": eid,
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "encryptedData": body.encryptedData,

apps/backend/app/api/routes/redis_commander/services.py

@@ -52,7 +52,6 @@ async def create_connection(ctx: WorkspaceContext, body: RedisConnectionCreate)
     doc: dict[str, Any] = {
         "_id": _id,
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "encryptedData": body.encryptedData,

apps/backend/app/api/routes/s3_drive/services.py

@@ -72,7 +72,6 @@ async def create_connection(ctx: WorkspaceContext, body: S3ConnectionCreate) ->
     doc: dict[str, Any] = {
         "_id": conn_id,
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "name": body.name,

apps/backend/app/api/routes/sql_client/services.py

@@ -53,7 +53,6 @@ async def create_connection(ctx: WorkspaceContext, body: SqlConnectionCreate) ->
     doc: dict[str, Any] = {
         "_id": _id,
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "encryptedData": body.encryptedData,

apps/backend/app/api/routes/tasks/services.py

@@ -185,7 +185,6 @@ async def create_task(ctx: WorkspaceContext, body: TaskCreate) -> TaskOut:
     now = datetime.now(timezone.utc)
     doc: dict[str, Any] = {
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "text": body.text,
@@ -270,7 +269,6 @@ async def import_tasks(ctx: WorkspaceContext, body: TaskImportRequest) -> dict[s
         row.pop("createdAt", None)
         row.pop("completedAt", None)
         row["created_by"] = ctx.uid
-        row["org_id"] = ctx.org_id
         row["workspace_id"] = ctx.workspace_id
         row["owner_uid"] = ctx.uid
         row["createdAt"] = now
@@ -303,7 +301,6 @@ async def create_project(ctx: WorkspaceContext, body: ProjectCreate) -> ProjectO
     now = datetime.now(timezone.utc)
     doc = {
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "name": body.name,

apps/backend/app/api/routes/url_shortener/services.py

@@ -181,7 +181,6 @@ async def create_link(ctx: WorkspaceContext, body: ShortLinkCreate) -> ShortLink
         "original_url": url,
         "title": title,
         "created_by": ctx.uid,
-        "org_id": ctx.org_id,
         "workspace_id": ctx.workspace_id,
         "owner_uid": ctx.uid,
         "created_at": create_timestamp(),
@@ -254,7 +253,7 @@ async def record_click(code: str, ua: str = "", referrer: str = "") -> None:
 
     # Fetch the link document to inherit workspace stamps
     db = db_manager.get_db()
-    link_doc = await db[COLLECTION].find_one({"_id": code}, {"org_id": 1, "workspace_id": 1, "owner_uid": 1})
+    link_doc = await db[COLLECTION].find_one({"_id": code}, {"workspace_id": 1, "owner_uid": 1})
 
     event = {
         "code": code,
@@ -267,8 +266,6 @@ async def record_click(code: str, ua: str = "", referrer: str = "") -> None:
 
     # Inherit workspace stamps from the link
     if link_doc:
-        if "org_id" in link_doc:
-            event["org_id"] = link_doc["org_id"]
         if "workspace_id" in link_doc:
             event["workspace_id"] = link_doc["workspace_id"]
         if "owner_uid" in link_doc: