feat: support refresh token (#30)

mijime · Jun 29, 2021 · 24a3a0e · 24a3a0e
1 parent 99493bb
commit 24a3a0e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/v2/cmd/beareq-oapi/main.go b/v2/cmd/beareq-oapi/main.go
@@ -22,6 +22,7 @@ func main() {
 	flag.StringVar(&cb.Profile, "profile", cb.Profile, "")
 	flag.StringVar(&cb.ProfilesPath, "profiles", cb.ProfilesPath, "")
 	flag.StringVar(&cb.TokenDir, "tokens", cb.TokenDir, "")
+	flag.BoolVar(&cb.RefreshToken, "refresh-token", cb.RefreshToken, "")
 
 	rh := handler.NewResponseHandler()
 	flag.Var(&rh.JSONQuery, "jq", "")

diff --git a/v2/cmd/beareq/main.go b/v2/cmd/beareq/main.go
@@ -16,6 +16,7 @@ func main() {
 	flag.StringVar(&cb.Profile, "profile", cb.Profile, "")
 	flag.StringVar(&cb.ProfilesPath, "profiles", cb.ProfilesPath, "")
 	flag.StringVar(&cb.TokenDir, "tokens", cb.TokenDir, "")
+	flag.BoolVar(&cb.RefreshToken, "refresh-token", cb.RefreshToken, "")
 
 	rb := rbuilder.NewRequestBuilder()
 	flag.Var(&rb.Method, "request", "Specify request command to use")

diff --git a/v2/pkg/client/builder/client_builder.go b/v2/pkg/client/builder/client_builder.go
@@ -25,6 +25,7 @@ type ClientBuilder struct {
 	Profile      string
 	ProfilesPath string
 	TokenDir     string
+	RefreshToken bool
 }
 
 func osGetEnv(key string, defaultValue string) string {
@@ -153,7 +154,7 @@ func (b *ClientBuilder) fetchToken(config *oauth2.Config) (*oauth2.Token, error)
 	tokenPath := path.Join(b.TokenDir, b.Profile+".json")
 
 	tokfp, err := os.Open(tokenPath)
-	if errors.Is(err, os.ErrNotExist) {
+	if b.RefreshToken || errors.Is(err, os.ErrNotExist) {
 		return generateToken(config)
 	}