From cf8ba1882bd5349f53d3171824d1eb4c56bc7348 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Mon, 28 Aug 2017 23:50:33 +0200
Subject: [PATCH] Displaying tokenType and tokenOrigin in TPS UI and CLI.

The TPSCertService has been modified to include tokenType and
tokenOrigin fields in the returned token certificate data. The
TPS UI and CLI have been modified to display the fields.

https://pagure.io/dogtagpki/issue/2793

Change-Id: I740fa69b81de3033e186f8d99c335814275b7218
(cherry picked from commit 062c99a9012b2d7b00fabc2d2b565415800ce6a7)
---
 .../com/netscape/certsrv/tps/cert/TPSCertData.java | 52 +++++++++++++++++-----
 .../com/netscape/cmstools/tps/cert/TPSCertCLI.java |  4 +-
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/base/common/src/com/netscape/certsrv/tps/cert/TPSCertData.java b/base/common/src/com/netscape/certsrv/tps/cert/TPSCertData.java
index 7cefc791d..63ea26667 100644
--- a/base/common/src/com/netscape/certsrv/tps/cert/TPSCertData.java
+++ b/base/common/src/com/netscape/certsrv/tps/cert/TPSCertData.java
@@ -53,10 +53,12 @@ public class TPSCertData {
     String id;
     String serialNumber;
     String subject;
+    String userID;
     String tokenID;
+    String origin;
+    String type;
     String keyType;
     String status;
-    String userID;
     Date createTime;
     Date modifyTime;
 
@@ -89,6 +91,15 @@ public class TPSCertData {
         this.subject = subject;
     }
 
+    @XmlElement(name="UserID")
+    public String getUserID() {
+        return userID;
+    }
+
+    public void setUserID(String userID) {
+        this.userID = userID;
+    }
+
     @XmlElement(name="TokenID")
     public String getTokenID() {
         return tokenID;
@@ -98,6 +109,24 @@ public class TPSCertData {
         this.tokenID = tokenID;
     }
 
+    @XmlElement(name="Origin")
+    public String getOrigin() {
+        return origin;
+    }
+
+    public void setOrigin(String origin) {
+        this.origin = origin;
+    }
+
+    @XmlElement(name="Type")
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     @XmlElement(name="KeyType")
     public String getKeyType() {
         return keyType;
@@ -116,15 +145,6 @@ public class TPSCertData {
         this.status = status;
     }
 
-    @XmlElement(name="UserID")
-    public String getUserID() {
-        return userID;
-    }
-
-    public void setUserID(String userID) {
-        this.userID = userID;
-    }
-
     @XmlElement(name="CreateTime")
     public Date getCreateTime() {
         return createTime;
@@ -161,10 +181,12 @@ public class TPSCertData {
         result = prime * result + ((keyType == null) ? 0 : keyType.hashCode());
         result = prime * result + ((link == null) ? 0 : link.hashCode());
         result = prime * result + ((modifyTime == null) ? 0 : modifyTime.hashCode());
+        result = prime * result + ((origin == null) ? 0 : origin.hashCode());
         result = prime * result + ((serialNumber == null) ? 0 : serialNumber.hashCode());
         result = prime * result + ((status == null) ? 0 : status.hashCode());
         result = prime * result + ((subject == null) ? 0 : subject.hashCode());
         result = prime * result + ((tokenID == null) ? 0 : tokenID.hashCode());
+        result = prime * result + ((type == null) ? 0 : type.hashCode());
         result = prime * result + ((userID == null) ? 0 : userID.hashCode());
         return result;
     }
@@ -203,6 +225,11 @@ public class TPSCertData {
                 return false;
         } else if (!modifyTime.equals(other.modifyTime))
             return false;
+        if (origin == null) {
+            if (other.origin != null)
+                return false;
+        } else if (!origin.equals(other.origin))
+            return false;
         if (serialNumber == null) {
             if (other.serialNumber != null)
                 return false;
@@ -223,6 +250,11 @@ public class TPSCertData {
                 return false;
         } else if (!tokenID.equals(other.tokenID))
             return false;
+        if (type == null) {
+            if (other.type != null)
+                return false;
+        } else if (!type.equals(other.type))
+            return false;
         if (userID == null) {
             if (other.userID != null)
                 return false;
diff --git a/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertCLI.java
index 835a522e1..db6867b2d 100644
--- a/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertCLI.java
@@ -53,10 +53,12 @@ public class TPSCertCLI extends CLI {
         System.out.println("  Cert ID: " + cert.getID());
         if (cert.getSerialNumber() != null) System.out.println("  Serial Number: " + cert.getSerialNumber());
         if (cert.getSubject() != null) System.out.println("  Subject: " + cert.getSubject());
+        if (cert.getUserID() != null) System.out.println("  User ID: " + cert.getUserID());
         if (cert.getTokenID() != null) System.out.println("  Token ID: " + cert.getTokenID());
+        if (cert.getOrigin() != null) System.out.println("  Origin: " + cert.getOrigin());
+        if (cert.getType() != null) System.out.println("  Type: " + cert.getType());
         if (cert.getKeyType() != null) System.out.println("  Key Type: " + cert.getKeyType());
         if (cert.getStatus() != null) System.out.println("  Status: " + cert.getStatus());
-        if (cert.getUserID() != null) System.out.println("  User ID: " + cert.getUserID());
         if (cert.getCreateTime() != null) System.out.println("  Create Time: " + cert.getCreateTime());
         if (cert.getModifyTime() != null) System.out.println("  Modify Time: " + cert.getModifyTime());

-- 
2.13.5