[Pki-devel] [PATCH] 0138 Move AuthToken key constants to IAuthToken

[Fraser Tweedale]

The attached patch moves some string constants from AuthToken to
IAuthToken.  External authentication support will bring a new
implementation of IAuthToken so moving these to the interface
simplifies things.

Thanks,
Fraser
-------------- next part --------------
From 8118f83cc7691e48c63111a050540c9180fd29e5 Mon Sep 17 00:00:00 2001
From: Fraser Tweedale <ftweedal at redhat.com>
Date: Tue, 29 Nov 2016 16:10:58 +1000
Subject: [PATCH 138/141] Move AuthToken key constants to IAuthToken

Part of: https://fedorahosted.org/pki/ticket/1359
---
 .../netscape/certsrv/authentication/AuthToken.java | 34 ----------------------
 .../certsrv/authentication/IAuthToken.java         | 34 ++++++++++++++++++++++
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/base/common/src/com/netscape/certsrv/authentication/AuthToken.java b/base/common/src/com/netscape/certsrv/authentication/AuthToken.java
index 0febf87727d2ebde9dbcacbd5059f9b9afa13701..53959b131f2d9a99e6b9b65640f8546e84468c66 100644
--- a/base/common/src/com/netscape/certsrv/authentication/AuthToken.java
+++ b/base/common/src/com/netscape/certsrv/authentication/AuthToken.java
@@ -51,40 +51,6 @@ import com.netscape.certsrv.usrgrp.Certificates;
 public class AuthToken implements IAuthToken {
     protected Hashtable<String, Object> mAttrs = null;
 
-    /* Subject name of the certificate in the authenticating entry */
-    public static final String TOKEN_CERT_SUBJECT = "tokenCertSubject";
-
-    /* NotBefore value of the certificate in the authenticating entry */
-    public static final String TOKEN_CERT_NOTBEFORE = "tokenCertNotBefore";
-
-    /* NotAfter value of the certificate in the authenticating entry */
-    public static final String TOKEN_CERT_NOTAFTER = "tokenCertNotAfter";
-
-    /* Cert Extentions value of the certificate in the authenticating entry */
-    public static final String TOKEN_CERT_EXTENSIONS = "tokenCertExts";
-
-    /* Serial number of the certificate in the authenticating entry */
-    public static final String TOKEN_CERT_SERIALNUM = "certSerial";
-
-    /**
-     * Certificate to be renewed
-     */
-    public static final String TOKEN_CERT = "tokenCert";
-
-    /* Certificate to be revoked */
-    public static final String TOKEN_CERT_TO_REVOKE = "tokenCertToRevoke";
-
-    /**
-     * Name of the authentication manager that created the AuthToken
-     * as a string.
-     */
-    public static final String TOKEN_AUTHMGR_INST_NAME = "authMgrInstName";
-
-    /**
-     * Time of authentication as a java.util.Date
-     */
-    public static final String TOKEN_AUTHTIME = "authTime";
-
     /**
      * Constructs an instance of a authentication token.
      * The token by default contains the following attributes: <br>
diff --git a/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java b/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java
index a71432446edcf6b5d838f1115df16b26acd01dce..a3f240e9c35987462eb2f176de650a769df1005c 100644
--- a/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java
+++ b/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java
@@ -41,6 +41,40 @@ public interface IAuthToken {
     public static final String UID = "uid";
     public static final String GROUPS = "groups";
 
+    /* Subject name of the certificate in the authenticating entry */
+    public static final String TOKEN_CERT_SUBJECT = "tokenCertSubject";
+
+    /* NotBefore value of the certificate in the authenticating entry */
+    public static final String TOKEN_CERT_NOTBEFORE = "tokenCertNotBefore";
+
+    /* NotAfter value of the certificate in the authenticating entry */
+    public static final String TOKEN_CERT_NOTAFTER = "tokenCertNotAfter";
+
+    /* Cert Extentions value of the certificate in the authenticating entry */
+    public static final String TOKEN_CERT_EXTENSIONS = "tokenCertExts";
+
+    /* Serial number of the certificate in the authenticating entry */
+    public static final String TOKEN_CERT_SERIALNUM = "certSerial";
+
+    /**
+     * Certificate to be renewed
+     */
+    public static final String TOKEN_CERT = "tokenCert";
+
+    /* Certificate to be revoked */
+    public static final String TOKEN_CERT_TO_REVOKE = "tokenCertToRevoke";
+
+    /**
+     * Name of the authentication manager that created the AuthToken
+     * as a string.
+     */
+    public static final String TOKEN_AUTHMGR_INST_NAME = "authMgrInstName";
+
+    /**
+     * Time of authentication as a java.util.Date
+     */
+    public static final String TOKEN_AUTHTIME = "authTime";
+
     /**
      * Sets an attribute value within this AttrSet.
      *
-- 
2.7.4