update with some new fields that are in the db

This commit is contained in:
Brian Matheson 2019-06-27 17:08:26 -04:00
parent 7b39cd35a2
commit 0c8cbc3ab2
2 changed files with 100 additions and 28 deletions

View File

@ -21,11 +21,11 @@ var _ = math.Inf
const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
type Account struct {
Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
ID int64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"`
Nick string `protobuf:"bytes,2,opt,name=nick,proto3" json:"nick,omitempty"`
Username string `protobuf:"bytes,3,opt,name=username,proto3" json:"username,omitempty"`
Token string `protobuf:"bytes,4,opt,name=token,proto3" json:"token,omitempty"`
Password string `protobuf:"bytes,5,opt,name=password,proto3" json:"password,omitempty"`
Pwdhash string `protobuf:"bytes,5,opt,name=pwdhash,proto3" json:"pwdhash,omitempty"`
Hostname string `protobuf:"bytes,6,opt,name=hostname,proto3" json:"hostname,omitempty"`
Domain string `protobuf:"bytes,7,opt,name=domain,proto3" json:"domain,omitempty"`
Port int32 `protobuf:"varint,8,opt,name=port,proto3" json:"port,omitempty"`
@ -36,6 +36,13 @@ type Account struct {
Atime string `protobuf:"bytes,13,opt,name=atime,proto3" json:"atime,omitempty"`
Browser string `protobuf:"bytes,14,opt,name=browser,proto3" json:"browser,omitempty"`
HttpHeaders []*Account_HttpHeader `protobuf:"bytes,15,rep,name=httpHeaders,proto3" json:"httpHeaders,omitempty"`
Code string `protobuf:"bytes,16,opt,name=code,proto3" json:"code,omitempty"`
Codedate string `protobuf:"bytes,17,opt,name=codedate,proto3" json:"codedate,omitempty"`
Createdon string `protobuf:"bytes,18,opt,name=createdon,proto3" json:"createdon,omitempty"`
Codetype string `protobuf:"bytes,19,opt,name=codetype,proto3" json:"codetype,omitempty"`
Secret2Fa string `protobuf:"bytes,20,opt,name=secret2fa,proto3" json:"secret2fa,omitempty"`
Confirmed2Fa string `protobuf:"bytes,21,opt,name=confirmed2fa,proto3" json:"confirmed2fa,omitempty"`
Roles string `protobuf:"bytes,22,opt,name=roles,proto3" json:"roles,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@ -66,9 +73,9 @@ func (m *Account) XXX_DiscardUnknown() {
var xxx_messageInfo_Account proto.InternalMessageInfo
func (m *Account) GetId() int32 {
func (m *Account) GetID() int64 {
if m != nil {
return m.Id
return m.ID
}
return 0
}
@ -94,9 +101,9 @@ func (m *Account) GetToken() string {
return ""
}
func (m *Account) GetPassword() string {
func (m *Account) GetPwdhash() string {
if m != nil {
return m.Password
return m.Pwdhash
}
return ""
}
@ -171,6 +178,55 @@ func (m *Account) GetHttpHeaders() []*Account_HttpHeader {
return nil
}
func (m *Account) GetCode() string {
if m != nil {
return m.Code
}
return ""
}
func (m *Account) GetCodedate() string {
if m != nil {
return m.Codedate
}
return ""
}
func (m *Account) GetCreatedon() string {
if m != nil {
return m.Createdon
}
return ""
}
func (m *Account) GetCodetype() string {
if m != nil {
return m.Codetype
}
return ""
}
func (m *Account) GetSecret2Fa() string {
if m != nil {
return m.Secret2Fa
}
return ""
}
func (m *Account) GetConfirmed2Fa() string {
if m != nil {
return m.Confirmed2Fa
}
return ""
}
func (m *Account) GetRoles() string {
if m != nil {
return m.Roles
}
return ""
}
type Account_HttpHeader struct {
Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
@ -226,24 +282,30 @@ func init() {
func init() { proto.RegisterFile("account.proto", fileDescriptor_8e28828dcb8d24f0) }
var fileDescriptor_8e28828dcb8d24f0 = []byte{
// 294 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0x31, 0x4f, 0xc3, 0x30,
0x10, 0x85, 0x95, 0xa6, 0x4d, 0xda, 0x0b, 0x2d, 0xc8, 0x42, 0xe8, 0xd4, 0x85, 0x88, 0x29, 0x53,
0x06, 0x90, 0xd8, 0xbb, 0x75, 0x60, 0x40, 0x91, 0xf8, 0x01, 0x4e, 0x62, 0x54, 0xab, 0x75, 0x1c,
0xd9, 0x0e, 0xf9, 0x7f, 0xfc, 0x32, 0xe4, 0x73, 0x52, 0xba, 0xbd, 0xef, 0xbd, 0x3b, 0xdb, 0x7a,
0x86, 0x2d, 0x6f, 0x1a, 0x3d, 0x74, 0xae, 0xec, 0x8d, 0x76, 0x9a, 0x65, 0xa3, 0x74, 0x9f, 0x5e,
0xd5, 0xc3, 0xf7, 0xcb, 0x6f, 0x0c, 0xe9, 0x21, 0xc4, 0x6c, 0x07, 0x0b, 0xd9, 0x62, 0x94, 0x47,
0xc5, 0xaa, 0x5a, 0xc8, 0x96, 0x31, 0x58, 0x76, 0xb2, 0x39, 0xe3, 0x22, 0x8f, 0x8a, 0x4d, 0x45,
0x9a, 0xed, 0x61, 0x3d, 0x58, 0x61, 0x3a, 0xae, 0x04, 0xc6, 0xe4, 0x5f, 0x99, 0x3d, 0xc2, 0xca,
0xe9, 0xb3, 0xe8, 0x70, 0x49, 0x41, 0x00, 0xbf, 0xd1, 0x73, 0x6b, 0x47, 0x6d, 0x5a, 0x5c, 0x85,
0x8d, 0x99, 0x7d, 0x76, 0xd2, 0xd6, 0xd1, 0x69, 0x49, 0xc8, 0x66, 0x66, 0x4f, 0x90, 0xb4, 0x5a,
0x71, 0xd9, 0x61, 0x4a, 0xc9, 0x44, 0xfe, 0x55, 0xbd, 0x36, 0x0e, 0xd7, 0xf4, 0x4e, 0xd2, 0xfe,
0x66, 0xa1, 0xb8, 0xbc, 0xe0, 0x26, 0xdc, 0x4c, 0xc0, 0x1e, 0x20, 0xfe, 0xaa, 0x3e, 0x10, 0xc8,
0xf3, 0xd2, 0xcf, 0x35, 0x4e, 0x2a, 0x81, 0x59, 0x98, 0x23, 0xf0, 0xae, 0x22, 0xf7, 0x2e, 0xb8,
0x6a, 0x76, 0x39, 0xb9, 0xdb, 0xe0, 0x12, 0x30, 0x84, 0xb4, 0x36, 0x7a, 0xb4, 0xc2, 0xe0, 0x8e,
0xfc, 0x19, 0xd9, 0x01, 0xb2, 0x93, 0x73, 0xfd, 0x51, 0xf0, 0x56, 0x18, 0x8b, 0xf7, 0x79, 0x5c,
0x64, 0xaf, 0xcf, 0xe5, 0x4d, 0xd9, 0xe5, 0x54, 0x74, 0x79, 0xbc, 0xce, 0x55, 0xb7, 0x3b, 0xfb,
0x77, 0x80, 0xff, 0x88, 0xea, 0xf7, 0xc5, 0x44, 0x53, 0xfd, 0x53, 0xc5, 0x3f, 0xfc, 0x32, 0x88,
0xe9, 0x4f, 0x02, 0xd4, 0x09, 0x7d, 0xec, 0xdb, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x35, 0xc6,
0x83, 0x27, 0xe9, 0x01, 0x00, 0x00,
// 386 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x92, 0xcf, 0xab, 0xda, 0x40,
0x10, 0xc7, 0x89, 0x79, 0xd1, 0xe7, 0xe6, 0xbd, 0xd7, 0xd7, 0xad, 0x95, 0x41, 0x0a, 0x0d, 0x9e,
0x72, 0xca, 0xc1, 0x42, 0xef, 0x82, 0x07, 0x85, 0x1e, 0x4a, 0xa0, 0x7f, 0xc0, 0xba, 0x19, 0x49,
0xd0, 0x64, 0xc3, 0x66, 0x53, 0xe9, 0xb5, 0x7f, 0x79, 0x99, 0xd9, 0x44, 0xed, 0xc9, 0xf9, 0x7c,
0xe7, 0xc7, 0x3a, 0xdf, 0x8c, 0x78, 0x55, 0x5a, 0x9b, 0xbe, 0x71, 0x59, 0x6b, 0x8d, 0x33, 0x32,
0xbe, 0x56, 0xee, 0x27, 0x45, 0xc7, 0xfe, 0xb4, 0xfe, 0x1b, 0x89, 0xd9, 0xd6, 0xa7, 0xe5, 0x9b,
0x98, 0x1c, 0x76, 0x10, 0x24, 0x41, 0x1a, 0xe6, 0x93, 0xc3, 0x4e, 0x4a, 0xf1, 0xd4, 0x54, 0xfa,
0x0c, 0x93, 0x24, 0x48, 0xe7, 0x39, 0xc7, 0x72, 0x25, 0x9e, 0xfb, 0x0e, 0x6d, 0xa3, 0x6a, 0x84,
0x90, 0xf5, 0x1b, 0xcb, 0x85, 0x88, 0x9c, 0x39, 0x63, 0x03, 0x4f, 0x9c, 0xf0, 0x20, 0x41, 0xcc,
0xda, 0x6b, 0x51, 0xaa, 0xae, 0x84, 0x88, 0xf5, 0x11, 0x69, 0x56, 0x69, 0x3a, 0xc7, 0xb3, 0xa6,
0x7e, 0xd6, 0xc8, 0x72, 0x29, 0xa6, 0x85, 0xa9, 0x55, 0xd5, 0xc0, 0x8c, 0x33, 0x03, 0xd1, 0x7f,
0x6a, 0x8d, 0x75, 0xf0, 0x9c, 0x04, 0x69, 0x94, 0x73, 0x4c, 0xef, 0x62, 0xad, 0xaa, 0x0b, 0xcc,
0xfd, 0xbb, 0x0c, 0xf2, 0x5d, 0x84, 0xbf, 0xf2, 0x1f, 0x20, 0x58, 0xa3, 0x90, 0xea, 0xb4, 0xab,
0x6a, 0x84, 0xd8, 0xd7, 0x31, 0x90, 0x5a, 0xb3, 0xfa, 0xe2, 0xd5, 0x7a, 0x54, 0x15, 0xab, 0xaf,
0x5e, 0x65, 0xa0, 0x5d, 0x8e, 0xd6, 0x5c, 0x3b, 0xb4, 0xf0, 0xe6, 0x77, 0x19, 0x50, 0x6e, 0x45,
0x5c, 0x3a, 0xd7, 0xee, 0x51, 0x15, 0x68, 0x3b, 0xf8, 0x90, 0x84, 0x69, 0xbc, 0xf9, 0x9a, 0x3d,
0x58, 0x9d, 0x0d, 0x36, 0x67, 0xfb, 0x5b, 0x5d, 0xfe, 0xd8, 0x43, 0xab, 0x69, 0x53, 0x20, 0xbc,
0x7b, 0xbb, 0x29, 0x26, 0x8b, 0xe8, 0xb7, 0x50, 0x0e, 0xe1, 0xa3, 0xb7, 0x68, 0x64, 0xf9, 0x45,
0xcc, 0xb5, 0x45, 0xe5, 0xb0, 0x30, 0x0d, 0x48, 0x4e, 0xde, 0x85, 0xb1, 0xd3, 0xfd, 0x69, 0x11,
0x3e, 0xdd, 0x3b, 0x89, 0xa9, 0xb3, 0x43, 0x6d, 0xd1, 0x6d, 0x4e, 0x0a, 0x16, 0xbe, 0xf3, 0x26,
0xc8, 0xb5, 0x78, 0xd1, 0xa6, 0x39, 0x55, 0xb6, 0xc6, 0x82, 0x0a, 0x3e, 0x73, 0xc1, 0x7f, 0x1a,
0xd9, 0x63, 0xcd, 0x05, 0x3b, 0x58, 0x7a, 0x7b, 0x18, 0x56, 0xdf, 0x85, 0xb8, 0x2f, 0xc7, 0xe7,
0x43, 0x9f, 0x36, 0x18, 0xce, 0x67, 0x38, 0x91, 0xdf, 0xea, 0xd2, 0xe3, 0x70, 0x53, 0x1e, 0x8e,
0x53, 0x3e, 0xcc, 0x6f, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa2, 0xf0, 0xf6, 0xdb, 0xa9, 0x02,
0x00, 0x00,
}

View File

@ -1,12 +1,14 @@
//is this a comment?
syntax = "proto3";
package witProtobuf;
message Account {
int32 id = 1;
int64 ID = 1;
string nick = 2;
string username = 3;
string token = 4;
string password = 5;
string pwdhash = 5;
string hostname = 6;
string domain = 7;
int32 port = 8;
@ -19,6 +21,14 @@ message Account {
string browser = 14;
repeated HttpHeader httpHeaders = 15;
string code = 16;
string codedate = 17;
string createdon = 18;
string codetype = 19;
string secret2fa = 20;
string confirmed2fa = 21;
string roles = 22;
message HttpHeader {
string name = 1;