Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor auth: add token and store implementations #1230

Merged
merged 12 commits into from
Feb 24, 2020
Merged

Refactor auth: add token and store implementations #1230

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
acd21cb
Refactor auth: add token and memory implementations
Feb 21, 2020
ec2430b
Fix typo
Feb 21, 2020
0dccaaf
Merge branch 'master' of https://github.com/micro/go-micro into auth-…
Feb 24, 2020
7353f1f
Remove memory auth (implemented already by the store implementation),…
Feb 24, 2020
22bda22
Add grpc header
Feb 24, 2020
a21da58
Global Config
Feb 24, 2020
7bf9096
config/global => util/config
Feb 24, 2020
c374065
Merge branch 'master' into auth-refactor
ben-toogood Feb 24, 2020
683687f
Rename package to remove confict
Feb 24, 2020
c029316
Merge branch 'auth-refactor' of https://github.com/micro/go-micro int…
Feb 24, 2020
99ea8e4
Tweak
Feb 24, 2020
bde97c9
Improve Error Handling
Feb 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
config/global => util/config
  • Loading branch information
Ben Toogood committed Feb 24, 2020
commit 7bf90963ecb1fe013b85a48a992b42ba35106648
4 changes: 2 additions & 2 deletions client/grpc/grpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"github.com/micro/go-micro/v2/client"
"github.com/micro/go-micro/v2/client/selector"
raw "github.com/micro/go-micro/v2/codec/bytes"
"github.com/micro/go-micro/v2/config/global"
"github.com/micro/go-micro/v2/errors"
"github.com/micro/go-micro/v2/metadata"
"github.com/micro/go-micro/v2/registry"
"github.com/micro/go-micro/v2/util/config"

"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
Expand Down Expand Up @@ -125,7 +125,7 @@ func (g *grpcClient) call(ctx context.Context, node *registry.Node, req client.R
// set the content type for the request
header["x-content-type"] = req.ContentType()
// set the authorization token if one is saved locally
if token, err := global.Get("token"); err != nil && len(token) > 0 {
if token, err := config.Get("token"); err != nil && len(token) > 0 {
header["authorization"] = fmt.Sprintf("Bearer %v", token)
}

Expand Down
1 change: 1 addition & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ github.com/mholt/certmagic v0.9.3 h1:RmzuNJ5mpFplDbyS41z+gGgE/py24IX6m0nHZ0yNTQU
github.com/mholt/certmagic v0.9.3/go.mod h1:nu8jbsbtwK4205EDH/ZUMTKsfYpJA1Q7MKXHfgTihNw=
github.com/micro/cli/v2 v2.1.2 h1:43J1lChg/rZCC1rvdqZNFSQDrGT7qfMrtp6/ztpIkEM=
github.com/micro/cli/v2 v2.1.2/go.mod h1:EguNh6DAoWKm9nmk+k/Rg0H3lQnDxqzu5x5srOtGtYg=
github.com/micro/go-micro v1.18.0 h1:gP70EZVHpJuUIT0YWth192JmlIci+qMOEByHm83XE9E=
github.com/micro/mdns v0.3.0 h1:bYycYe+98AXR3s8Nq5qvt6C573uFTDPIYzJemWON0QE=
github.com/micro/mdns v0.3.0/go.mod h1:KJ0dW7KmicXU2BV++qkLlmHYcVv7/hHnbtguSWt9Aoc=
github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
Expand Down
2 changes: 1 addition & 1 deletion config/global/global.go → util/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package global
package config

import (
"io/ioutil"
Expand Down