Fix fallback manual code signing 2 (#229)

* Move devportalclient initislization and automatic code signing assets management into codesign.Manager.prepareAutomaticAssets

* Add Login func to DevPortalClient

* Fix ioutil deprecations

Author: godrei

autocodesign/autocodesign.go

@@ -69,6 +69,8 @@ type Certificate struct {
 
 // DevPortalClient abstract away the Apple Developer Portal API
 type DevPortalClient interface {
+	Login() error
+
 	QueryCertificateBySerial(serial big.Int) (Certificate, error)
 	QueryAllIOSCertificates() (map[appstoreconnect.CertificateType][]Certificate, error)
 

autocodesign/certdownloader/certdownloader_test.go

@@ -1,9 +1,9 @@
 package certdownloader
 
 import (
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"testing"
 	"time"
 
@@ -20,7 +20,7 @@ func Test_downloader_GetCertificates_Local(t *testing.T) {
 		t.Errorf("init: failed to encode certificate: %s", err)
 	}
 
-	p12File, err := ioutil.TempFile("", "*.p12")
+	p12File, err := os.CreateTemp("", "*.p12")
 	if err != nil {
 		t.Errorf("init: failed to create temp test file: %s", err)
 	}

autocodesign/codesignasset/writer.go

@@ -3,7 +3,6 @@ package codesignasset
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 
@@ -101,7 +100,7 @@ func (w Writer) InstallProfile(profile autocodesign.Profile) error {
 	}
 
 	name := path.Join(profilesDir, profile.Attributes().UUID+ext)
-	if err := ioutil.WriteFile(name, profile.Attributes().ProfileContent, 0600); err != nil {
+	if err := os.WriteFile(name, profile.Attributes().ProfileContent, 0600); err != nil {
 		return fmt.Errorf("failed to write profile to file: %s", err)
 	}
 

autocodesign/devportalclient/appstoreconnect/appstoreconnect.go

@@ -9,7 +9,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"reflect"
@@ -179,7 +178,7 @@ func checkResponse(r *http.Response) error {
 	}
 
 	errorResponse := &ErrorResponse{Response: r}
-	data, err := ioutil.ReadAll(r.Body)
+	data, err := io.ReadAll(r.Body)
 	if err == nil && data != nil {
 		if err := json.Unmarshal(data, errorResponse); err != nil {
 			log.Errorf("Failed to unmarshal response (%s): %s", string(data), err)

autocodesign/devportalclient/appstoreconnectclient/auth.go

@@ -0,0 +1,15 @@
+package appstoreconnectclient
+
+// AuthClient ...
+type AuthClient struct {
+}
+
+// NewAuthClient ...
+func NewAuthClient() *AuthClient {
+	return &AuthClient{}
+}
+
+// Login ...
+func (c *AuthClient) Login() error {
+	return nil
+}

autocodesign/devportalclient/appstoreconnectclient/client.go

@@ -10,6 +10,7 @@ import (
 
 // Client ...
 type Client struct {
+	*AuthClient
 	*CertificateSource
 	*DeviceClient
 	*ProfileClient
@@ -18,6 +19,7 @@ type Client struct {
 // NewAPIDevPortalClient ...
 func NewAPIDevPortalClient(client *appstoreconnect.Client) autocodesign.DevPortalClient {
 	return Client{
+		AuthClient:        NewAuthClient(),
 		CertificateSource: NewCertificateSource(client),
 		DeviceClient:      NewDeviceClient(client),
 		ProfileClient:     NewProfileClient(client),

autocodesign/devportalclient/appstoreconnectclient/profiles_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 
@@ -178,13 +178,13 @@ func newResponse(t *testing.T, status int, body map[string]interface{}) *http.Re
 	resp := http.Response{
 		StatusCode: status,
 		Header:     http.Header{},
-		Body:       ioutil.NopCloser(nil),
+		Body:       io.NopCloser(nil),
 	}
 
 	if body != nil {
 		var buff bytes.Buffer
 		require.NoError(t, json.NewEncoder(&buff).Encode(body))
-		resp.Body = ioutil.NopCloser(&buff)
+		resp.Body = io.NopCloser(&buff)
 		resp.ContentLength = int64(buff.Len())
 	}
 

autocodesign/devportalclient/spaceship/auth.go

@@ -0,0 +1,34 @@
+package spaceship
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// AuthClient ...
+type AuthClient struct {
+	client *Client
+}
+
+// NewAuthClient ...
+func NewAuthClient(client *Client) *AuthClient {
+	return &AuthClient{client: client}
+}
+
+// Login ...
+func (c *AuthClient) Login() error {
+	output, err := c.client.runSpaceshipCommand("login")
+	if err != nil {
+		return fmt.Errorf("running command failed with error: %w", err)
+	}
+
+	var teamIDResponse struct {
+		Data string `json:"data"`
+	}
+	if err := json.Unmarshal([]byte(output), &teamIDResponse); err != nil {
+		return fmt.Errorf("failed to unmarshal response: %w", err)
+	}
+
+	c.client.teamID = teamIDResponse.Data
+	return nil
+}

autocodesign/devportalclient/spaceship/spaceship.go

@@ -43,44 +43,17 @@ func NewClient(authConfig appleauth.AppleID, teamID string, cmdFactory ruby.Comm
 		return nil, err
 	}
 
-	c := &Client{
+	return &Client{
 		workDir:    dir,
 		authConfig: authConfig,
 		teamID:     teamID,
 		cmdFactory: cmdFactory,
-	}
-
-	currentTeamID, err := c.login()
-	if err != nil {
-		return nil, fmt.Errorf("spaceship command failed: %s", err)
-	}
-
-	log.Debugf("current team id: %s", currentTeamID)
-
-	c.teamID = currentTeamID
-
-	return c, nil
-}
-
-func (c *Client) login() (string, error) {
-	output, err := c.runSpaceshipCommand("login")
-	if err != nil {
-		return "", fmt.Errorf("running command failed with error: %s", err)
-	}
-
-	// {"data":"72SA8V3WYL"}
-	var teamIDResponse struct {
-		Data string `json:"data"`
-	}
-	if err := json.Unmarshal([]byte(output), &teamIDResponse); err != nil {
-		return "", fmt.Errorf("failed to unmarshal response: %v", err)
-	}
-
-	return teamIDResponse.Data, nil
+	}, nil
 }
 
 // DevPortalClient ...
 type DevPortalClient struct {
+	*AuthClient
 	*CertificateSource
 	*ProfileClient
 	*DeviceClient
@@ -89,6 +62,7 @@ type DevPortalClient struct {
 // NewSpaceshipDevportalClient ...
 func NewSpaceshipDevportalClient(client *Client) autocodesign.DevPortalClient {
 	return DevPortalClient{
+		AuthClient:        NewAuthClient(client),
 		CertificateSource: NewSpaceshipCertificateSource(client),
 		DeviceClient:      NewDeviceClient(client),
 		ProfileClient:     NewSpaceshipProfileClient(client),

autocodesign/keychain/keychain_test.go

@@ -1,7 +1,6 @@
 package keychain
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -14,7 +13,7 @@ import (
 )
 
 func TestCreateKeychain(t *testing.T) {
-	dir, err := ioutil.TempDir("", "test-create-keychain")
+	dir, err := os.MkdirTemp("", "test-create-keychain")
 	if err != nil {
 		t.Errorf("setup: create temp dir for keychain: %s", err)
 	}
@@ -38,7 +37,7 @@ func TestKeychain_importCertificate(t *testing.T) {
 	)
 
 	// Create test keychain
-	dirTmp, err := ioutil.TempDir("", "test-import-certificate")
+	dirTmp, err := os.MkdirTemp("", "test-import-certificate")
 	if err != nil {
 		t.Fatalf("setup: create temp dir for keychain: %s", err)
 	}
@@ -82,7 +81,7 @@ func TestKeychain_importCertificate(t *testing.T) {
 	}
 
 	testcertPath := filepath.Join(dirTmp, "TestCert.p12")
-	if err := ioutil.WriteFile(testcertPath, pfxData, 0600); err != nil {
+	if err := os.WriteFile(testcertPath, pfxData, 0600); err != nil {
 		t.Fatalf("Setup: failed to write test p12 file.")
 	}