fix(costcenter): transfer error (#4010)

labring · Sep 27, 2023 · cd43d4b · cd43d4b
1 parent cb91077
commit cd43d4b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/frontend/providers/costcenter/src/pages/api/account/payment/pay.ts b/frontend/providers/costcenter/src/pages/api/account/payment/pay.ts
@@ -21,7 +21,6 @@ export default async function handler(req: NextApiRequest, resp: NextApiResponse
     if (kube_user === null) {
       return jsonRes(resp, { code: 404, message: 'user not found' });
     }
-    const kube_namespace = kc.getContexts()[0].namespace;
     // get payment crd
     type paymentStatus = {
       tradeNo: string;
@@ -31,7 +30,7 @@ export default async function handler(req: NextApiRequest, resp: NextApiResponse
 
     const paymentM = {
       ...paymentMeta,
-      namespace: kube_namespace || GetUserDefaultNameSpace(kube_user.name)
+      namespace: GetUserDefaultNameSpace(kube_user.name)
     };
     const paymentDesc = await GetCRD(kc, paymentM, id);
     //@ts-ignore

diff --git a/frontend/providers/costcenter/src/pages/api/account/transfer.ts b/frontend/providers/costcenter/src/pages/api/account/transfer.ts
@@ -34,7 +34,7 @@ export default async function handler(req: NextApiRequest, resp: NextApiResponse
       return jsonRes(resp, { code: 401, message: 'user not found' });
     }
 
-    const namespace = kc.getContexts()[0].namespace || GetUserDefaultNameSpace(kubeUser.name);
+    const namespace = GetUserDefaultNameSpace(kubeUser.name);
     const name = to + '-' + getTime(new Date());
     const transferCRD = generateTransferCrd({
       to,

diff --git a/frontend/providers/costcenter/src/pages/api/billing/getAppList.tsx b/frontend/providers/costcenter/src/pages/api/billing/getAppList.tsx
@@ -11,7 +11,7 @@ export default async function handler(req: NextApiRequest, resp: NextApiResponse
     if (user === null) {
       return jsonRes(resp, { code: 403, message: 'user null' });
     }
-    const namespace = GetUserDefaultNameSpace(user.name);
+    const namespace = kc.getContexts()[0].namespace || GetUserDefaultNameSpace(user.name);
     const name = new Date().getTime() + 'appquery';
     const crdSchema = {
       apiVersion: `account.sealos.io/v1`,

diff --git a/frontend/providers/costcenter/src/pages/api/billing/getNamespaceList.tsx b/frontend/providers/costcenter/src/pages/api/billing/getNamespaceList.tsx
@@ -1,5 +1,5 @@
 import { authSession } from '@/service/backend/auth';
-import { CRDMeta, GetCRD } from '@/service/backend/kubernetes';
+import { CRDMeta, GetCRD, GetUserDefaultNameSpace } from '@/service/backend/kubernetes';
 import { jsonRes } from '@/service/backend/response';
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { ApplyYaml } from '@/service/backend/kubernetes';
@@ -44,7 +44,8 @@ export default async function handler(req: NextApiRequest, resp: NextApiResponse
     if (user === null) {
       return jsonRes(resp, { code: 403, message: 'user null' });
     }
-    const namespace = kc.getContexts()[0].namespace || 'ns-' + user.name;
+    // 要和kc保持一致
+    const namespace = kc.getContexts()[0].namespace || GetUserDefaultNameSpace(user.name);
     const name = new Date().getTime() + 'namespacequery';
     const crdSchema = {
       apiVersion: `account.sealos.io/v1`,

diff --git a/frontend/providers/costcenter/src/pages/api/billing/index.ts b/frontend/providers/costcenter/src/pages/api/billing/index.ts
@@ -1,5 +1,5 @@
 import { authSession } from '@/service/backend/auth';
-import { CRDMeta, GetCRD } from '@/service/backend/kubernetes';
+import { CRDMeta, GetCRD, GetUserDefaultNameSpace } from '@/service/backend/kubernetes';
 import { jsonRes } from '@/service/backend/response';
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { ApplyYaml } from '@/service/backend/kubernetes';
@@ -42,7 +42,7 @@ export default async function handler(req: NextApiRequest, resp: NextApiResponse
     if (user === null) {
       return jsonRes(resp, { code: 403, message: 'user null' });
     }
-    const namespace = 'ns-' + user.name;
+    const namespace = GetUserDefaultNameSpace(user.name);
     const body = req.body;
     let spec: BillingSpec = body.spec;
     if (!spec) {