Add support for using username in get account

authn/authn.go

@@ -98,9 +98,9 @@ func (ac *Client) claimsFromVerifier(idToken string, verifier JWTClaimsExtractor
 	return claims, nil
 }
 
-// GetAccount gets the account with the associated id
-func (ac *Client) GetAccount(id string) (*Account, error) { // Should this be a string or an int?
-	return ac.iclient.GetAccount(id)
+// GetAccount gets the account with the associated id or username
+func (ac *Client) GetAccount(idOrUsername string) (*Account, error) {
+	return ac.iclient.GetAccount(idOrUsername)
 }
 
 // Update updates the account with the associated id

authn/internal_client.go

@@ -75,9 +75,9 @@ func (ic *internalClient) Key(kid string) ([]jose.JSONWebKey, error) {
 	return jwks.Key(kid), nil
 }
 
-// GetAccount gets the account details for the specified account id
-func (ic *internalClient) GetAccount(id string) (*Account, error) {
-	resp, err := ic.doWithAuth(get, "accounts/"+id, nil)
+// GetAccount gets the account details for the specified account id or username
+func (ic *internalClient) GetAccount(idOrUsername string) (*Account, error) {
+	resp, err := ic.doWithAuth(get, "accounts/"+idOrUsername, nil)
 	if err != nil {
 		return nil, err
 	}

authn/internal_client_test.go

@@ -52,10 +52,10 @@ func testingHTTPClient(handler http.Handler) (*http.Client, func()) {
 // Based on information at https://keratin.github.io/authn-server/#/api?id=get-account
 func TestICGetAccount(t *testing.T) {
 	type request struct {
-		url        string
-		htusername string
-		htpassword string
-		id         string
+		url          string
+		htusername   string
+		htpassword   string
+		idOrUsername string
 	}
 	type response struct {
 		id       int
@@ -71,10 +71,10 @@ func TestICGetAccount(t *testing.T) {
 	}{
 		{
 			request: request{
-				url:        "http://test.com",
-				htusername: "username",
-				htpassword: "password",
-				id:         "1",
+				url:          "http://test.com",
+				htusername:   "username",
+				htpassword:   "password",
+				idOrUsername: "1",
 			},
 			response: response{
 				id:       1,
@@ -87,10 +87,26 @@ func TestICGetAccount(t *testing.T) {
 		},
 		{
 			request: request{
-				url:        "http://test.com",
-				htusername: "username",
-				htpassword: "password",
-				id:         "1",
+				url:          "http://test.com",
+				htusername:   "username",
+				htpassword:   "password",
+				idOrUsername: "[email protected]",
+			},
+			response: response{
+				id:       1,
+				username: "[email protected]",
+				locked:   true,
+				deleted:  true,
+				code:     http.StatusOK,
+				errorMsg: "",
+			},
+		},
+		{
+			request: request{
+				url:          "http://test.com",
+				htusername:   "username",
+				htpassword:   "password",
+				idOrUsername: "1",
 			},
 			response: response{
 				code:     http.StatusNotFound,
@@ -106,7 +122,7 @@ func TestICGetAccount(t *testing.T) {
 			assert.Equal(t, http.MethodGet, r.Method)
 			assert.Equal(t, tc.request.htusername, username)
 			assert.Equal(t, tc.request.htpassword, password)
-			assert.Equal(t, "/accounts/"+tc.request.id, r.URL.Path)
+			assert.Equal(t, "/accounts/"+tc.request.idOrUsername, r.URL.Path)
 			w.WriteHeader(tc.response.code)
 			//if we're mocking a good request, return the json
 			if tc.response.code == http.StatusOK {
@@ -129,7 +145,7 @@ func TestICGetAccount(t *testing.T) {
 		}
 		cli.client = httpClient
 
-		account, err := cli.GetAccount(tc.request.id)
+		account, err := cli.GetAccount(tc.request.idOrUsername)
 		if tc.response.errorMsg == "" { //Expecting no error
 			assert.Nil(t, err)
 			assert.Equal(t, tc.response.id, account.ID)