fix(client): Add environmental variable KEYFACTOR_API_PATH to allow for custom API path specification.

fix(store): Inventory to parse from kf10 correctly.

Author: spbsoluble

v2/api/client.go

@@ -21,12 +21,15 @@ var (
 	EnvCommandUsername = "KEYFACTOR_USERNAME"
 	EnvCommandPassword = "KEYFACTOR_PASSWORD"
 	EnvCommandDomain   = "KEYFACTOR_DOMAIN"
+	EnvCommandAPI      = "KEYFACTOR_API_PATH"
+	DefaultAPIPath     = "KeyfactorAPI"
 )
 
 type Client struct {
 	hostname        string
 	httpClient      *http.Client
 	basicAuthString string
+	apiPath         string
 }
 
 // AuthConfig is a struct holding all necessary client configuration data
@@ -37,6 +40,7 @@ type AuthConfig struct {
 	Username string
 	Password string
 	Domain   string
+	APIPath  string
 }
 
 // NewKeyfactorClient creates a new Keyfactor client instance. A configured Client is returned with methods used to
@@ -61,6 +65,14 @@ func loginToKeyfactor(auth *AuthConfig) (*Client, error) {
 			return nil, fmt.Errorf("%s is required", EnvCommandHostname)
 		}
 	}
+	if auth.APIPath == "" {
+		envAPIPath := os.Getenv(EnvCommandAPI)
+		if envAPIPath != "" {
+			auth.APIPath = envAPIPath
+		} else {
+			auth.APIPath = DefaultAPIPath
+		}
+	}
 	if auth.Username == "" {
 		envUsername := os.Getenv(EnvCommandUsername)
 		if envUsername != "" {
@@ -103,6 +115,7 @@ func loginToKeyfactor(auth *AuthConfig) (*Client, error) {
 		hostname:        auth.Hostname,
 		httpClient:      &http.Client{Timeout: 10 * time.Second},
 		basicAuthString: buildBasicAuthString(auth),
+		apiPath:         auth.APIPath,
 	}
 
 	_, err := c.sendRequest(keyfactorAPIStruct)
@@ -129,7 +142,7 @@ func (c *Client) sendRequest(request *request) (*http.Response, error) {
 	if u.Scheme != "https" {
 		u.Scheme = "https"
 	}
-	endpoint := "KeyfactorAPI/" + request.Endpoint
+	endpoint := fmt.Sprintf("%s/", strings.Trim(c.apiPath, "/")) + request.Endpoint
 	u.Path = path.Join(u.Path, endpoint) // Attach enroll endpoint
 
 	// Set request query

v2/api/store.go

@@ -406,9 +406,22 @@ func (c *Client) GetCertStoreInventory(storeId string) (*[]CertStoreInventory, e
 			if !ok {
 				params = map[string]interface{}{}
 			}
+
+			certMetadata := storedCert.(map[string]interface{})
+			// certMetadata["Certificates"] is an array of interface{}s
+			invItemId := 0
+			if certMetadata["Certificates"] != nil {
+				certsList := certMetadata["Certificates"].([]interface{})
+				certInstances := certsList[0].(map[string]interface{}) // todo: will this ever contain > 1?
+				invItemId = int(certInstances["Id"].(float64))
+				//certInstances := certsList["Certificates"].(map[string]interface{})
+				//invItemId = int(certInstances["Id"].(float64))
+				//invItemId = int(certObjs.([]interface{})[0].(map[string]interface{})["Id"].(float64))
+			}
+
 			invC := CertStoreInventory{
 				Name:                     storedCert.(map[string]interface{})["Name"].(string),
-				CertStoreInventoryItemId: int(storedCert.(map[string]interface{})["CertStoreInventoryItemId"].(float64)),
+				CertStoreInventoryItemId: invItemId,
 				Certificates:             []InventoriedCertificate{},
 				Parameters:               params,
 				Thumbprints:              map[string]bool{},