client tweaks

atproto/client/admin_auth.go

···
 import (
 	"encoding/base64"
 	"net/http"
-
-	"github.com/bluesky-social/indigo/atproto/syntax"
 )
 
 type AdminAuth struct {
···
 	return AdminAuth{basicAuthHeader: header}
 }
 
-func (a *AdminAuth) DoWithAuth(req *http.Request, httpClient *http.Client) (*http.Response, error) {
+func (a *AdminAuth) DoWithAuth(c *http.Client, req *http.Request) (*http.Response, error) {
 	req.Header.Set("Authorization", a.basicAuthHeader)
-	return httpClient.Do(req)
-}
-
-// Admin bearer token auth does not involve an account DID
-func (a *AdminAuth) AccountDID() syntax.DID {
-	return ""
+	return c.Do(req)
 }

atproto/client/api_client.go

···
 
 	var resp *http.Response
 	if c.Auth != nil {
-		resp, err = c.Auth.DoWithAuth(httpReq, c.HTTPClient)
+		resp, err = c.Auth.DoWithAuth(c.HTTPClient, httpReq)
 	} else {
 		resp, err = c.HTTPClient.Do(httpReq)
 	}

atproto/client/auth_method.go

···
 )
 
 type AuthMethod interface {
-	DoWithAuth(req *http.Request, c *http.Client) (*http.Response, error)
+	DoWithAuth(c *http.Client, req *http.Request) (*http.Response, error)
 }

atproto/client/examples_test.go

···
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 
 	appbsky "github.com/bluesky-social/indigo/api/bsky"
···
 	params := map[string]string{
 		"actor": "atproto.com",
 	}
-	b, err := c.Get(ctx, endpoint, params)
-	if err != nil {
-		panic(err)
-	}
-
 	var profile appbsky.ActorDefs_ProfileViewDetailed
-	if err := json.Unmarshal(*b, &profile); err != nil {
+	if err := c.Get(ctx, endpoint, params, &profile); err != nil {
 		panic(err)
 	}
 

atproto/client/refresh_auth.go

···
 // TODO:
 //func NewRefreshAuth(pdsHost, accountIdentifier, password string) (*RefreshAuth, error) {
 
-func (a *RefreshAuth) DoWithAuth(req *http.Request, c *http.Client) (*http.Response, error) {
+func (a *RefreshAuth) DoWithAuth(c *http.Client, req *http.Request) (*http.Response, error) {
 	req.Header.Set("Authorization", "Bearer "+a.AccessToken)
 	// XXX: check response. if it is 403, because access token is expired, then take a lock and do a refresh
 	// TODO: when doing a refresh request, copy at least the User-Agent header from httpReq, and re-use httpClient
-	return c.Do(httpReq)
+	return c.Do(req)
 }
 
 // updates the client with the new auth method
···
 	}
 
 	if out.Active != nil && *out.Active == false {
-		return nil, fmt.Errorf("account is disabled: %s", out.Status)
+		return nil, fmt.Errorf("account is disabled: %v", out.Status)
 	}
 
 	ra := RefreshAuth{