Merge pull request #164 from gphotosuploader/add-config-auth

Add a new command to refresh tokens

CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/) and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## 1.0.1
+### Added
+- New command `auth` to authenticate against Google Photos. It's useful to refresh authentication tokens. ([#125][i125])
+
+[i125]: https://github.com/gphotosuploader/gphotos-uploader-cli/issues/125
+
 ## 1.0.0
 > This is a **major upgrade** and it has several **non-backwards compatible changes**. See more details below.
 ### Added

cmd/auth.go

@@ -0,0 +1,71 @@
+package cmd
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/spf13/cobra"
+	"golang.org/x/oauth2"
+
+	"github.com/gphotosuploader/gphotos-uploader-cli/app"
+	"github.com/gphotosuploader/gphotos-uploader-cli/cmd/flags"
+	"github.com/gphotosuploader/gphotos-uploader-cli/config"
+	"github.com/gphotosuploader/gphotos-uploader-cli/photos"
+)
+
+// InitCmd holds the required data for the init cmd
+type AuthCmd struct {
+	*flags.GlobalFlags
+}
+
+func NewAuthCmd(globalFlags *flags.GlobalFlags) *cobra.Command {
+	cmd := &AuthCmd{GlobalFlags: globalFlags}
+
+	authCmd := &cobra.Command{
+		Use:   "auth",
+		Short: "Authenticate with Google Photos to refresh tokens",
+		Long:  `Force authentication against Google Photos to refresh tokens.`,
+		Args:  cobra.NoArgs,
+		RunE:  cmd.Run,
+	}
+
+	return authCmd
+}
+
+func (cmd *AuthCmd) Run(cobraCmd *cobra.Command, args []string) error {
+	cfg, err := config.LoadConfigAndValidate(cmd.CfgDir)
+	if err != nil {
+		return fmt.Errorf("please review your configuration or run 'gphotos-uploader-cli init': file=%s, err=%s", cmd.CfgDir, err)
+	}
+
+	cli, err := app.Start(cfg)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		_ = cli.Stop()
+	}()
+
+	// get OAuth2 Configuration with our App credentials
+	oauth2Config := oauth2.Config{
+		ClientID:     cfg.APIAppCredentials.ClientID,
+		ClientSecret: cfg.APIAppCredentials.ClientSecret,
+		Endpoint:     photos.Endpoint,
+		Scopes:       photos.Scopes,
+	}
+
+	ctx := context.Background()
+	for _, job := range cfg.Jobs {
+		if _, err := cli.NewOAuth2Client(ctx, oauth2Config, job.Account); err != nil {
+			cli.Logger.Failf("Failed authentication for account: %s", job.Account)
+			cli.Logger.Debugf("Authentication error: err=%s", err)
+			return err
+		}
+		cli.Logger.Donef("Successful authentication for account: %s", job.Account)
+	}
+
+	return nil
+}
+
+
+

cmd/root.go

@@ -64,6 +64,7 @@ func init() {
 	rootCmd.AddCommand(NewVersionCmd())
 	rootCmd.AddCommand(NewInitCmd(globalFlags))
 	rootCmd.AddCommand(NewPushCmd(globalFlags))
+	rootCmd.AddCommand(NewAuthCmd(globalFlags))
 }
 
 // GetRoot returns the root command