Merge branch 'v2-dev' of https://github.com/certd/certd into v2-dev

packages/ui/certd-client/src/views/certd/pipeline/cert-upload/use.tsx

@@ -207,7 +207,7 @@ export function useCertUpload() {
               const { id } = await api.Save({
                 title: pipeline.title,
                 content: JSON.stringify(pipeline),
-                keepHistoryCount: 30,
+                keepHistoryCount: 100,
                 type: "cert_upload",
                 groupId: form.groupId,
               });

packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.tsx

@@ -605,7 +605,7 @@ export function useCertPipelineCreator({ formWrapperRef }: { formWrapperRef: Ref
       const { id } = await api.Save({
         title: pipeline.title,
         content: JSON.stringify(pipeline),
-        keepHistoryCount: 30,
+        keepHistoryCount: 100,
         type: "cert",
         groupId,
         addToMonitorEnabled: form.addToMonitorEnabled,

packages/ui/certd-client/src/views/certd/pipeline/template/use.tsx

@@ -160,7 +160,7 @@ export async function createPipelineByTemplate(opts: { templateId: number; title
   return await templateApi.CreatePipelineByTemplate({
     title,
     content: JSON.stringify(pipeline),
-    keepHistoryCount: keepHistoryCount ?? 30,
+    keepHistoryCount: keepHistoryCount ?? 100,
     groupId,
     templateId,
   });

packages/ui/certd-server/src/controller/user/mine/mine-controller.ts

@@ -55,16 +55,13 @@ export class MineController extends BaseController {
     //@ts-ignore
     user.needInitPassword = needInitPassword;
 
-    const { projectId } = await this.getProjectUserIdRead();
-    const userProjectQuery = this.accessService.buildUserProjectQuery(userId, projectId);
     const existingAccess = await this.accessService.findOne({
-      where: { type: "acmeAccount", subtype: "letsencrypt", ...userProjectQuery },
+      where: { type: "acmeAccount", subtype: "letsencrypt", userId },
     });
     if (!existingAccess) {
       //@ts-ignore
       user.needInitAccount = true;
     }
-
     return this.ok(user);
   }
 

packages/ui/certd-server/src/modules/login/service/passkey-service.ts

@@ -30,8 +30,8 @@ export class PasskeyService extends BaseService<PasskeyEntity> {
       rpName = siteInfo.title || rpName;
     }
 
-    const rpId = ctx.hostname;
-    const origin = ctx.origin;
+    const origin = ctx.headers.origin || ctx.origin;
+    const rpId = origin ? new URL(origin).hostname : ctx.hostname;
 
     return {
       rpName,

packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts

@@ -1376,7 +1376,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
     bean.status = "none";
     bean.type = "cert_auto";
     bean.disabled = false;
-    bean.keepHistoryCount = 30;
+    bean.keepHistoryCount = 100;
     bean.projectId = req.projectId;
     await this.save(bean);