From 58837efecbe74977827382e2e152ed0cef1820cb Mon Sep 17 00:00:00 2001
From: Larbi Gharib <larbi.gharib@savoirfairelinux.com>
Date: Tue, 1 Mar 2022 01:30:22 +0100
Subject: [PATCH] Fix renew expired certificate CN

Change-Id: If4ca08562dad1220c9376c1cce4818bfa18afeb4
---
 .../net/jami/jams/server/core/workflows/RegisterDeviceFlow.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java b/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java
index 6c8a79a2..8a961377 100644
--- a/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java
+++ b/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java
@@ -70,6 +70,8 @@ public class RegisterDeviceFlow {
 
             // Renew user certificate if expired with same private key
             if(!user.getCertificate().getNotAfter().after(new Date())) {
+                user.setX509Fields(new X509Fields());
+                user.getX509Fields().setCommonName(user.getUsername());
                 user = UserAuthenticationModule.certificateAuthority.getSignedCertificate(user);
                 datastore.getUserDao().storeObject(user);
             }
-- 
GitLab