From 859afbcebf41f67c7539e254a8511d27a2b8c316 Mon Sep 17 00:00:00 2001
From: Eamonn Mansour <47121388+eamansour@users.noreply.github.com>
Date: Wed, 10 Jul 2024 11:39:41 +0100
Subject: [PATCH] Fix loginId not correctly deserialising with existing couchdb
 token documents

Signed-off-by: Eamonn Mansour <47121388+eamansour@users.noreply.github.com>
---
 galasa-extensions-parent/dev.galasa.auth.couchdb/bnd.bnd       | 1 +
 .../java/dev/galasa/auth/couchdb/internal/CouchdbUser.java     | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/galasa-extensions-parent/dev.galasa.auth.couchdb/bnd.bnd b/galasa-extensions-parent/dev.galasa.auth.couchdb/bnd.bnd
index ba573d66..9fe29b6d 100644
--- a/galasa-extensions-parent/dev.galasa.auth.couchdb/bnd.bnd
+++ b/galasa-extensions-parent/dev.galasa.auth.couchdb/bnd.bnd
@@ -3,6 +3,7 @@ Bundle-Name: dev.galasa.auth.couchdb
 Bundle-Description: A CouchDB implementation of the Galasa Auth Store
 Bundle-License: https://www.eclipse.org/legal/epl-2.0
 Import-Package: com.google.gson,\
+    com.google.gson.annotations,\
     dev.galasa,\
     dev.galasa.framework.spi,\
     dev.galasa.framework.spi.auth,\
diff --git a/galasa-extensions-parent/dev.galasa.auth.couchdb/src/main/java/dev/galasa/auth/couchdb/internal/CouchdbUser.java b/galasa-extensions-parent/dev.galasa.auth.couchdb/src/main/java/dev/galasa/auth/couchdb/internal/CouchdbUser.java
index 014acf5a..3387e0a3 100644
--- a/galasa-extensions-parent/dev.galasa.auth.couchdb/src/main/java/dev/galasa/auth/couchdb/internal/CouchdbUser.java
+++ b/galasa-extensions-parent/dev.galasa.auth.couchdb/src/main/java/dev/galasa/auth/couchdb/internal/CouchdbUser.java
@@ -5,10 +5,13 @@
  */
 package dev.galasa.auth.couchdb.internal;
 
+import com.google.gson.annotations.SerializedName;
+
 import dev.galasa.framework.spi.auth.IInternalUser;
 
 public class CouchdbUser implements IInternalUser {
     
+    @SerializedName(value = "loginId", alternate = { "login_id" })
     private String loginId;
     private String dexUserId;