mirror of
https://github.com/certd/certd.git
synced 2026-07-07 13:07:36 +08:00
Merge branch 'v2-dev' of https://github.com/certd/certd into v2-dev
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user