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

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

@@ -190,8 +190,10 @@ export class PipelineController extends CrudController<PipelineService> {
   }
 
   @Post('/update', { description: Constants.per.authOnly })
-  async update(@Body(ALL) bean) {
-    return await this.save(bean);
+  async update(@Body(ALL) bean:PipelineEntity) {
+     await this.checkOwner(this.getService(), bean.id,"write",true);
+     await this.service.update(bean as any);
+     return this.ok({});
   }
 
   @Post('/save', { description: Constants.per.authOnly, summary: '新增/更新流水线' })

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

@@ -230,9 +230,10 @@ export class PasskeyService extends BaseService<PasskeyEntity> {
       throw new AuthException("Passkey不存在");
     }
 
-    if (verification.counter <= passkey.counter) {
-      throw new AuthException("认证失败:计数器异常");
-    }
+    // 可同步密钥 各个客户端的计数器不是单调递增的，此规范基本上都不遵守了
+    // if (verification.counter <= passkey.counter && passkey.counter > 0) {
+    //   throw new AuthException("认证失败:计数器异常");
+    // }
 
     passkey.counter = verification.counter;
     passkey.updateTime = new Date();

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

@@ -259,6 +259,9 @@ export class PipelineService extends BaseService<PipelineEntity> {
       bean.order = old.order;
       bean.userId = old.userId;
       bean.projectId = old.projectId;
+      if (bean.content == null) {
+        bean.content = old.content;
+      }
     }
     if (!old || !old.webhookKey) {
       bean.webhookKey = await this.genWebhookKey();