Merge pull request #6 from adohkan/5_IAPFix

[5] Fix for IAP Auth Issues

Author: ryanm101

cmd/git-remote-https+iap/main.go

@@ -92,8 +92,8 @@ func execute(cmd *cobra.Command, args []string) {
 	remote, url := args[0], args[1]
 	log.Debug().Msgf("%s %s %s", binaryName, remote, url)
 
-	handleIAPAuthCookieFor(url)
-	git.PassThruRemoteHTTPSHelper(remote, url)
+	c := handleIAPAuthCookieFor(url)
+	git.PassThruRemoteHTTPSHelper(remote, url, c.Token.Raw)
 }
 
 func check(cmd *cobra.Command, args []string) {
@@ -147,7 +147,7 @@ func configureIAP(cmd *cobra.Command, args []string) {
 	git.SetGlobalConfig(https, "http", "cookieFile", cookiePath)
 }
 
-func handleIAPAuthCookieFor(url string) {
+func handleIAPAuthCookieFor(url string) *iap.Cookie {
 	// All our work will be based on the basedomain of the provided URL
 	// as IAP would be setup for the whole domain.
 	url, err := toHTTPSBaseDomain(url)
@@ -172,6 +172,8 @@ func handleIAPAuthCookieFor(url string) {
 	if err != nil {
 		log.Fatal().Msg(err.Error())
 	}
+
+	return cookie
 }
 
 func toHTTPSBaseDomain(addr string) (string, error) {

go.mod

@@ -4,22 +4,22 @@ go 1.17
 
 require (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/int128/oauth2cli v1.10.0
-	github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
-	github.com/rs/zerolog v1.18.0
-	github.com/spf13/cobra v0.0.6
+	github.com/int128/oauth2cli v1.14.0
+	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
+	github.com/rs/zerolog v1.26.1
+	github.com/spf13/cobra v1.3.0
 	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
-	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 )
 
 require (
-	cloud.google.com/go v0.65.0 // indirect
+	cloud.google.com/go v0.99.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/int128/listener v1.0.0 // indirect
-	github.com/spf13/pflag v1.0.3 // indirect
-	golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	github.com/int128/listener v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
+	golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
 )