unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 1 Actions Packages Projects Releases 259 Wiki Activity

Update interface to add provider and make secret optional

Browse Source
This commit is contained in:
Ben Toogood 2020-03-31 19:01:43 +01:00
parent cffb0a1eae
commit 82bc3cbf8d
6 changed files with 153 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
auth/auth.go
View File

@ -32,9 +32,9 @@ type Auth interface {
// Options set for auth // Options set for auth
Options() Options Options() Options
// Generate a new account // Generate a new account
Generate(id, secret string, opts ...GenerateOption) (*Account, error) Generate(id string, opts ...GenerateOption) (*Account, error)
// Login to an existing account // Login to an existing account
Login(id, secret string) (*Account, error) Login(id string, opts ...LoginOption) (*Account, error)
// Grant access to a resource // Grant access to a resource
Grant(role string, res *Resource) error Grant(role string, res *Resource) error
// Revoke access to a resource // Revoke access to a resource
@ -61,10 +61,12 @@ type Resource struct {
// Account provided by an auth provider // Account provided by an auth provider
type Account struct { type Account struct {
// Type of the account, e.g. service
Type string `json:"type"`
// ID of the account e.g. email // ID of the account e.g. email
ID string `json:"id"` ID string `json:"id"`
// Type of the account, e.g. service
Type string `json:"type"`
// Provider who issued the account
Provider string `json:"provider"`
// RefreshToken used to renew the account // RefreshToken used to renew the account
RefreshToken string `json:"refresh_token"` RefreshToken string `json:"refresh_token"`
// Roles associated with the Account // Roles associated with the Account

4
auth/default.go
View File

@ -34,7 +34,7 @@ func (n *noop) Options() Options {
} }
// Generate a new account // Generate a new account
func (n *noop) Generate(id, secret string, opts ...GenerateOption) (*Account, error) { func (n *noop) Generate(id string, opts ...GenerateOption) (*Account, error) {
options := NewGenerateOptions(opts...) options := NewGenerateOptions(opts...)
return &Account{ return &Account{
@ -46,7 +46,7 @@ func (n *noop) Generate(id, secret string, opts ...GenerateOption) (*Account, er
} }
// Login to an existing account // Login to an existing account
func (n *noop) Login(id, secret string) (*Account, error) { func (n *noop) Login(id string, opts ...LoginOption) (*Account, error) {
return &Account{ID: id}, nil return &Account{ID: id}, nil
} }

50
auth/options.go
View File

@ -78,10 +78,23 @@ type GenerateOptions struct {
Roles []string Roles []string
// Namespace the account belongs too // Namespace the account belongs too
Namespace string Namespace string
// Secret to use with the account
Secret string
// Provider of the account, e.g. oauth
Provider string
// Type of the account, e.g. user
Type string
} }
type GenerateOption func(o *GenerateOptions) type GenerateOption func(o *GenerateOptions)
// WithType for the generated account
func WithType(t string) GenerateOption {
return func(o *GenerateOptions) {
o.Type = t
}
}
// WithMetadata for the generated account // WithMetadata for the generated account
func WithMetadata(md map[string]string) GenerateOption { func WithMetadata(md map[string]string) GenerateOption {
return func(o *GenerateOptions) { return func(o *GenerateOptions) {
@ -103,6 +116,20 @@ func WithNamespace(n string) GenerateOption {
} }
} }
// WithSecret for the generated account
func WithSecret(s string) GenerateOption {
return func(o *GenerateOptions) {
o.Secret = s
}
}
// WithProvider for the generated account
func WithProvider(p string) GenerateOption {
return func(o *GenerateOptions) {
o.Provider = p
}
}
// NewGenerateOptions from a slice of options // NewGenerateOptions from a slice of options
func NewGenerateOptions(opts ...GenerateOption) GenerateOptions { func NewGenerateOptions(opts ...GenerateOption) GenerateOptions {
var options GenerateOptions var options GenerateOptions
@ -112,6 +139,29 @@ func NewGenerateOptions(opts ...GenerateOption) GenerateOptions {
return options return options
} }
type LoginOptions struct {
// Secret to use for rlogin
Secret string
}
type LoginOption func(o *LoginOptions)
// WithLoginSecret for the generated account
func WithLoginSecret(s string) LoginOption {
return func(o *LoginOptions) {
o.Secret = s
}
}
// NewLoginOptions from a slice of options
func NewLoginOptions(opts ...LoginOption) LoginOptions {
var options LoginOptions
for _, o := range opts {
o(&options)
}
return options
}
type TokenOptions struct { type TokenOptions struct {
// TokenExpiry is the time the token should live for // TokenExpiry is the time the token should live for
TokenExpiry time.Duration TokenExpiry time.Duration

150
auth/service/proto/auth.pb.go
View File

@ -214,13 +214,13 @@ func (m *Token) GetNamespace() string {
} }
type Account struct { type Account struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
// string secret = 2; Type string `protobuf:"bytes,2,opt,name=type,proto3" json:"type,omitempty"`
Roles []string `protobuf:"bytes,3,rep,name=roles,proto3" json:"roles,omitempty"` Roles []string `protobuf:"bytes,3,rep,name=roles,proto3" json:"roles,omitempty"`
Metadata map[string]string `protobuf:"bytes,4,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` Metadata map[string]string `protobuf:"bytes,4,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
Namespace string `protobuf:"bytes,5,opt,name=namespace,proto3" json:"namespace,omitempty"` Namespace string `protobuf:"bytes,5,opt,name=namespace,proto3" json:"namespace,omitempty"`
Type string `protobuf:"bytes,6,opt,name=type,proto3" json:"type,omitempty"` RefreshToken string `protobuf:"bytes,6,opt,name=refresh_token,json=refreshToken,proto3" json:"refresh_token,omitempty"`
RefreshToken string `protobuf:"bytes,7,opt,name=refresh_token,json=refreshToken,proto3" json:"refresh_token,omitempty"` Provider string `protobuf:"bytes,7,opt,name=provider,proto3" json:"provider,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
@ -258,6 +258,13 @@ func (m *Account) GetId() string {
return "" return ""
} }
func (m *Account) GetType() string {
if m != nil {
return m.Type
}
return ""
}
func (m *Account) GetRoles() []string { func (m *Account) GetRoles() []string {
if m != nil { if m != nil {
return m.Roles return m.Roles
@ -279,16 +286,16 @@ func (m *Account) GetNamespace() string {
return "" return ""
} }
func (m *Account) GetType() string { func (m *Account) GetRefreshToken() string {
if m != nil { if m != nil {
return m.Type return m.RefreshToken
} }
return "" return ""
} }
func (m *Account) GetRefreshToken() string { func (m *Account) GetProvider() string {
if m != nil { if m != nil {
return m.RefreshToken return m.Provider
} }
return "" return ""
} }
@ -441,6 +448,7 @@ type GenerateRequest struct {
Namespace string `protobuf:"bytes,4,opt,name=namespace,proto3" json:"namespace,omitempty"` Namespace string `protobuf:"bytes,4,opt,name=namespace,proto3" json:"namespace,omitempty"`
Secret string `protobuf:"bytes,5,opt,name=secret,proto3" json:"secret,omitempty"` Secret string `protobuf:"bytes,5,opt,name=secret,proto3" json:"secret,omitempty"`
Type string `protobuf:"bytes,6,opt,name=type,proto3" json:"type,omitempty"` Type string `protobuf:"bytes,6,opt,name=type,proto3" json:"type,omitempty"`
Provider string `protobuf:"bytes,7,opt,name=provider,proto3" json:"provider,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
@ -513,6 +521,13 @@ func (m *GenerateRequest) GetType() string {
return "" return ""
} }
func (m *GenerateRequest) GetProvider() string {
if m != nil {
return m.Provider
}
return ""
}
type GenerateResponse struct { type GenerateResponse struct {
Account *Account `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` Account *Account `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
@ -1221,64 +1236,65 @@ func init() {
} }
var fileDescriptor_11312eec02fd5712 = []byte{ var fileDescriptor_11312eec02fd5712 = []byte{
// 931 bytes of a gzipped FileDescriptorProto // 947 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x6d, 0x6f, 0xdb, 0x36, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xdd, 0x8e, 0xdb, 0x44,
0x10, 0x8e, 0x24, 0x5b, 0x56, 0xce, 0x96, 0x63, 0xb0, 0x69, 0x26, 0xb8, 0x2f, 0xcb, 0xd4, 0x61, 0x14, 0x5e, 0xdb, 0x89, 0xe3, 0x3d, 0x89, 0xb3, 0xd1, 0x74, 0xbb, 0x58, 0xe9, 0x0f, 0x8b, 0x8b,
0xc8, 0x8a, 0x55, 0x19, 0x5c, 0x60, 0x6f, 0x05, 0x86, 0x19, 0xb5, 0xe1, 0xb5, 0x6b, 0x3d, 0x4c, 0xd0, 0x52, 0xd1, 0x2c, 0x4a, 0x25, 0xfe, 0x2a, 0x21, 0xa2, 0x26, 0x0a, 0x2d, 0x6d, 0x10, 0x56,
0xe8, 0xd0, 0x7d, 0x19, 0x0a, 0x45, 0xbe, 0x26, 0x5a, 0x1c, 0xc9, 0x13, 0xa9, 0x60, 0xf9, 0x01, 0x51, 0xb9, 0x41, 0x95, 0xd7, 0x39, 0xdd, 0x35, 0x9b, 0xb5, 0xc3, 0xcc, 0x78, 0xc5, 0x3e, 0x01,
0xc3, 0xf6, 0x69, 0xff, 0x64, 0xfb, 0x45, 0xfb, 0x31, 0x03, 0x29, 0x52, 0x91, 0x25, 0xb9, 0x08, 0x77, 0xbc, 0x03, 0x12, 0xb7, 0xf0, 0x44, 0x3c, 0x0c, 0x9a, 0xf1, 0x8c, 0xd7, 0x71, 0x9c, 0x6a,
0xda, 0x7c, 0xd8, 0x37, 0xde, 0xf1, 0x78, 0xf7, 0x3c, 0xf7, 0x42, 0x12, 0x3e, 0x3f, 0x8e, 0xd8, 0x55, 0x16, 0x89, 0xbb, 0x39, 0x33, 0x67, 0xbe, 0x73, 0xbe, 0xf3, 0x37, 0x03, 0x9f, 0x1e, 0xc7,
0x49, 0x76, 0xe4, 0x85, 0xc9, 0xd9, 0xe1, 0x59, 0x14, 0xa6, 0xc9, 0xe1, 0x71, 0xf2, 0x20, 0x5f, 0xfc, 0x24, 0x3b, 0x1a, 0x44, 0xe9, 0xd9, 0xe1, 0x59, 0x1c, 0xd1, 0xf4, 0xf0, 0x38, 0x7d, 0x90,
0x04, 0x19, 0x3b, 0x39, 0xa4, 0x98, 0x9e, 0x47, 0x21, 0x1e, 0xae, 0xd2, 0x84, 0xe5, 0x2a, 0x4f, 0x2f, 0xc2, 0x8c, 0x9f, 0x1c, 0x32, 0xa4, 0xe7, 0x71, 0x84, 0x87, 0x4b, 0x9a, 0xf2, 0x7c, 0x6b,
0x2c, 0x89, 0x7d, 0x9c, 0x78, 0xc2, 0xce, 0xe3, 0x4a, 0xf7, 0x26, 0xdc, 0x78, 0x16, 0x51, 0x36, 0x20, 0x97, 0xc4, 0x3d, 0x4e, 0x07, 0x52, 0x6f, 0x20, 0x36, 0xfd, 0x9b, 0x70, 0xe3, 0x59, 0xcc,
0x0e, 0xc3, 0x24, 0x8b, 0x19, 0xf5, 0xf1, 0xd7, 0x0c, 0x29, 0x73, 0x9f, 0xc2, 0xee, 0xba, 0x9a, 0xf8, 0x28, 0x8a, 0xd2, 0x2c, 0xe1, 0x2c, 0xc0, 0x9f, 0x33, 0x64, 0xdc, 0x7f, 0x0a, 0xbb, 0xab,
0xae, 0x92, 0x98, 0x22, 0x19, 0x81, 0x15, 0x48, 0x9d, 0xa3, 0xed, 0x1b, 0x07, 0xdd, 0xd1, 0x9e, 0xdb, 0x6c, 0x99, 0x26, 0x0c, 0xc9, 0x10, 0x9c, 0x50, 0xed, 0x79, 0xc6, 0xbe, 0x75, 0xd0, 0x1e,
0xb7, 0xe6, 0xd0, 0x93, 0x47, 0xfc, 0xc2, 0xce, 0xfd, 0x47, 0x87, 0xf6, 0x8b, 0xe4, 0x14, 0x63, 0xee, 0x0d, 0x56, 0x00, 0x07, 0xea, 0x4a, 0x50, 0xe8, 0xf9, 0x7f, 0x99, 0xd0, 0x7c, 0x91, 0x9e,
0xb2, 0x0b, 0x6d, 0xc6, 0x17, 0x8e, 0xb6, 0xaf, 0x1d, 0x6c, 0xfb, 0xb9, 0x40, 0x08, 0xb4, 0xd8, 0x62, 0x42, 0x76, 0xa1, 0xc9, 0xc5, 0xc2, 0x33, 0xf6, 0x8d, 0x83, 0xed, 0x20, 0x17, 0x08, 0x81,
0xc5, 0x0a, 0x1d, 0x5d, 0x28, 0xc5, 0x9a, 0x38, 0xd0, 0x09, 0x53, 0x0c, 0x18, 0x2e, 0x1c, 0x63, 0x06, 0xbf, 0x58, 0xa2, 0x67, 0xca, 0x4d, 0xb9, 0x26, 0x1e, 0xb4, 0x22, 0x8a, 0x21, 0xc7, 0xb9,
0x5f, 0x3b, 0x30, 0x7c, 0x25, 0x92, 0x3d, 0x30, 0xf1, 0xb7, 0x55, 0x94, 0x5e, 0x38, 0x2d, 0xb1, 0x67, 0xed, 0x1b, 0x07, 0x56, 0xa0, 0x45, 0xb2, 0x07, 0x36, 0xfe, 0xb2, 0x8c, 0xe9, 0x85, 0xd7,
0x21, 0x25, 0x7e, 0x82, 0x66, 0x47, 0xbf, 0x60, 0xc8, 0x9c, 0xb6, 0x70, 0xa4, 0x44, 0x1e, 0x35, 0x90, 0x07, 0x4a, 0x12, 0x37, 0x58, 0x76, 0xf4, 0x13, 0x46, 0xdc, 0x6b, 0x4a, 0x20, 0x2d, 0x0a,
0x4d, 0x96, 0x48, 0x1d, 0x73, 0xdf, 0xe0, 0x51, 0x85, 0x40, 0xbe, 0x06, 0xeb, 0x0c, 0x59, 0xb0, 0xab, 0x34, 0x5d, 0x20, 0xf3, 0xec, 0x7d, 0x4b, 0x58, 0x95, 0x02, 0xf9, 0x12, 0x9c, 0x33, 0xe4,
0x08, 0x58, 0xe0, 0x74, 0x04, 0x13, 0xb7, 0xc2, 0x44, 0x60, 0xf6, 0x9e, 0x4b, 0xa3, 0x69, 0xcc, 0xe1, 0x3c, 0xe4, 0xa1, 0xd7, 0x92, 0x4c, 0xfc, 0x0a, 0x13, 0xe9, 0xf3, 0xe0, 0xb9, 0x52, 0x9a,
0xd2, 0x0b, 0xbf, 0x38, 0x43, 0x6e, 0xc3, 0x76, 0x1c, 0x9c, 0x21, 0x5d, 0x05, 0x21, 0x3a, 0x96, 0x24, 0x9c, 0x5e, 0x04, 0xc5, 0x1d, 0x72, 0x1b, 0xb6, 0x93, 0xf0, 0x0c, 0xd9, 0x32, 0x8c, 0xd0,
0x88, 0x78, 0xa9, 0x18, 0x3e, 0x02, 0x7b, 0xed, 0x20, 0x19, 0x80, 0x71, 0x8a, 0x17, 0x92, 0x38, 0x73, 0xa4, 0xc5, 0xcb, 0x8d, 0xfe, 0x23, 0x70, 0x57, 0x2e, 0x92, 0x1e, 0x58, 0xa7, 0x78, 0xa1,
0x5f, 0x72, 0x58, 0xe7, 0xc1, 0x32, 0x53, 0xbc, 0x73, 0xe1, 0x2b, 0xfd, 0x0b, 0xcd, 0xfd, 0x5d, 0x88, 0x8b, 0xa5, 0x70, 0xeb, 0x3c, 0x5c, 0x64, 0x9a, 0x77, 0x2e, 0x7c, 0x61, 0x7e, 0x66, 0xf8,
0x87, 0x8e, 0x4c, 0x23, 0xe9, 0x83, 0x1e, 0x2d, 0xe4, 0x31, 0x3d, 0x5a, 0x5c, 0x92, 0x31, 0xca, 0xbf, 0x9b, 0xd0, 0x52, 0x61, 0x24, 0x5d, 0x30, 0xe3, 0xb9, 0xba, 0x66, 0xc6, 0xf3, 0xda, 0x60,
0x64, 0xbe, 0x29, 0x91, 0x69, 0x09, 0x32, 0x1f, 0x36, 0x97, 0xe5, 0x6a, 0x74, 0xda, 0x15, 0x3a, 0x15, 0x04, 0xad, 0x32, 0xc1, 0xaf, 0x4a, 0x04, 0x1b, 0x92, 0xe0, 0xfb, 0xf5, 0xa9, 0xba, 0x1a,
0x45, 0x89, 0xcc, 0x52, 0x89, 0xee, 0x81, 0x9d, 0xe2, 0xeb, 0x14, 0xe9, 0xc9, 0xab, 0xbc, 0xa8, 0xc5, 0x66, 0x85, 0x22, 0xb9, 0x07, 0x2e, 0xc5, 0xd7, 0x14, 0xd9, 0xc9, 0xab, 0x3c, 0xa9, 0xb6,
0x1d, 0xb1, 0xd9, 0x93, 0x4a, 0x91, 0xbd, 0x77, 0xcb, 0xc3, 0x1c, 0x2c, 0x1f, 0x69, 0x92, 0xa5, 0xd4, 0xe8, 0xa8, 0xcd, 0x3c, 0xe3, 0x7d, 0x70, 0x96, 0x34, 0x3d, 0x8f, 0xe7, 0x48, 0xbd, 0x96,
0x39, 0x02, 0x0e, 0x47, 0x1e, 0x14, 0xeb, 0xc6, 0xc6, 0x19, 0x82, 0x85, 0xf1, 0x62, 0x95, 0x44, 0x3c, 0x2f, 0xe4, 0x7f, 0x17, 0xa3, 0x19, 0x38, 0x01, 0xb2, 0x34, 0xa3, 0x11, 0x8a, 0x98, 0x08,
0x31, 0x13, 0x9d, 0xb3, 0xed, 0x17, 0xb2, 0xfb, 0x19, 0xf4, 0x9e, 0x25, 0xc7, 0x51, 0x2c, 0x9b, 0xb7, 0xd4, 0x45, 0xb9, 0xae, 0x8d, 0x53, 0x1f, 0x1c, 0x4c, 0xe6, 0xcb, 0x34, 0x4e, 0xb8, 0xac,
0xbc, 0x96, 0xdb, 0x3d, 0x30, 0x29, 0x86, 0x29, 0x32, 0xe9, 0x51, 0x4a, 0xee, 0x18, 0x6c, 0x79, 0xaa, 0xed, 0xa0, 0x90, 0xfd, 0x4f, 0xa0, 0xf3, 0x2c, 0x3d, 0x8e, 0x13, 0xd5, 0x00, 0x6b, 0x71,
0x4e, 0x4e, 0xc1, 0xa7, 0xd0, 0x91, 0xdd, 0x2d, 0x4e, 0x6f, 0x1e, 0x02, 0x65, 0xe6, 0xfe, 0xa9, 0xdf, 0x03, 0x9b, 0x61, 0x44, 0x91, 0x2b, 0x44, 0x25, 0xf9, 0x23, 0x70, 0xd5, 0x3d, 0xd5, 0x21,
0xc3, 0xce, 0x0c, 0x63, 0x4c, 0x03, 0x86, 0x9b, 0xc2, 0x17, 0xa5, 0xd5, 0xcb, 0xa5, 0xfd, 0xb6, 0x1f, 0x43, 0x4b, 0x55, 0xbe, 0xbc, 0xbd, 0xb9, 0x41, 0xb4, 0x9a, 0xff, 0x87, 0x09, 0x3b, 0x53,
0x54, 0x5a, 0x43, 0x94, 0xf6, 0x93, 0x4a, 0xb0, 0x8a, 0xdf, 0xab, 0x95, 0xb8, 0x55, 0x2d, 0xf1, 0x4c, 0x90, 0x86, 0x1c, 0x37, 0x99, 0x2f, 0x52, 0x6c, 0x96, 0x53, 0xfc, 0x75, 0x29, 0xc5, 0x96,
0x25, 0xf9, 0x76, 0x99, 0x7c, 0x53, 0xe9, 0xdf, 0xad, 0xaa, 0x13, 0x18, 0x5c, 0x22, 0x7e, 0xeb, 0x4c, 0xf1, 0x47, 0x15, 0x63, 0x15, 0xdc, 0xab, 0xa5, 0xba, 0x51, 0x4d, 0xf5, 0x25, 0xf9, 0x66,
0x84, 0xbe, 0x84, 0xde, 0x2c, 0x0d, 0x62, 0xa6, 0x92, 0x49, 0xa0, 0xc5, 0xf3, 0xa5, 0xfa, 0x83, 0x99, 0x7c, 0x11, 0x64, 0x7b, 0x35, 0xc8, 0xff, 0x4d, 0xc6, 0xc7, 0xd0, 0xbb, 0x64, 0xf3, 0xd6,
0xaf, 0xc9, 0x43, 0xb0, 0x52, 0xd9, 0x3f, 0x02, 0x46, 0x77, 0xf4, 0x5e, 0xc5, 0xad, 0x6a, 0x2f, 0xc1, 0x7e, 0x09, 0x9d, 0x29, 0x0d, 0x13, 0xae, 0x03, 0x4d, 0xa0, 0x21, 0x62, 0xa9, 0x6b, 0x47,
0xbf, 0x30, 0x74, 0x77, 0xc0, 0x96, 0x8e, 0x73, 0x6c, 0xee, 0x4f, 0x60, 0xfb, 0x78, 0x9e, 0x9c, 0xac, 0xc9, 0x43, 0x70, 0xa8, 0xaa, 0x2d, 0xe9, 0x46, 0x7b, 0xf8, 0x4e, 0x05, 0x56, 0x97, 0x5e,
0xe2, 0xb5, 0x87, 0x1a, 0x40, 0x5f, 0x79, 0x96, 0xb1, 0x3e, 0x82, 0xfe, 0x93, 0x98, 0xae, 0x30, 0x50, 0x28, 0xfa, 0x3b, 0xe0, 0x2a, 0xe0, 0xdc, 0x37, 0xff, 0x07, 0x70, 0x03, 0x3c, 0x4f, 0x4f,
0x2c, 0x78, 0x35, 0x5e, 0x99, 0xee, 0x63, 0xd8, 0x29, 0xec, 0xde, 0x3a, 0x85, 0xaf, 0xa1, 0x27, 0xf1, 0xda, 0x4d, 0xf5, 0xa0, 0xab, 0x91, 0x95, 0xad, 0x0f, 0xa0, 0xfb, 0x24, 0x61, 0x4b, 0x8c,
0x86, 0x74, 0x53, 0x3f, 0xd6, 0x06, 0x5c, 0xaf, 0x0f, 0x38, 0xf9, 0x00, 0x7a, 0x62, 0xf3, 0x95, 0x0a, 0x5e, 0xb5, 0xa3, 0xd6, 0x7f, 0x0c, 0x3b, 0x85, 0xde, 0x5b, 0x87, 0xf0, 0x35, 0x74, 0x64,
0xbc, 0x94, 0xf3, 0xdb, 0xba, 0x2b, 0x74, 0x53, 0xa1, 0x72, 0x1f, 0x81, 0x2d, 0xe3, 0x48, 0xa8, 0x73, 0x6f, 0xaa, 0xd5, 0xb5, 0xc1, 0x60, 0xd6, 0x0c, 0x86, 0xf7, 0xa0, 0x23, 0x0f, 0x5f, 0xa9,
0xf7, 0xcb, 0x9c, 0xba, 0xa3, 0xdd, 0xa6, 0x7b, 0x57, 0x31, 0xfd, 0x4b, 0x83, 0x96, 0x9f, 0x2d, 0x61, 0x9e, 0x4f, 0xf9, 0xb6, 0xdc, 0x9b, 0xc8, 0x2d, 0xff, 0x11, 0xb8, 0xca, 0x8e, 0x72, 0xf5,
0xb1, 0x86, 0x4e, 0x55, 0x41, 0xdf, 0x50, 0x05, 0xe3, 0x8a, 0x55, 0x20, 0x0f, 0xc0, 0x0c, 0xc2, 0x7e, 0x99, 0x53, 0x7b, 0xb8, 0x5b, 0x37, 0xaf, 0x35, 0xd3, 0xdf, 0x0c, 0x68, 0x04, 0xd9, 0x02,
0x10, 0x29, 0x15, 0x33, 0xd1, 0x1f, 0xdd, 0xac, 0xe7, 0x0d, 0x29, 0xf5, 0xa5, 0x91, 0xfb, 0x87, 0xeb, 0x06, 0xa8, 0xcc, 0x82, 0xb9, 0x21, 0x0b, 0xd6, 0x15, 0xb3, 0x40, 0x1e, 0x80, 0x1d, 0x46,
0x06, 0xf6, 0x63, 0xf1, 0x16, 0x5d, 0x77, 0x3f, 0x94, 0x90, 0x18, 0x57, 0x41, 0x32, 0x80, 0xbe, 0x11, 0x32, 0x26, 0xfb, 0xa5, 0x3b, 0xbc, 0xb9, 0x1e, 0x37, 0x64, 0x2c, 0x50, 0x4a, 0xfe, 0xaf,
0x02, 0x22, 0xdb, 0x87, 0x63, 0x9b, 0xe0, 0x12, 0xff, 0x17, 0xd8, 0x14, 0x10, 0x89, 0xcd, 0x86, 0x06, 0xb8, 0x8f, 0xe5, 0x1b, 0x76, 0xdd, 0xf5, 0x50, 0xf2, 0xc4, 0xba, 0x8a, 0x27, 0x3d, 0xe8,
0x2e, 0xff, 0x51, 0xa8, 0x0f, 0xc6, 0x97, 0xd0, 0xcb, 0x45, 0xd9, 0x13, 0x1f, 0x43, 0x3b, 0xcd, 0x6a, 0x47, 0x54, 0xf9, 0x08, 0xdf, 0xc6, 0xb8, 0xc0, 0xff, 0x85, 0x6f, 0xda, 0x11, 0xe5, 0x9b,
0xf8, 0xe5, 0x97, 0xff, 0x2a, 0x6e, 0x54, 0x11, 0x65, 0x4b, 0xf4, 0x73, 0x8b, 0xfb, 0x1e, 0x98, 0x0b, 0x6d, 0xf1, 0x13, 0xd1, 0x1f, 0x93, 0xcf, 0xa1, 0x93, 0x8b, 0xaa, 0x26, 0x3e, 0x84, 0x26,
0x79, 0x34, 0xd2, 0x85, 0xce, 0x8f, 0xf3, 0xef, 0xe6, 0xdf, 0xbf, 0x9c, 0x0f, 0xb6, 0xb8, 0x30, 0xcd, 0xc4, 0x60, 0xcc, 0x7f, 0x23, 0x37, 0xaa, 0x1e, 0x65, 0x0b, 0x0c, 0x72, 0x8d, 0xfb, 0x03,
0xf3, 0xc7, 0xf3, 0x17, 0xd3, 0xc9, 0x40, 0x23, 0x00, 0xe6, 0x64, 0x3a, 0x7f, 0x32, 0x9d, 0x0c, 0xb0, 0x73, 0x6b, 0xa4, 0x0d, 0xad, 0xef, 0x67, 0xdf, 0xcc, 0xbe, 0x7d, 0x39, 0xeb, 0x6d, 0x09,
0xf4, 0xd1, 0xdf, 0x3a, 0xb4, 0xc6, 0x19, 0x3b, 0x21, 0xcf, 0xc1, 0x52, 0x37, 0x0f, 0xb9, 0xfb, 0x61, 0x1a, 0x8c, 0x66, 0x2f, 0x26, 0xe3, 0x9e, 0x41, 0x00, 0xec, 0xf1, 0x64, 0xf6, 0x64, 0x32,
0xe6, 0x4b, 0x74, 0xf8, 0xfe, 0xc6, 0x7d, 0xc9, 0x67, 0x8b, 0x3c, 0x85, 0x8e, 0x1c, 0x42, 0x72, 0xee, 0x99, 0xc3, 0x3f, 0x4d, 0x68, 0x8c, 0x32, 0x7e, 0x42, 0x9e, 0x83, 0xa3, 0x27, 0x0f, 0xb9,
0xa7, 0x62, 0xbd, 0x3e, 0xc4, 0xc3, 0xbb, 0x9b, 0xb6, 0x0b, 0x5f, 0x13, 0xf5, 0x45, 0xba, 0xd5, 0xfb, 0xe6, 0x01, 0xdb, 0x7f, 0x77, 0xe3, 0xb9, 0xe2, 0xb3, 0x45, 0x9e, 0x42, 0x4b, 0x35, 0x21,
0x38, 0x0c, 0xd2, 0xcf, 0xed, 0xe6, 0xcd, 0xb2, 0x17, 0xf1, 0x50, 0xd5, 0xbc, 0x94, 0x9f, 0xbd, 0xb9, 0x53, 0xd1, 0x5e, 0x6d, 0xe2, 0xfe, 0xdd, 0x4d, 0xc7, 0x05, 0xd6, 0x58, 0x7f, 0xad, 0x6e,
0x9a, 0x97, 0xb5, 0xb7, 0xcd, 0xdd, 0x1a, 0xfd, 0x0c, 0x96, 0xfa, 0xf7, 0x91, 0x1f, 0xa0, 0xc5, 0xd5, 0x36, 0x83, 0xc2, 0xb9, 0x5d, 0x7f, 0x58, 0x46, 0x91, 0x8f, 0xd8, 0x1a, 0x4a, 0xf9, 0x49,
0xcb, 0x44, 0xaa, 0x7f, 0xa3, 0x86, 0x3f, 0xe3, 0xf0, 0xde, 0x1b, 0x6d, 0x0a, 0xf7, 0xff, 0x6a, 0x5c, 0x43, 0x59, 0x79, 0xf7, 0xfc, 0xad, 0xe1, 0x8f, 0xe0, 0xe8, 0xff, 0x22, 0xf9, 0x0e, 0x1a,
0xd0, 0xe6, 0xe5, 0xa4, 0x64, 0x06, 0x66, 0xde, 0xc0, 0xa4, 0x0a, 0x69, 0x6d, 0xc0, 0x86, 0x77, 0x22, 0x4d, 0xa4, 0xfa, 0xa7, 0xaa, 0xf9, 0x6b, 0xf6, 0xef, 0xbd, 0x51, 0xa7, 0x80, 0xff, 0xdb,
0x36, 0xec, 0x16, 0xbc, 0x67, 0x60, 0xe6, 0xdd, 0x56, 0x73, 0xb4, 0x36, 0x0d, 0x35, 0x47, 0x95, 0x80, 0xa6, 0x48, 0x27, 0x23, 0x53, 0xb0, 0xf3, 0x02, 0x26, 0x55, 0x97, 0x56, 0x1a, 0xac, 0x7f,
0x16, 0xdd, 0x22, 0x63, 0x49, 0x77, 0xd8, 0x40, 0x45, 0x39, 0xb9, 0xd5, 0xb8, 0xa7, 0x5c, 0x1c, 0x67, 0xc3, 0x69, 0xc1, 0x7b, 0x0a, 0x76, 0x5e, 0x6d, 0x6b, 0x40, 0x2b, 0xdd, 0xb0, 0x06, 0x54,
0x99, 0xe2, 0x9b, 0xfd, 0xf0, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd9, 0x7a, 0xd4, 0x05, 0xa1, 0x29, 0xd1, 0x2d, 0x32, 0x52, 0x74, 0xfb, 0x35, 0x54, 0x34, 0xc8, 0xad, 0xda, 0x33, 0x0d, 0x71,
0x64, 0xcb, 0xef, 0xf9, 0xc3, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x8f, 0xd3, 0xdd, 0x57, 0xd9,
0x0b, 0x00, 0x00, 0x0b, 0x00, 0x00,
} }

6
auth/service/proto/auth.proto
View File

@ -39,11 +39,12 @@ message Token {
message Account { message Account {
string id = 1; string id = 1;
string type = 2;
repeated string roles = 3; repeated string roles = 3;
map<string, string> metadata = 4; map<string, string> metadata = 4;
string namespace = 5; string namespace = 5;
string type = 6; string refresh_token = 6;
string refresh_token = 7; string provider = 7;
} }
message Resource{ message Resource{
@ -68,6 +69,7 @@ message GenerateRequest {
string namespace = 4; string namespace = 4;
string secret = 5; string secret = 5;
string type = 6; string type = 6;
string provider = 7;
} }
message GenerateResponse { message GenerateResponse {

12
auth/service/service.go
View File

@ -107,14 +107,16 @@ func (s *svc) Options() auth.Options {
} }
// Generate a new account // Generate a new account
func (s *svc) Generate(id, secret string, opts ...auth.GenerateOption) (*auth.Account, error) { func (s *svc) Generate(id string, opts ...auth.GenerateOption) (*auth.Account, error) {
options := auth.NewGenerateOptions(opts...) options := auth.NewGenerateOptions(opts...)
rsp, err := s.auth.Generate(context.TODO(), &pb.GenerateRequest{ rsp, err := s.auth.Generate(context.TODO(), &pb.GenerateRequest{
Id: id, Id: id,
Secret: secret, Type: options.Type,
Roles: options.Roles, Roles: options.Roles,
Secret: options.Secret,
Metadata: options.Metadata, Metadata: options.Metadata,
Provider: options.Provider,
Namespace: options.Namespace, Namespace: options.Namespace,
}) })
if err != nil { if err != nil {
@ -125,8 +127,9 @@ func (s *svc) Generate(id, secret string, opts ...auth.GenerateOption) (*auth.Ac
} }
// Login to an account // Login to an account
func (s *svc) Login(id, secret string) (*auth.Account, error) { func (s *svc) Login(id string, opts ...auth.LoginOption) (*auth.Account, error) {
rsp, err := s.auth.Login(context.TODO(), &pb.LoginRequest{Id: id, Secret: secret}) options := auth.NewLoginOptions(opts...)
rsp, err := s.auth.Login(context.TODO(), &pb.LoginRequest{Id: id, Secret: options.Secret})
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -331,6 +334,7 @@ func serializeAccount(a *pb.Account) *auth.Account {
ID: a.Id, ID: a.Id,
Roles: a.Roles, Roles: a.Roles,
Metadata: a.Metadata, Metadata: a.Metadata,
Provider: a.Provider,
Namespace: a.Namespace, Namespace: a.Namespace,
RefreshToken: a.RefreshToken, RefreshToken: a.RefreshToken,
} }