@nexttylabs/echo 0.5.0 → 0.7.0

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @nexttylabs/echo
 
+## 0.7.0
+
+### Minor Changes
+
+- fc3d8f1: support light/dark theme
+- cc04d9f: Use the organization member role uniformly.
+- 5cfdeb7: feat: support editing user profile
+
+### Patch Changes
+
+- 7dba561: remove legacy changeset files
+- 1e798f1: remove unuse tables and published files
+- e3c4e1c: fix workflow errors
+- daf9abb: first release
+
+## 0.6.0
+
+### Minor Changes
+
+- cc04d9f: Use the organization member role uniformly.
+- 5cfdeb7: feat: support editing user profile
+
+### Patch Changes
+
+- 7dba561: remove legacy changeset files
+- 1e798f1: remove unuse tables and published files
+- e3c4e1c: fix workflow errors
+- daf9abb: first release
+
 ## 0.5.0
 
 ### Minor Changes

package/app/(auth)/login/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(auth)/register/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(auth)/sign-in/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/admin/feedback/[id]/edit/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -22,7 +22,7 @@ import { auth } from "@/lib/auth/config";
 import { db } from "@/lib/db";
 import { feedback } from "@/lib/db/schema";
 import { FeedbackEditForm } from "@/components/feedback/feedback-edit-form";
-import { canEditFeedback, type UserRole } from "@/lib/auth/permissions";
+import { canEditFeedback } from "@/lib/auth/permissions";
 import { getOrgContext } from "@/lib/auth/org-context";
 import { getRequestUrl } from "@/lib/http/get-request-url";
 
@@ -39,11 +39,6 @@ export default async function FeedbackEditPage({ params }: PageProps) {
     redirect("/login");
   }
 
-  const userRole = (session.user as { role?: string }).role as UserRole | undefined;
-  if (!userRole || !canEditFeedback(userRole)) {
-    redirect("/admin/feedback");
-  }
-
   const { id } = await params;
   const feedbackId = parseInt(id);
 
@@ -55,6 +50,7 @@ export default async function FeedbackEditPage({ params }: PageProps) {
     throw new Error("Database not configured");
   }
 
+  // Get organization context first
   let organizationId: string | null = null;
   try {
     const url = getRequestUrl(
@@ -72,6 +68,16 @@ export default async function FeedbackEditPage({ params }: PageProps) {
     notFound();
   }
 
+  // Get user role from organization membership
+  const { getUserRoleInOrganization } = await import("@/lib/auth/organization");
+  const userRole = organizationId 
+    ? await getUserRoleInOrganization(db, session.user.id, organizationId)
+    : null;
+    
+  if (!userRole || !canEditFeedback(userRole)) {
+    redirect("/admin/feedback");
+  }
+
   const [row] = await db
     .select({
       title: feedback.title,

package/app/(dashboard)/admin/feedback/[id]/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/admin/feedback/new/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -30,17 +30,21 @@ export default async function NewFeedbackPage() {
     redirect("/login");
   }
 
-  const userRole = ((session.user as { role?: string }).role ?? "customer") as UserRole;
-  const hasSubmitOnBehalfPermission = canSubmitOnBehalf(userRole);
+  if (!db) {
+    throw new Error("Database not configured");
+  }
 
-  if (!hasSubmitOnBehalfPermission) {
+  // Get user's organization first (which includes their role)
+  const organization = await getUserOrganization(db, session.user.id);
+
+  if (!organization) {
     return (
       <div className="min-h-screen bg-gradient-to-br from-slate-50 via-white to-slate-100 px-4 py-12">
         <div className="mx-auto flex w-full max-w-2xl flex-col gap-6">
-          <div className="rounded-lg border border-red-200 bg-red-50 p-6">
-            <h1 className="text-xl font-semibold text-red-800">权限不足</h1>
-            <p className="mt-2 text-sm text-red-600">
-              您没有代客户提交反馈的权限。请联系管理员获取相应权限。
+          <div className="rounded-lg border border-amber-200 bg-amber-50 p-6">
+            <h1 className="text-xl font-semibold text-amber-800">未找到组织</h1>
+            <p className="mt-2 text-sm text-amber-700">
+              请先加入组织后再代客户提交反馈。
             </p>
           </div>
         </div>
@@ -48,20 +52,18 @@ export default async function NewFeedbackPage() {
     );
   }
 
-  if (!db) {
-    throw new Error("Database not configured");
-  }
-
-  const organization = await getUserOrganization(db, session.user.id);
+  // Get user role from organization membership
+  const userRole = (organization.role as UserRole) || "customer";
+  const hasSubmitOnBehalfPermission = canSubmitOnBehalf(userRole);
 
-  if (!organization) {
+  if (!hasSubmitOnBehalfPermission) {
     return (
       <div className="min-h-screen bg-gradient-to-br from-slate-50 via-white to-slate-100 px-4 py-12">
         <div className="mx-auto flex w-full max-w-2xl flex-col gap-6">
-          <div className="rounded-lg border border-amber-200 bg-amber-50 p-6">
-            <h1 className="text-xl font-semibold text-amber-800">未找到组织</h1>
-            <p className="mt-2 text-sm text-amber-700">
-              请先加入组织后再代客户提交反馈。
+          <div className="rounded-lg border border-red-200 bg-red-50 p-6">
+            <h1 className="text-xl font-semibold text-red-800">权限不足</h1>
+            <p className="mt-2 text-sm text-red-600">
+              您没有代客户提交反馈的权限。请联系管理员获取相应权限。
             </p>
           </div>
         </div>

package/app/(dashboard)/admin/feedback/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/admin/layout.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -15,10 +15,11 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { headers } from "next/headers";
+import { cookies, headers } from "next/headers";
 import { redirect } from "next/navigation";
 import { auth } from "@/lib/auth/config";
-import type { UserRole } from "@/lib/auth/permissions";
+import { db } from "@/lib/db";
+import { getUserRoleInOrganization } from "@/lib/auth/organization";
 
 export default async function AdminLayout({
   children,
@@ -36,13 +37,22 @@ export default async function AdminLayout({
     redirect("/login");
   }
 
-  const role = (session.user as { role?: string }).role as
-    | UserRole
-    | undefined;
+  // Get current organization ID from cookie
+  const cookieStore = await cookies();
+  const currentOrgId = cookieStore.get("orgId")?.value;
 
-  if (role !== "admin") {
+  if (!db || !currentOrgId) {
+    redirect("/no-access");
+  }
+
+  // Get user's role in the current organization
+  const role = await getUserRoleInOrganization(db, session.user.id, currentOrgId);
+
+  // Only admin or owner can access admin pages
+  if (role !== "admin" && role !== "owner" && role !== "product_manager") {
     redirect("/no-access");
   }
 
   return <>{children}</>;
 }
+

package/app/(dashboard)/analytics/portal/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/dashboard/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/layout.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -39,8 +39,6 @@ export default async function DashboardRootLayout({
     redirect("/login");
   }
 
-  const userRole = (session.user as { role?: string }).role as UserRole || "customer";
-
   // Fetch organizations
   let organizations: Array<{ id: string; name: string; slug: string; role: string }> = [];
   let currentOrgId: string | null = null;
@@ -52,6 +50,10 @@ export default async function DashboardRootLayout({
     currentOrgId = cookieOrgId || organizations[0]?.id || null;
   }
 
+  // Get user role from current organization membership
+  const currentOrg = organizations.find((org) => org.id === currentOrgId);
+  const userRole = (currentOrg?.role as UserRole) || "customer";
+
   return (
     <DashboardLayout
       user={{

package/app/(dashboard)/no-access/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/access/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/api-keys/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -15,11 +15,13 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { headers } from "next/headers";
+import { cookies, headers } from "next/headers";
 import { redirect } from "next/navigation";
 import { getTranslations } from "next-intl/server";
 import { auth } from "@/lib/auth/config";
+import { db } from "@/lib/db";
 import { ApiKeysList } from "@/components/settings/api-keys-list";
+import { getUserRoleInOrganization } from "@/lib/auth/organization";
 import type { UserRole } from "@/lib/auth/permissions";
 
 export async function generateMetadata() {
@@ -37,9 +39,17 @@ export default async function ApiKeysSettingsPage() {
     redirect("/login");
   }
 
-  const userRole = (session.user as { role?: string }).role as UserRole || "customer";
+  // Get user role from current organization
+  const cookieStore = await cookies();
+  const currentOrgId = cookieStore.get("orgId")?.value;
 
-  if (userRole !== "admin" && userRole !== "product_manager") {
+  let userRole: UserRole = "customer";
+  if (db && currentOrgId) {
+    const role = await getUserRoleInOrganization(db, session.user.id, currentOrgId);
+    userRole = role || "customer";
+  }
+
+  if (userRole !== "owner" && userRole !== "admin" && userRole !== "product_manager") {
     redirect("/settings/profile");
   }
 

package/app/(dashboard)/settings/appearance/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/branding/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/changelog/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/danger-zone/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/feedback/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/integrations/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/layout.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -15,10 +15,12 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { headers } from "next/headers";
+import { cookies, headers } from "next/headers";
 import { redirect } from "next/navigation";
 import { auth } from "@/lib/auth/config";
+import { db } from "@/lib/db";
 import { SettingsSidebar } from "@/components/settings";
+import { getUserOrganizations } from "@/lib/auth/organization";
 import type { UserRole } from "@/lib/auth/permissions";
 
 export default async function SettingsLayout({
@@ -32,7 +34,27 @@ export default async function SettingsLayout({
     redirect("/login");
   }
 
-  const userRole = (session.user as { role?: string }).role as UserRole || "customer";
+  // Get user role from current organization (same logic as dashboard layout)
+  let userRole: UserRole = "customer";
+  
+  if (db) {
+    const organizations = await getUserOrganizations(db, session.user.id);
+    const cookieStore = await cookies();
+    const cookieOrgId = cookieStore.get("orgId")?.value ?? null;
+    
+    // Check if the cookie org exists in user's organizations
+    // If not, fall back to the first available organization
+    let currentOrg = cookieOrgId 
+      ? organizations.find((org) => org.id === cookieOrgId) 
+      : null;
+    
+    // Fallback to first org if cookie org is not found (stale cookie)
+    if (!currentOrg && organizations.length > 0) {
+      currentOrg = organizations[0];
+    }
+    
+    userRole = (currentOrg?.role as UserRole) || "customer";
+  }
 
   return (
     <div className="flex min-h-[calc(100vh-3.5rem)]">
@@ -41,3 +63,4 @@ export default async function SettingsLayout({
     </div>
   );
 }
+

package/app/(dashboard)/settings/modules/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/notifications/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/organization/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -38,30 +38,29 @@ export default async function OrganizationSettingsPage() {
     redirect("/login");
   }
 
-  const userRole = (session.user as { role?: string }).role as UserRole || "customer";
-
-  if (userRole !== "admin") {
-    redirect("/settings/profile");
-  }
-
   if (!db) {
       throw new Error("Database connection not available");
   }
 
-  // Get all user organizations
+  // Get all user organizations and find current one
   const organizations = await getUserOrganizations(db, session.user.id);
   
   if (organizations.length === 0) {
     redirect("/settings/organizations/new");
   }
 
-  // Get current organization from cookie (same logic as dashboard layout)
+  // Get current organization from cookie
   const cookieStore = await cookies();
   const cookieOrgId = cookieStore.get("orgId")?.value ?? null;
   const currentOrgId = cookieOrgId || organizations[0]?.id || null;
   
-  // Find the current organization
+  // Find the current organization and get role from it
   const organization = organizations.find(org => org.id === currentOrgId) || organizations[0];
+  const userRole = (organization?.role as UserRole) || "customer";
+
+  if (userRole !== "owner" && userRole !== "admin") {
+    redirect("/settings/profile");
+  }
 
   if (!organization) {
     redirect("/settings/organizations/new");

package/app/(dashboard)/settings/organization/portal/access/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/organization/portal/experience/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/organization/portal/growth/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/organization/portal/layout.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/organization/portal/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/organizations/[orgId]/members/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/organizations/new/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/portal-access/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/portal-branding/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/portal-growth/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/portal-modules/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/portal-resources/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/profile/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(dashboard)/settings/widgets/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

package/app/(public)/[organizationSlug]/changelog/page.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2026 Echo Team
+ * Copyright (c) 2026 Nexttylabs Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by