better naming

Author: tonymet

rest/callback_handler.go

@@ -59,13 +59,13 @@ func (h *callbackHandler) getCredentials(oauthConfig *oauth2.Config) (*oauth2.To
 	url := oauthConfig.AuthCodeURL(h.state, oauth2.AccessTypeOffline, oauth2.ApprovalForce, oauth2.S256ChallengeOption(verifier))
 	code, state, err := h.authHandler(url, oauthConfig.ClientID)
 	if err != nil {
-		panic(err)
+		return &oauth2.Token{}, err
 	}
 	if state != h.state {
-		panic(fmt.Errorf("state mismatch expect %s, received %s", h.state, state))
+		return &oauth2.Token{}, fmt.Errorf("state mismatch expect %s, received %s", h.state, state)
 	}
 	if tok, err := oauthConfig.Exchange(ctx, code, oauth2.VerifierOption(verifier)); err != nil {
-		panic(err)
+		return &oauth2.Token{}, err
 	} else {
 		return tok, nil
 	}

rest/dailer_test.go

@@ -96,8 +96,6 @@ func setupTest() *http.Client {
 			return (&net.Dialer{}).DialContext(ctx, network, tsMicrosoft.Listener.Addr().String())
 		},
 		DialTLSContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
-			// Redirect all connections to test server's listener
-			// Redirect all connections to test server's listener
 			var ts *httptest.Server
 			switch addr {
 			case "login.microsoftonline.com:443":

rest/rest_json_gcs.go rest/rest_gcs.gorest/rest_json_gcs.go renamed to rest/rest_gcs.go

@@ -51,7 +51,7 @@ func NewProviderGoogle(provider, sender string, storage ConfigStorage) (IProvide
 	return p, nil
 }
 
-func (p *GoogleProvider) sendMessageRest(bodyReader io.ReadCloser) (*http.Response, error) {
+func (p *GoogleProvider) sendMessageRest(bodyReader io.Reader) (*http.Response, error) {
 	if requestBody, err := io.ReadAll(bodyReader); err != nil {
 		panic(err)
 	} else {

rest/rest_google.go

@@ -41,16 +41,16 @@ func (mh messageHeader) mimeHeader() io.Reader {
 	return strings.NewReader(header.String())
 }
 
-func encodeMessage(in io.Reader, args []string) (io.ReadCloser, error) {
+func encodeMessage(in io.Reader, args []string) (io.Reader, error) {
 	header := parseArgs(args)
 	var encodedBuf = bytes.NewBuffer(make([]byte, 0, 2048))
 	messageEncoder := base64.NewEncoder(base64.StdEncoding, encodedBuf)
 	defer messageEncoder.Close() //nolint: errcheck
 	if _, err := io.Copy(messageEncoder, header.mimeHeader()); err != nil {
-		panic(err)
+		return nil, err
 	}
 	if _, err := io.Copy(messageEncoder, in); err != nil {
-		panic(err)
+		return nil, err
 	}
-	return io.NopCloser(encodedBuf), nil
+	return encodedBuf, nil
 }

rest/rest_message.go

@@ -19,11 +19,9 @@ func PathToken(prefix, provider, id string) string {
 	return path.Join(prefix, fmt.Sprintf("token-%s-%s.json", provider, id))
 }
 
-func CreateInitialToken(oauthConfig *oauth2.Config, provider, sender string, storage ConfigStorage) {
+func CreateInitialToken(oauthConfig *oauth2.Config, provider, sender string, storage ConfigStorage) error {
 	var savedToken = SavedToken{token: &oauth2.Token{}, config: oauthConfig, provider: provider, id: sender, Storage: storage}
-	if err := savedToken.Save(); err != nil {
-		panic(err)
-	}
+	return savedToken.Save()
 }
 
 func OAuthFlowToken(oauthConfig *oauth2.Config, provider, sender string, storage ConfigStorage) {

rest/rest_oauth.go

@@ -172,9 +172,11 @@ func RunApp(c *AppConfigContainer, args []string) {
 		}
 		sConfig.ConfigParams = c.InitConfig
 		err := sConfig.Save()
+		if err != nil {
+			log.Fatal(err)
+		}
 		initConfig := oauth2.Config{ClientID: sConfig.ConfigParams.Web.ClientID}
-		CreateInitialToken(&initConfig, c.Provider, c.Sender, storageToken)
-
+		err = CreateInitialToken(&initConfig, c.Provider, c.Sender, storageToken)
 		if err != nil {
 			log.Fatal(err)
 		}