Skip to content

Commit

Permalink
dep: go mod: update
Browse files Browse the repository at this point in the history
  • Loading branch information
grokify committed Dec 13, 2021
1 parent 4acb3c4 commit 0d542a4
Show file tree
Hide file tree
Showing 41 changed files with 125 additions and 191 deletions.
4 changes: 2 additions & 2 deletions aha/aha_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"

"github.com/grokify/goauth"
hum "github.com/grokify/simplego/net/httputilmore"
"github.com/grokify/mogo/net/httputilmore"
"golang.org/x/oauth2"
)

Expand Down Expand Up @@ -33,7 +33,7 @@ func NewClient(subdomain, token string) *http.Client {
header := http.Header{}
header.Add(AhaAccountHeader, subdomain)

client.Transport = hum.TransportWithHeaders{
client.Transport = httputilmore.TransportWithHeaders{
Transport: client.Transport,
Header: header}
return client
Expand Down
2 changes: 1 addition & 1 deletion aha/aha_clientutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"

"github.com/grokify/goauth/scim"
"github.com/grokify/simplego/strconv/humannameparser"
"github.com/grokify/mogo/strconv/humannameparser"
)

// ClientUtil is a client library to retrieve user info
Expand Down
2 changes: 1 addition & 1 deletion aha/examples/scim_user/scim_user.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/joho/godotenv"

"github.com/grokify/goauth/aha"
"github.com/grokify/simplego/fmt/fmtutil"
"github.com/grokify/mogo/fmt/fmtutil"
)

func loadEnv() error {
Expand Down
4 changes: 2 additions & 2 deletions auth0/auth0.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"net/http"

"github.com/google/go-querystring/query"
hum "github.com/grokify/simplego/net/httputilmore"
"github.com/grokify/mogo/net/httputilmore"
)

func CreatePKCECodeVerifier() string {
Expand Down Expand Up @@ -83,7 +83,7 @@ func (tu *PKCETokenUrlInfo) Exchange() (*http.Response, error) {
if err != nil {
return nil, err
}
req.Header.Set(hum.HeaderContentType, hum.ContentTypeAppJsonUtf8)
req.Header.Set(httputilmore.HeaderContentType, httputilmore.ContentTypeAppJsonUtf8)
client := &http.Client{}
return client.Do(req)
}
10 changes: 5 additions & 5 deletions auth0/examples/auth-code-pkce/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/bmizerany/pat"
"github.com/caarlos0/env"
"github.com/grokify/simplego/config"
hum "github.com/grokify/simplego/net/httputilmore"
"github.com/grokify/mogo/config"
"github.com/grokify/mogo/net/httputilmore"

"github.com/rs/zerolog"
zlog "github.com/rs/zerolog/log"
Expand Down Expand Up @@ -52,7 +52,7 @@ func (cfg *appConfig) LoginHandler(w http.ResponseWriter, r *http.Request) {
}
zlog.Debug().
Str("remoteAddr", r.RemoteAddr).
Str("userAgent", r.Header.Get(hum.HeaderUserAgent)).
Str("userAgent", r.Header.Get(httputilmore.HeaderUserAgent)).
Str("authUrl", authUrl).
Str("challenge", challenge).
Str("verifier", verifier).
Expand All @@ -76,7 +76,7 @@ func (cfg *appConfig) LoginHandler(w http.ResponseWriter, r *http.Request) {
// in production.
cookie := http.Cookie{Name: VerifierCookieName, Value: verifier}
http.SetCookie(w, &cookie)
w.Header().Set(hum.HeaderContentType, hum.ContentTypeTextHtmlUtf8)
w.Header().Set(httputilmore.HeaderContentType, httputilmore.ContentTypeTextHtmlUtf8)
w.WriteHeader(http.StatusOK)
fmt.Fprintf(w, tmpl, WebsiteTitle, WebsiteTitle, verifier, challenge, authUrl)
zlog.Debug().Msg("END_LOGIN_HANDLER")
Expand Down Expand Up @@ -133,7 +133,7 @@ func (cfg *appConfig) Oauth2CallbackHandler(w http.ResponseWriter, r *http.Reque
</body>
</html>`

w.Header().Set(hum.HeaderContentType, hum.ContentTypeTextHtmlUtf8)
w.Header().Set(httputilmore.HeaderContentType, httputilmore.ContentTypeTextHtmlUtf8)
w.WriteHeader(http.StatusOK)
fmt.Fprintf(w, tmpl, WebsiteTitle, WebsiteTitle, string(respBody))
zlog.Debug().Msg("END_LOGIN_HANDLER")
Expand Down
7 changes: 3 additions & 4 deletions basicauth.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ import (
"net/http"
"strings"

"github.com/grokify/simplego/net/httputilmore"
hum "github.com/grokify/simplego/net/httputilmore"
"github.com/grokify/simplego/time/timeutil"
"github.com/grokify/mogo/net/httputilmore"
"github.com/grokify/mogo/time/timeutil"
"golang.org/x/oauth2"
)

Expand Down Expand Up @@ -61,7 +60,7 @@ func NewClientBasicAuth(username, password string, tlsInsecureSkipVerify bool) (
client = ClientTLSInsecureSkipVerify(client)
}

client.Transport = hum.TransportWithHeaders{
client.Transport = httputilmore.TransportWithHeaders{
Header: header,
Transport: client.Transport}
return client, nil
Expand Down
4 changes: 2 additions & 2 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"net/http"
"strings"

"github.com/grokify/simplego/net/httputilmore"
"github.com/grokify/simplego/time/timeutil"
"github.com/grokify/mogo/net/httputilmore"
"github.com/grokify/mogo/time/timeutil"
"golang.org/x/oauth2"
)

Expand Down
2 changes: 1 addition & 1 deletion credentials/credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/grokify/goauth"
"github.com/grokify/goauth/endpoints"
"github.com/grokify/simplego/net/http/httpsimple"
"github.com/grokify/mogo/net/http/httpsimple"
"github.com/pkg/errors"
"golang.org/x/oauth2"
)
Expand Down
2 changes: 1 addition & 1 deletion credentials/credentials_oauth2.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"

"github.com/grokify/goauth"
"github.com/grokify/simplego/net/urlutil"
"github.com/grokify/mogo/net/urlutil"
"github.com/pkg/errors"
"golang.org/x/oauth2"
"golang.org/x/oauth2/clientcredentials"
Expand Down
2 changes: 1 addition & 1 deletion credentials/credentials_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"sort"
"strings"

"github.com/grokify/simplego/encoding/jsonutil"
"github.com/grokify/mogo/encoding/jsonutil"
"github.com/pkg/errors"
)

Expand Down
11 changes: 7 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,22 @@ require (
github.com/astaxie/beego v1.12.3
github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f
github.com/caarlos0/env v3.5.0+incompatible
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/google/go-querystring v1.1.0
github.com/grokify/go-salesforce v0.1.7
github.com/grokify/gocharts v1.16.1
github.com/grokify/go-salesforce v0.1.8
github.com/grokify/gocharts v1.16.2
github.com/grokify/gostor v0.2.1
github.com/grokify/simplego v0.31.0
github.com/grokify/mogo v0.32.2
github.com/jessevdk/go-flags v1.5.0
github.com/joho/godotenv v1.4.0
github.com/kylelemons/go-gypsy v1.0.0 // indirect
github.com/nyaruka/phonenumbers v1.0.73
github.com/pkg/errors v0.9.1
github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7
github.com/rs/zerolog v1.26.0
github.com/ziutek/mymysql v1.5.4 // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
google.golang.org/api v0.60.0
google.golang.org/api v0.62.0
gopkg.in/jeevatkm/go-model.v1 v1.1.0
)
Loading

0 comments on commit 0d542a4

Please sign in to comment.