Fix client grant importing

Signed-off-by: Brendan Devenney <[email protected]>

auth0/auth0_client.go

@@ -332,6 +332,36 @@ func (authClient *AuthClient) DeleteApiById(id string) error {
 	return nil
 }
 
+// GetClientGrantById retrieves a client grant based on ID.
+//
+// Note that this is significantly heavier than GetClientGrantByClientIdAndAudience due to the Auth0 API's lack of
+// ID-based retrieval.
+func (authClient *AuthClient) GetClientGrantById(id string) (*ClientGrant, error) {
+
+	_, body, errs := gorequest.New().
+		Get(authClient.config.apiUri+"client-grants").
+		Set("Authorization", authClient.config.getAuthenticationHeader()).
+		End()
+
+	if errs != nil {
+		return nil, fmt.Errorf("could parse client-grant response from auth0, error: %v", errs)
+	}
+
+	clientGrant := make([]ClientGrant, 0)
+	err := json.Unmarshal([]byte(body), &clientGrant)
+	if err != nil {
+		return nil, fmt.Errorf("could not parse auth0 get client-grant response, error: %v %s", err, body)
+	}
+
+	for _, grant := range clientGrant {
+		if grant.Id == id {
+			return &grant, nil
+		}
+	}
+
+	return nil, nil
+}
+
 // ClientGrant
 func (authClient *AuthClient) GetClientGrantByClientIdAndAudience(clientId string, audience string) (*ClientGrant, error) {
 

auth0/resource_auth0_client_grant.go

@@ -56,13 +56,20 @@ func resourceAuth0ClientGrantCreate(d *schema.ResourceData, meta interface{}) er
 }
 
 func resourceAuth0ClientGrantRead(d *schema.ResourceData, meta interface{}) error {
+	var clientGrant *ClientGrant
+	var err error
 
 	auth0Client := meta.(*AuthClient)
 
 	clientId := readStringFromResource(d, "client_id")
 	audience := readStringFromResource(d, "audience")
 
-	clientGrant, err := auth0Client.GetClientGrantByClientIdAndAudience(clientId, audience)
+	if clientId != "" && audience != "" {
+		clientGrant, err = auth0Client.GetClientGrantByClientIdAndAudience(clientId, audience)
+	} else {
+		// This is necessary for ID-only import but it's significantly heavier than querying by client ID and audience
+		clientGrant, err = auth0Client.GetClientGrantById(d.Id())
+	}
 
 	if err != nil {
 		return fmt.Errorf("could not find auth0 client-grant: %v", err)