isMultiOrgMember should accept client not create

Faris Huskovic · Faris Huskovic · commit 0ee26d4edd0b · 2020-10-27T14:13:11.000-05:00
diff --git a/internal/cmd/ceapi.go b/internal/cmd/ceapi.go
@@ -178,12 +178,7 @@ func getImgs(ctx context.Context, conf getImgsConf) ([]coder.Image, error) {
 	return nil, xerrors.Errorf("org name %q not found", conf.orgName)
 }
 
-func isMultiOrgMember(ctx context.Context, email string) (bool, error) {
-	client, err := newClient()
-	if err != nil {
-		return false, err
-	}
-
+func isMultiOrgMember(ctx context.Context, client *coder.Client, email string) (bool, error) {
 	u, err := client.UserByEmail(ctx, email)
 	if err != nil {
 		return false, xerrors.New("email not found")
diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go
@@ -167,20 +167,20 @@ coder envs create --cpu 4 --disk 100 --memory 8 --image 5f443b16-30652892427b955
 				return xerrors.New("image unset")
 			}
 
-			multiOrgMember, err := isMultiOrgMember(cmd.Context(), *user)
+			client, err := newClient()
 			if err != nil {
 				return err
 			}
 
-			if multiOrgMember && org == "" {
-				return xerrors.New("org is required for multi-org members")
-			}
-
-			client, err := newClient()
+			multiOrgMember, err := isMultiOrgMember(cmd.Context(), client, *user)
 			if err != nil {
 				return err
 			}
 
+			if multiOrgMember && org == "" {
+				return xerrors.New("org is required for multi-org members")
+			}
+
 			importedImg, err := findImg(cmd.Context(),
 				findImgConf{
 					client:  client,
@@ -284,7 +284,7 @@ coder envs edit back-end-env --disk 20`,
 				return err
 			}
 
-			multiOrgMember, err := isMultiOrgMember(cmd.Context(), *user)
+			multiOrgMember, err := isMultiOrgMember(cmd.Context(), client, *user)
 			if err != nil {
 				return err
 			}
