diff --git a/internal/domain/certificate.go b/internal/domain/certificate.go index d2a998da..710ce268 100644 --- a/internal/domain/certificate.go +++ b/internal/domain/certificate.go @@ -20,7 +20,7 @@ type Certificate struct { SerialNumber string `json:"serialNumber" db:"serialNumber"` Certificate string `json:"certificate" db:"certificate"` PrivateKey string `json:"privateKey" db:"privateKey"` - Issuer string `json:"issuer" db:"issuer"` + IssuerOrg string `json:"issuerOrg" db:"issuerOrg"` IssuerCertificate string `json:"issuerCertificate" db:"issuerCertificate"` KeyAlgorithm CertificateKeyAlgorithmType `json:"keyAlgorithm" db:"keyAlgorithm"` EffectAt time.Time `json:"effectAt" db:"effectAt"` @@ -38,7 +38,7 @@ type Certificate struct { func (c *Certificate) PopulateFromX509(certX509 *x509.Certificate) *Certificate { c.SubjectAltNames = strings.Join(certX509.DNSNames, ";") c.SerialNumber = strings.ToUpper(certX509.SerialNumber.Text(16)) - c.Issuer = strings.Join(certX509.Issuer.Organization, ";") + c.IssuerOrg = strings.Join(certX509.Issuer.Organization, ";") c.EffectAt = certX509.NotBefore c.ExpireAt = certX509.NotAfter diff --git a/internal/repository/certificate.go b/internal/repository/certificate.go index 13d2c094..95bfd713 100644 --- a/internal/repository/certificate.go +++ b/internal/repository/certificate.go @@ -101,7 +101,7 @@ func (r *CertificateRepository) Save(ctx context.Context, certificate *domain.Ce record.Set("serialNumber", certificate.SerialNumber) record.Set("certificate", certificate.Certificate) record.Set("privateKey", certificate.PrivateKey) - record.Set("issuer", certificate.Issuer) + record.Set("issuerOrg", certificate.IssuerOrg) record.Set("issuerCertificate", certificate.IssuerCertificate) record.Set("keyAlgorithm", string(certificate.KeyAlgorithm)) record.Set("effectAt", certificate.EffectAt) @@ -162,7 +162,7 @@ func (r *CertificateRepository) castRecordToModel(record *core.Record) (*domain. SerialNumber: record.GetString("serialNumber"), Certificate: record.GetString("certificate"), PrivateKey: record.GetString("privateKey"), - Issuer: record.GetString("issuer"), + IssuerOrg: record.GetString("issuerOrg"), IssuerCertificate: record.GetString("issuerCertificate"), KeyAlgorithm: domain.CertificateKeyAlgorithmType(record.GetString("keyAlgorithm")), EffectAt: record.GetDateTime("effectAt").Time(), diff --git a/migrations/1747389600_upgrade.go b/migrations/1747389600_upgrade.go index aa5e2e3a..a145679a 100644 --- a/migrations/1747389600_upgrade.go +++ b/migrations/1747389600_upgrade.go @@ -7,6 +7,35 @@ import ( func init() { m.Register(func(app core.App) error { + // update collection `certificate` + { + collection, err := app.FindCollectionByNameOrId("4szxr9x43tpj6np") + if err != nil { + return err + } + + if err := collection.Fields.AddMarshaledJSONAt(6, []byte(`{ + "autogeneratePattern": "", + "hidden": false, + "id": "text2910474005", + "max": 0, + "min": 0, + "name": "issuerOrg", + "pattern": "", + "presentable": false, + "primaryKey": false, + "required": false, + "system": false, + "type": "text" + }`)); err != nil { + return err + } + + if err := app.Save(collection); err != nil { + return err + } + } + // migrate data { accesses, err := app.FindAllRecords("access") diff --git a/ui/src/components/certificate/CertificateDetail.tsx b/ui/src/components/certificate/CertificateDetail.tsx index 1023bf16..2fc0d9d0 100644 --- a/ui/src/components/certificate/CertificateDetail.tsx +++ b/ui/src/components/certificate/CertificateDetail.tsx @@ -42,7 +42,7 @@ const CertificateDetail = ({ data, ...props }: CertificateDetailProps) => { - + diff --git a/ui/src/domain/certificate.ts b/ui/src/domain/certificate.ts index 563d2476..c4bc8710 100644 --- a/ui/src/domain/certificate.ts +++ b/ui/src/domain/certificate.ts @@ -6,7 +6,7 @@ export interface CertificateModel extends BaseModel { serialNumber: string; certificate: string; privateKey: string; - issuer: string; + issuerOrg: string; keyAlgorithm: string; effectAt: ISO8601String; expireAt: ISO8601String; diff --git a/ui/src/pages/certificates/CertificateList.tsx b/ui/src/pages/certificates/CertificateList.tsx index 46bc1745..97eab0ef 100644 --- a/ui/src/pages/certificates/CertificateList.tsx +++ b/ui/src/pages/certificates/CertificateList.tsx @@ -126,11 +126,11 @@ const CertificateList = () => { }, }, { - key: "issuer", + key: "brand", title: t("certificate.props.brand"), render: (_, record) => ( - {record.issuer} + {record.issuerOrg} {record.keyAlgorithm} ),