@greatapps/common 1.1.801 → 1.1.803

package/dist/modules/accounts/hooks/use-required-billing-data.hook.mjs

@@ -4,7 +4,9 @@ import { useCurrentSubscription } from "../../subscriptions/hooks/use-current-su
 import { hasPaidSubscription } from "../../subscriptions/utils/has-paid-subscription";
 import { useManagementPermissions } from "../../auth/hooks/useManagementPermissions";
 import { hasCompleteBillingData, isBrazilianBillingAccount } from "../utils/billing-data";
+import { useIsDefaultWhitelabel } from "../../../providers/whitelabel.provider";
 function useRequiredBillingData() {
+  const isDefaultWhitelabel = useIsDefaultWhitelabel();
   const { isOwnerOrAdmin } = useManagementPermissions();
   const { data: account, isPending: isAccountPending } = useCurrentAccount();
   const {
@@ -12,7 +14,7 @@ function useRequiredBillingData() {
     isPending: isSubscriptionPending
   } = useCurrentSubscription();
   const isLoading = isAccountPending || isSubscriptionPending;
-  const isRequired = !isLoading && isOwnerOrAdmin && isBrazilianBillingAccount(account) && hasPaidSubscription(subscription) && !hasCompleteBillingData(account);
+  const isRequired = !isLoading && isDefaultWhitelabel && isOwnerOrAdmin && isBrazilianBillingAccount(account) && hasPaidSubscription(subscription) && !hasCompleteBillingData(account);
   return {
     isRequired,
     isLoading,

package/dist/modules/accounts/hooks/use-required-billing-data.hook.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/modules/accounts/hooks/use-required-billing-data.hook.ts"],"sourcesContent":["'use client';\n\nimport { useCurrentAccount } from './current-account.hook';\nimport { useCurrentSubscription } from '../../subscriptions/hooks/use-current-subscription.hook';\nimport { hasPaidSubscription } from '../../subscriptions/utils/has-paid-subscription';\nimport { useManagementPermissions } from '../../auth/hooks/useManagementPermissions';\nimport { hasCompleteBillingData, isBrazilianBillingAccount } from '../utils/billing-data';\n\n/**\n * Contas que já pagaram mas nunca preencheram o cadastro de cobrança ficam sem\n * nota fiscal (chamado \"Nota fiscal não emitida em pagamentos confirmados\").\n * Este hook diz quando o preenchimento vira obrigatório — o modal que ele\n * alimenta é bloqueante, então só liga com os dados já carregados e só para\n * quem consegue resolver: owner/admin de conta brasileira.\n *\n * A assinatura vem de `useCurrentSubscription`, não de `useActiveSubscription`:\n * o segundo é `GET /subscriptions?limit=1` sem regra de escolha, então numa conta\n * com trial antiga a trial volta na frente da assinatura paga e o gate se cala.\n * Foi o que aconteceu na conta 428409, que pagou R$ 1.918 sem nota e nunca viu o\n * modal. O `current` aplica o ranqueamento do backend (cliente viva > trial viva >\n * free > encerrada) e devolve a mesma forma paginada.\n */\nexport function useRequiredBillingData() {\n  const { isOwnerOrAdmin } = useManagementPermissions();\n  const { data: account, isPending: isAccountPending } = useCurrentAccount();\n  const {\n    data: { data: [subscription] = [] } = {},\n    isPending: isSubscriptionPending,\n  } = useCurrentSubscription();\n\n  const isLoading = isAccountPending || isSubscriptionPending;\n\n  const isRequired =\n    !isLoading &&\n    isOwnerOrAdmin &&\n    isBrazilianBillingAccount(account) &&\n    hasPaidSubscription(subscription) &&\n    !hasCompleteBillingData(account);\n\n  return {\n    isRequired,\n    isLoading,\n    account,\n  };\n}\n"],"mappings":";AAEA,SAAS,yBAAyB;AAClC,SAAS,8BAA8B;AACvC,SAAS,2BAA2B;AACpC,SAAS,gCAAgC;AACzC,SAAS,wBAAwB,iCAAiC;AAgB3D,SAAS,yBAAyB;AACvC,QAAM,EAAE,eAAe,IAAI,yBAAyB;AACpD,QAAM,EAAE,MAAM,SAAS,WAAW,iBAAiB,IAAI,kBAAkB;AACzE,QAAM;AAAA,IACJ,MAAM,EAAE,MAAM,CAAC,YAAY,IAAI,CAAC,EAAE,IAAI,CAAC;AAAA,IACvC,WAAW;AAAA,EACb,IAAI,uBAAuB;AAE3B,QAAM,YAAY,oBAAoB;AAEtC,QAAM,aACJ,CAAC,aACD,kBACA,0BAA0B,OAAO,KACjC,oBAAoB,YAAY,KAChC,CAAC,uBAAuB,OAAO;AAEjC,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../../../src/modules/accounts/hooks/use-required-billing-data.hook.ts"],"sourcesContent":["'use client';\n\nimport { useCurrentAccount } from './current-account.hook';\nimport { useCurrentSubscription } from '../../subscriptions/hooks/use-current-subscription.hook';\nimport { hasPaidSubscription } from '../../subscriptions/utils/has-paid-subscription';\nimport { useManagementPermissions } from '../../auth/hooks/useManagementPermissions';\nimport { hasCompleteBillingData, isBrazilianBillingAccount } from '../utils/billing-data';\nimport { useIsDefaultWhitelabel } from '../../../providers/whitelabel.provider';\n\n/**\n * Contas que já pagaram mas nunca preencheram o cadastro de cobrança ficam sem\n * nota fiscal (chamado \"Nota fiscal não emitida em pagamentos confirmados\").\n * Este hook diz quando o preenchimento vira obrigatório — o modal que ele\n * alimenta é bloqueante, então só liga com os dados já carregados e só para\n * quem consegue resolver: owner/admin de conta brasileira.\n *\n * A assinatura vem de `useCurrentSubscription`, não de `useActiveSubscription`:\n * o segundo é `GET /subscriptions?limit=1` sem regra de escolha, então numa conta\n * com trial antiga a trial volta na frente da assinatura paga e o gate se cala.\n * Foi o que aconteceu na conta 428409, que pagou R$ 1.918 sem nota e nunca viu o\n * modal. O `current` aplica o ranqueamento do backend (cliente viva > trial viva >\n * free > encerrada) e devolve a mesma forma paginada.\n *\n * Só no whitelabel padrão (GreatPages, id 1): a nota fiscal é emitida por nós só\n * para as contas dele. Nos whitelabels de parceiro (ex.: v4) quem fatura é o\n * parceiro, e o modal bloqueante estava aparecendo para os clientes deles.\n */\nexport function useRequiredBillingData() {\n  const isDefaultWhitelabel = useIsDefaultWhitelabel();\n  const { isOwnerOrAdmin } = useManagementPermissions();\n  const { data: account, isPending: isAccountPending } = useCurrentAccount();\n  const {\n    data: { data: [subscription] = [] } = {},\n    isPending: isSubscriptionPending,\n  } = useCurrentSubscription();\n\n  const isLoading = isAccountPending || isSubscriptionPending;\n\n  const isRequired =\n    !isLoading &&\n    isDefaultWhitelabel &&\n    isOwnerOrAdmin &&\n    isBrazilianBillingAccount(account) &&\n    hasPaidSubscription(subscription) &&\n    !hasCompleteBillingData(account);\n\n  return {\n    isRequired,\n    isLoading,\n    account,\n  };\n}\n"],"mappings":";AAEA,SAAS,yBAAyB;AAClC,SAAS,8BAA8B;AACvC,SAAS,2BAA2B;AACpC,SAAS,gCAAgC;AACzC,SAAS,wBAAwB,iCAAiC;AAClE,SAAS,8BAA8B;AAoBhC,SAAS,yBAAyB;AACvC,QAAM,sBAAsB,uBAAuB;AACnD,QAAM,EAAE,eAAe,IAAI,yBAAyB;AACpD,QAAM,EAAE,MAAM,SAAS,WAAW,iBAAiB,IAAI,kBAAkB;AACzE,QAAM;AAAA,IACJ,MAAM,EAAE,MAAM,CAAC,YAAY,IAAI,CAAC,EAAE,IAAI,CAAC;AAAA,IACvC,WAAW;AAAA,EACb,IAAI,uBAAuB;AAE3B,QAAM,YAAY,oBAAoB;AAEtC,QAAM,aACJ,CAAC,aACD,uBACA,kBACA,0BAA0B,OAAO,KACjC,oBAAoB,YAAY,KAChC,CAAC,uBAAuB,OAAO;AAEjC,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;","names":[]}

package/dist/modules/whitelabel/actions/find-whitelabel.action.mjs

@@ -12,7 +12,9 @@ const findWhitelabel = async () => {
   if (!host) {
     throw new ApiError("Host header not found", "HOST_NOT_FOUND", 400);
   }
-  return findWhitelabelByHost(host);
+  const whitelabel = await findWhitelabelByHost(host);
+  Object.defineProperty(whitelabel, "token", { enumerable: false });
+  return whitelabel;
 };
 export {
   findWhitelabel

package/dist/modules/whitelabel/actions/find-whitelabel.action.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/modules/whitelabel/actions/find-whitelabel.action.ts"],"sourcesContent":["'use server';\n\n\nimport { headers } from \"next/headers\";\nimport { whitelabelService } from \"../services/whitelabel.service\";\nimport { ApiError } from \"../../../infra/api/types\";\nimport { cache } from \"react\";\n\nconst findWhitelabelByHost = cache(async (host: string) => {\n    return whitelabelService.getTokenByDomain(host);\n});\n\nexport const findWhitelabel = async () => {\n    const headersList = await headers();\n    const host = headersList.get('host');\n\n    if (!host) {\n        throw new ApiError('Host header not found', 'HOST_NOT_FOUND', 400);\n    }\n\n    return findWhitelabelByHost(host);\n};\n"],"mappings":";AAGA,SAAS,eAAe;AACxB,SAAS,yBAAyB;AAClC,SAAS,gBAAgB;AACzB,SAAS,aAAa;AAEtB,MAAM,uBAAuB,MAAM,OAAO,SAAiB;AACvD,SAAO,kBAAkB,iBAAiB,IAAI;AAClD,CAAC;AAEM,MAAM,iBAAiB,YAAY;AACtC,QAAM,cAAc,MAAM,QAAQ;AAClC,QAAM,OAAO,YAAY,IAAI,MAAM;AAEnC,MAAI,CAAC,MAAM;AACP,UAAM,IAAI,SAAS,yBAAyB,kBAAkB,GAAG;AAAA,EACrE;AAEA,SAAO,qBAAqB,IAAI;AACpC;","names":[]}
+{"version":3,"sources":["../../../../src/modules/whitelabel/actions/find-whitelabel.action.ts"],"sourcesContent":["'use server';\n\n\nimport { headers } from \"next/headers\";\nimport { whitelabelService } from \"../services/whitelabel.service\";\nimport { ApiError } from \"../../../infra/api/types\";\nimport { cache } from \"react\";\n\nconst findWhitelabelByHost = cache(async (host: string) => {\n    return whitelabelService.getTokenByDomain(host);\n});\n\nexport const findWhitelabel = async () => {\n    const headersList = await headers();\n    const host = headersList.get('host');\n\n    if (!host) {\n        throw new ApiError('Host header not found', 'HOST_NOT_FOUND', 400);\n    }\n\n    const whitelabel = await findWhitelabelByHost(host);\n    Object.defineProperty(whitelabel, 'token', { enumerable: false });\n\n    return whitelabel;\n};\n"],"mappings":";AAGA,SAAS,eAAe;AACxB,SAAS,yBAAyB;AAClC,SAAS,gBAAgB;AACzB,SAAS,aAAa;AAEtB,MAAM,uBAAuB,MAAM,OAAO,SAAiB;AACvD,SAAO,kBAAkB,iBAAiB,IAAI;AAClD,CAAC;AAEM,MAAM,iBAAiB,YAAY;AACtC,QAAM,cAAc,MAAM,QAAQ;AAClC,QAAM,OAAO,YAAY,IAAI,MAAM;AAEnC,MAAI,CAAC,MAAM;AACP,UAAM,IAAI,SAAS,yBAAyB,kBAAkB,GAAG;AAAA,EACrE;AAEA,QAAM,aAAa,MAAM,qBAAqB,IAAI;AAClD,SAAO,eAAe,YAAY,SAAS,EAAE,YAAY,MAAM,CAAC;AAEhE,SAAO;AACX;","names":[]}

package/dist/modules/whitelabel/actions/revalidate-whitelabel.action.mjs

@@ -10,7 +10,9 @@ async function revalidateWhitelabelAction() {
     if (!host) {
       throw new ApiError("Host header not found", "HOST_NOT_FOUND", 400);
     }
-    return whitelabelService.revalidateByDomain(host);
+    const whitelabel = await whitelabelService.revalidateByDomain(host);
+    Object.defineProperty(whitelabel, "token", { enumerable: false });
+    return whitelabel;
   });
 }
 export {

package/dist/modules/whitelabel/actions/revalidate-whitelabel.action.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/modules/whitelabel/actions/revalidate-whitelabel.action.ts"],"sourcesContent":["'use server';\n\nimport { headers } from 'next/headers';\nimport { whitelabelService } from '../services/whitelabel.service';\nimport { ApiError } from '../../../infra/api/types';\nimport { safeServerAction } from '../../../utils/safeServerAction';\n\nexport async function revalidateWhitelabelAction() {\n  return safeServerAction(async () => {\n    const headersList = await headers();\n    const host = headersList.get('host');\n\n    if (!host) {\n      throw new ApiError('Host header not found', 'HOST_NOT_FOUND', 400);\n    }\n\n    return whitelabelService.revalidateByDomain(host);\n  });\n}\n"],"mappings":";AAEA,SAAS,eAAe;AACxB,SAAS,yBAAyB;AAClC,SAAS,gBAAgB;AACzB,SAAS,wBAAwB;AAEjC,eAAsB,6BAA6B;AACjD,SAAO,iBAAiB,YAAY;AAClC,UAAM,cAAc,MAAM,QAAQ;AAClC,UAAM,OAAO,YAAY,IAAI,MAAM;AAEnC,QAAI,CAAC,MAAM;AACT,YAAM,IAAI,SAAS,yBAAyB,kBAAkB,GAAG;AAAA,IACnE;AAEA,WAAO,kBAAkB,mBAAmB,IAAI;AAAA,EAClD,CAAC;AACH;","names":[]}
+{"version":3,"sources":["../../../../src/modules/whitelabel/actions/revalidate-whitelabel.action.ts"],"sourcesContent":["'use server';\n\nimport { headers } from 'next/headers';\nimport { whitelabelService } from '../services/whitelabel.service';\nimport { ApiError } from '../../../infra/api/types';\nimport { safeServerAction } from '../../../utils/safeServerAction';\n\nexport async function revalidateWhitelabelAction() {\n  return safeServerAction(async () => {\n    const headersList = await headers();\n    const host = headersList.get('host');\n\n    if (!host) {\n      throw new ApiError('Host header not found', 'HOST_NOT_FOUND', 400);\n    }\n\n    const whitelabel = await whitelabelService.revalidateByDomain(host);\n    Object.defineProperty(whitelabel, 'token', { enumerable: false });\n\n    return whitelabel;\n  });\n}\n"],"mappings":";AAEA,SAAS,eAAe;AACxB,SAAS,yBAAyB;AAClC,SAAS,gBAAgB;AACzB,SAAS,wBAAwB;AAEjC,eAAsB,6BAA6B;AACjD,SAAO,iBAAiB,YAAY;AAClC,UAAM,cAAc,MAAM,QAAQ;AAClC,UAAM,OAAO,YAAY,IAAI,MAAM;AAEnC,QAAI,CAAC,MAAM;AACT,YAAM,IAAI,SAAS,yBAAyB,kBAAkB,GAAG;AAAA,IACnE;AAEA,UAAM,aAAa,MAAM,kBAAkB,mBAAmB,IAAI;AAClE,WAAO,eAAe,YAAY,SAAS,EAAE,YAAY,MAAM,CAAC;AAEhE,WAAO;AAAA,EACT,CAAC;AACH;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@greatapps/common",
-  "version": "1.1.801",
+  "version": "1.1.803",
   "description": "Shared library for GreatApps frontend applications",
   "main": "./dist/index.mjs",
   "types": "./src/index.ts",
@@ -46,14 +46,6 @@
     "dist",
     "src"
   ],
-  "scripts": {
-    "build": "tsup",
-    "dev": "tsup --watch",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "prepublishOnly": "npm run build"
-  },
   "keywords": [],
   "author": "",
   "license": "ISC",
@@ -150,5 +142,12 @@
     "@faker-js/faker": {
       "optional": true
     }
+  },
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsup --watch",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run",
+    "test:watch": "vitest"
   }
-}
+}

package/src/modules/accounts/hooks/use-required-billing-data.hook.ts

@@ -5,6 +5,7 @@ import { useCurrentSubscription } from '../../subscriptions/hooks/use-current-su
 import { hasPaidSubscription } from '../../subscriptions/utils/has-paid-subscription';
 import { useManagementPermissions } from '../../auth/hooks/useManagementPermissions';
 import { hasCompleteBillingData, isBrazilianBillingAccount } from '../utils/billing-data';
+import { useIsDefaultWhitelabel } from '../../../providers/whitelabel.provider';
 
 /**
  * Contas que já pagaram mas nunca preencheram o cadastro de cobrança ficam sem
@@ -19,8 +20,13 @@ import { hasCompleteBillingData, isBrazilianBillingAccount } from '../utils/bill
  * Foi o que aconteceu na conta 428409, que pagou R$ 1.918 sem nota e nunca viu o
  * modal. O `current` aplica o ranqueamento do backend (cliente viva > trial viva >
  * free > encerrada) e devolve a mesma forma paginada.
+ *
+ * Só no whitelabel padrão (GreatPages, id 1): a nota fiscal é emitida por nós só
+ * para as contas dele. Nos whitelabels de parceiro (ex.: v4) quem fatura é o
+ * parceiro, e o modal bloqueante estava aparecendo para os clientes deles.
  */
 export function useRequiredBillingData() {
+  const isDefaultWhitelabel = useIsDefaultWhitelabel();
   const { isOwnerOrAdmin } = useManagementPermissions();
   const { data: account, isPending: isAccountPending } = useCurrentAccount();
   const {
@@ -32,6 +38,7 @@ export function useRequiredBillingData() {
 
   const isRequired =
     !isLoading &&
+    isDefaultWhitelabel &&
     isOwnerOrAdmin &&
     isBrazilianBillingAccount(account) &&
     hasPaidSubscription(subscription) &&

package/src/modules/whitelabel/actions/find-whitelabel.action.ts

@@ -18,5 +18,8 @@ export const findWhitelabel = async () => {
         throw new ApiError('Host header not found', 'HOST_NOT_FOUND', 400);
     }
 
-    return findWhitelabelByHost(host);
+    const whitelabel = await findWhitelabelByHost(host);
+    Object.defineProperty(whitelabel, 'token', { enumerable: false });
+
+    return whitelabel;
 };

package/src/modules/whitelabel/actions/revalidate-whitelabel.action.ts

@@ -14,6 +14,9 @@ export async function revalidateWhitelabelAction() {
       throw new ApiError('Host header not found', 'HOST_NOT_FOUND', 400);
     }
 
-    return whitelabelService.revalidateByDomain(host);
+    const whitelabel = await whitelabelService.revalidateByDomain(host);
+    Object.defineProperty(whitelabel, 'token', { enumerable: false });
+
+    return whitelabel;
   });
 }