From 01c6b9dd915c2fdbbd802e2bcf70aaf2793307c8 Mon Sep 17 00:00:00 2001 From: Cosmin Cojocar Date: Mon, 26 Nov 2018 19:07:59 +0100 Subject: [PATCH] Remove the 'public' field from UpdateClientReq proto message --- api/api.pb.go | 85 +++++++++++++++++++++------------------------- api/api.proto | 5 ++- server/api_test.go | 3 -- 3 files changed, 40 insertions(+), 53 deletions(-) diff --git a/api/api.pb.go b/api/api.pb.go index fa7e8c21..9395f484 100644 --- a/api/api.pb.go +++ b/api/api.pb.go @@ -201,9 +201,8 @@ type UpdateClientReq struct { Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"` RedirectUris []string `protobuf:"bytes,2,rep,name=redirect_uris,json=redirectUris" json:"redirect_uris,omitempty"` TrustedPeers []string `protobuf:"bytes,3,rep,name=trusted_peers,json=trustedPeers" json:"trusted_peers,omitempty"` - Public bool `protobuf:"varint,4,opt,name=public" json:"public,omitempty"` - Name string `protobuf:"bytes,5,opt,name=name" json:"name,omitempty"` - LogoUrl string `protobuf:"bytes,6,opt,name=logo_url,json=logoUrl" json:"logo_url,omitempty"` + Name string `protobuf:"bytes,4,opt,name=name" json:"name,omitempty"` + LogoUrl string `protobuf:"bytes,5,opt,name=logo_url,json=logoUrl" json:"logo_url,omitempty"` } func (m *UpdateClientReq) Reset() { *m = UpdateClientReq{} } @@ -232,13 +231,6 @@ func (m *UpdateClientReq) GetTrustedPeers() []string { return nil } -func (m *UpdateClientReq) GetPublic() bool { - if m != nil { - return m.Public - } - return false -} - func (m *UpdateClientReq) GetName() string { if m != nil { return m.Name @@ -1037,11 +1029,11 @@ var _Dex_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("api/api.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 851 bytes of a gzipped FileDescriptorProto + // 848 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xdb, 0x4e, 0xf3, 0x46, 0x10, 0x4e, 0x62, 0x92, 0x38, 0x93, 0xf3, 0x36, 0x3f, 0x84, 0xa0, 0x4a, 0xb0, 0xa8, 0x12, 0xa8, 0x52, 0x28, 0x54, 0x6a, 0xa5, 0xa2, 0xd2, 0x03, 0xb4, 0x05, 0xa9, 0xaa, 0x90, 0xd5, 0xf4, 0xb2, - 0x96, 0x89, 0x07, 0x58, 0x61, 0x6c, 0x77, 0x77, 0x43, 0x68, 0x2f, 0xfb, 0x48, 0x7d, 0x83, 0xbe, + 0x96, 0x89, 0x07, 0x58, 0x61, 0x6c, 0x77, 0x77, 0x43, 0x68, 0x2f, 0xfb, 0x18, 0x7d, 0x9b, 0xbe, 0xd9, 0xaf, 0x5d, 0x6f, 0x82, 0x0f, 0x81, 0x70, 0xe7, 0xf9, 0x76, 0xe6, 0x9b, 0xf3, 0xc8, 0xd0, 0xf6, 0x62, 0x76, 0xe4, 0xc5, 0x6c, 0x1c, 0xf3, 0x48, 0x46, 0xc4, 0xf2, 0x62, 0x46, 0xff, 0x2f, 0x43, 0xed, 0x3c, 0x60, 0x18, 0x4a, 0xd2, 0x81, 0x0a, 0xf3, 0x87, 0xe5, 0xdd, 0xf2, 0x41, 0xc3, @@ -1057,39 +1049,38 @@ var fileDescriptor0 = []byte{ 0x04, 0xb6, 0xd3, 0x36, 0xe8, 0x4f, 0x1a, 0x4c, 0xf1, 0x57, 0x5e, 0xe7, 0xdf, 0x83, 0xee, 0x05, 0x06, 0x98, 0x8e, 0x2b, 0x57, 0x63, 0x7a, 0x04, 0xbd, 0xac, 0x8a, 0x88, 0xc9, 0x0e, 0x34, 0xc2, 0x48, 0xba, 0xb7, 0xd1, 0x2c, 0xf4, 0x8d, 0x77, 0x3b, 0x8c, 0xe4, 0xcf, 0x4a, 0xa6, 0xff, 0x95, - 0xa1, 0x3b, 0x89, 0x7d, 0xef, 0x0d, 0xd2, 0x62, 0x83, 0x2a, 0xef, 0x69, 0x90, 0xf5, 0x66, 0x83, - 0x36, 0x56, 0x36, 0xa8, 0xfa, 0x4a, 0x83, 0x6a, 0xd9, 0x06, 0x1d, 0x41, 0x2f, 0x1b, 0xf3, 0xba, - 0x2c, 0x19, 0xd8, 0xd7, 0x9e, 0x10, 0xf3, 0x88, 0xfb, 0x64, 0x00, 0x55, 0x7c, 0xf4, 0x58, 0x60, - 0x12, 0x4c, 0x04, 0x15, 0xc1, 0xbd, 0x27, 0xee, 0x75, 0xf9, 0x5b, 0x8e, 0xfe, 0x26, 0x23, 0xb0, - 0x67, 0x02, 0xb9, 0x8e, 0xcc, 0xd2, 0xca, 0x4b, 0x99, 0x6c, 0x41, 0x5d, 0x7d, 0xbb, 0xcc, 0xd7, - 0xa9, 0x34, 0x9c, 0x9a, 0x12, 0xaf, 0x7c, 0x7a, 0x06, 0xfd, 0x64, 0x08, 0x16, 0x0e, 0x55, 0x45, - 0x0f, 0xc1, 0x8e, 0x8d, 0x68, 0x06, 0xa8, 0xad, 0x1b, 0xbc, 0xd4, 0x59, 0x3e, 0xd3, 0x53, 0x20, - 0x79, 0xfb, 0x77, 0x8f, 0x11, 0xbd, 0x83, 0x7e, 0x52, 0x98, 0xb4, 0xf3, 0xd5, 0x09, 0x6f, 0x83, - 0x1d, 0xe2, 0xdc, 0x4d, 0x25, 0x5d, 0x0f, 0x71, 0x7e, 0xa9, 0xf2, 0xde, 0x83, 0x96, 0x7a, 0xca, - 0xe5, 0xde, 0x0c, 0x71, 0x3e, 0x31, 0x10, 0x3d, 0x06, 0x92, 0x77, 0xb4, 0xae, 0x07, 0x87, 0xd0, - 0x4f, 0x46, 0x73, 0x6d, 0x6c, 0x8a, 0x3d, 0xaf, 0xba, 0x8e, 0xbd, 0x0f, 0xdd, 0x5f, 0x99, 0x90, - 0x29, 0x6e, 0xfa, 0x1d, 0xf4, 0xb2, 0x90, 0x88, 0xc9, 0xe7, 0xd0, 0x58, 0x54, 0x5a, 0x95, 0xd0, - 0x2a, 0x76, 0xe2, 0xe5, 0x9d, 0xb6, 0x00, 0xfe, 0x40, 0x2e, 0x58, 0x14, 0x2a, 0xba, 0xaf, 0xa1, - 0xb9, 0x94, 0x44, 0x9c, 0x5c, 0x33, 0xfe, 0x84, 0xdc, 0x84, 0x6e, 0x24, 0xd2, 0x03, 0x75, 0x07, - 0x75, 0x49, 0xab, 0x8e, 0x3e, 0x89, 0xff, 0x40, 0xd7, 0xc1, 0x5b, 0x8e, 0xe2, 0xfe, 0xf7, 0xe8, - 0x01, 0x43, 0x07, 0x6f, 0x0b, 0x1b, 0xb6, 0x03, 0x8d, 0x64, 0xc7, 0xd5, 0x3c, 0x25, 0xd7, 0xd1, - 0x4e, 0x80, 0x2b, 0x9f, 0x7c, 0x0a, 0x30, 0xd5, 0x13, 0xe1, 0xbb, 0x9e, 0xd4, 0x2b, 0x62, 0x39, - 0x0d, 0x83, 0xfc, 0x20, 0x95, 0x6d, 0xe0, 0x09, 0xa9, 0xda, 0xe5, 0xeb, 0x45, 0xb1, 0x1c, 0x5b, - 0x01, 0x13, 0x81, 0xaa, 0xe8, 0x1d, 0x55, 0x03, 0xe3, 0x5f, 0x55, 0x3c, 0x35, 0xb8, 0xe5, 0xcc, - 0xe0, 0xfe, 0x96, 0x54, 0x70, 0xa9, 0x2a, 0x62, 0x72, 0x0a, 0x1d, 0x9e, 0x88, 0xae, 0x54, 0xa1, - 0x2f, 0x4a, 0x36, 0xd0, 0x25, 0xcb, 0x25, 0xe5, 0xb4, 0x79, 0x0a, 0x10, 0xf4, 0x12, 0x7a, 0x0e, - 0x3e, 0x45, 0x0f, 0xf8, 0x0e, 0xe7, 0x6f, 0x16, 0x80, 0x7e, 0x01, 0xfd, 0x1c, 0xd3, 0x9a, 0x69, - 0x38, 0xf9, 0xb7, 0x0a, 0xd6, 0x05, 0x3e, 0x93, 0x6f, 0xa1, 0x95, 0xbe, 0xc8, 0x24, 0x09, 0x3c, - 0x77, 0xdc, 0x47, 0x1f, 0x56, 0xa0, 0x22, 0xa6, 0x25, 0x65, 0x9e, 0xbe, 0x33, 0xc6, 0x3c, 0x77, - 0x2e, 0x8d, 0x79, 0xfe, 0x20, 0x25, 0xe6, 0xe9, 0x63, 0x6c, 0xcc, 0x73, 0x27, 0xdc, 0x98, 0xe7, - 0xaf, 0x36, 0x2d, 0x91, 0x73, 0xe8, 0x64, 0x2f, 0x01, 0xd9, 0x4c, 0x05, 0x9a, 0x9a, 0xf4, 0xd1, - 0xd6, 0x4a, 0x7c, 0x41, 0x92, 0x5d, 0x54, 0x43, 0x52, 0x38, 0x13, 0x86, 0xa4, 0xb8, 0xd5, 0x09, - 0x49, 0x76, 0x1f, 0x0d, 0x49, 0x61, 0x9f, 0x0d, 0x49, 0x71, 0x79, 0x69, 0x89, 0x9c, 0x41, 0x3b, - 0xbd, 0x8e, 0xc2, 0x94, 0x23, 0xb7, 0xb5, 0xa6, 0x1c, 0xf9, 0xc5, 0xa5, 0x25, 0x72, 0x0c, 0xf0, - 0x0b, 0x4a, 0xb3, 0x82, 0xa4, 0xab, 0xd5, 0x5e, 0xd6, 0x73, 0xd4, 0xcb, 0x02, 0xda, 0xe4, 0x1b, - 0x68, 0xa6, 0x46, 0x9a, 0x7c, 0xb2, 0xa4, 0x7e, 0x19, 0xc9, 0xd1, 0xa0, 0x08, 0x6a, 0xdb, 0xef, - 0xa1, 0x9d, 0x19, 0x3a, 0xf2, 0xc1, 0x0c, 0x7d, 0x76, 0xa4, 0x47, 0x9b, 0xab, 0x60, 0xc5, 0xf0, - 0xe3, 0x00, 0xc8, 0x34, 0x7a, 0x1c, 0x4f, 0x23, 0x8e, 0x91, 0x18, 0xfb, 0xf8, 0xac, 0x34, 0x6f, - 0x6a, 0xfa, 0x67, 0xe9, 0xcb, 0x8f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe8, 0x39, 0xfe, 0xc5, 0x3d, - 0x09, 0x00, 0x00, + 0xa1, 0x3b, 0x89, 0x7d, 0xef, 0x0d, 0xd2, 0x62, 0x83, 0x2a, 0xef, 0x69, 0x90, 0xb5, 0xa2, 0x41, + 0x8b, 0x46, 0x6c, 0xbc, 0xd2, 0x88, 0x6a, 0xb6, 0x11, 0x47, 0xd0, 0xcb, 0xc6, 0xb6, 0x2e, 0x1b, + 0x06, 0xf6, 0xb5, 0x27, 0xc4, 0x3c, 0xe2, 0x3e, 0x19, 0x40, 0x15, 0x1f, 0x3d, 0x16, 0x98, 0x44, + 0x12, 0x41, 0x45, 0x70, 0xef, 0x89, 0x7b, 0x5d, 0xe6, 0x96, 0xa3, 0xbf, 0xc9, 0x08, 0xec, 0x99, + 0x40, 0xae, 0x23, 0xb3, 0xb4, 0xf2, 0x52, 0x26, 0x5b, 0x50, 0x57, 0xdf, 0x2e, 0xf3, 0x4d, 0xd0, + 0x35, 0x25, 0x5e, 0xf9, 0xf4, 0x0c, 0xfa, 0x49, 0xb3, 0x17, 0x0e, 0x55, 0xe5, 0x0e, 0xc1, 0x8e, + 0x8d, 0x68, 0x06, 0xa5, 0xad, 0x1b, 0xb9, 0xd4, 0x59, 0x3e, 0xd3, 0x53, 0x20, 0x79, 0xfb, 0x77, + 0x8f, 0x0b, 0xbd, 0x83, 0x7e, 0x52, 0x98, 0xb4, 0xf3, 0xd5, 0x09, 0x6f, 0x83, 0x1d, 0xe2, 0xdc, + 0x4d, 0x25, 0x5d, 0x0f, 0x71, 0x7e, 0xa9, 0xf2, 0xde, 0x83, 0x96, 0x7a, 0xca, 0xe5, 0xde, 0x0c, + 0x71, 0x3e, 0x31, 0x10, 0x3d, 0x06, 0x92, 0x77, 0xb4, 0xae, 0x07, 0x87, 0xd0, 0x4f, 0x46, 0x70, + 0x6d, 0x6c, 0x8a, 0x3d, 0xaf, 0xba, 0x8e, 0xbd, 0x0f, 0xdd, 0x5f, 0x99, 0x90, 0x29, 0x6e, 0xfa, + 0x1d, 0xf4, 0xb2, 0x90, 0x88, 0xc9, 0xe7, 0xd0, 0x58, 0x54, 0x5a, 0x95, 0xd0, 0x2a, 0x76, 0xe2, + 0xe5, 0x9d, 0xb6, 0x00, 0xfe, 0x40, 0x2e, 0x58, 0x14, 0x2a, 0xba, 0xaf, 0xa1, 0xb9, 0x94, 0x44, + 0x9c, 0x5c, 0x2d, 0xfe, 0x84, 0xdc, 0x84, 0x6e, 0x24, 0xd2, 0x03, 0x75, 0xef, 0x74, 0x49, 0xab, + 0x8e, 0x3e, 0x7d, 0xff, 0x40, 0xd7, 0xc1, 0x5b, 0x8e, 0xe2, 0xfe, 0xf7, 0xe8, 0x01, 0x43, 0x07, + 0x6f, 0x0b, 0x9b, 0xb4, 0x03, 0x8d, 0x64, 0x97, 0xd5, 0x3c, 0x25, 0x57, 0xd0, 0x4e, 0x80, 0x2b, + 0x9f, 0x7c, 0x0a, 0x30, 0xd5, 0x13, 0xe1, 0xbb, 0x9e, 0xd4, 0xab, 0x60, 0x39, 0x0d, 0x83, 0xfc, + 0x20, 0x95, 0x6d, 0xe0, 0x09, 0xa9, 0xda, 0xe5, 0xeb, 0x4b, 0x66, 0x39, 0xb6, 0x02, 0x26, 0x02, + 0x55, 0xd1, 0x3b, 0xaa, 0x06, 0xc6, 0xbf, 0xaa, 0x78, 0x6a, 0x70, 0xcb, 0x99, 0xc1, 0xfd, 0x2d, + 0xa9, 0xe0, 0x52, 0x55, 0xc4, 0xe4, 0x14, 0x3a, 0x3c, 0x11, 0x5d, 0xa9, 0x42, 0x5f, 0x94, 0x6c, + 0xa0, 0x4b, 0x96, 0x4b, 0xca, 0x69, 0xf3, 0x14, 0x20, 0xe8, 0x25, 0xf4, 0x1c, 0x7c, 0x8a, 0x1e, + 0xf0, 0x1d, 0xce, 0xdf, 0x2c, 0x00, 0xfd, 0x02, 0xfa, 0x39, 0xa6, 0x35, 0xd3, 0x70, 0xf2, 0x6f, + 0x15, 0xac, 0x0b, 0x7c, 0x26, 0xdf, 0x42, 0x2b, 0x7d, 0x79, 0x49, 0x12, 0x78, 0xee, 0x88, 0x8f, + 0x3e, 0xac, 0x40, 0x45, 0x4c, 0x4b, 0xca, 0x3c, 0x7d, 0x67, 0x8c, 0x79, 0xee, 0x2c, 0x1a, 0xf3, + 0xfc, 0x41, 0x4a, 0xcc, 0xd3, 0x47, 0xd7, 0x98, 0xe7, 0x4e, 0xb5, 0x31, 0xcf, 0x5f, 0x67, 0x5a, + 0x22, 0xe7, 0xd0, 0xc9, 0x5e, 0x02, 0xb2, 0x99, 0x0a, 0x34, 0x35, 0xe9, 0xa3, 0xad, 0x95, 0xf8, + 0x82, 0x24, 0xbb, 0xa8, 0x86, 0xa4, 0x70, 0x26, 0x0c, 0x49, 0x71, 0xab, 0x13, 0x92, 0xec, 0x3e, + 0x1a, 0x92, 0xc2, 0x3e, 0x1b, 0x92, 0xe2, 0xf2, 0xd2, 0x12, 0x39, 0x83, 0x76, 0x7a, 0x1d, 0x85, + 0x29, 0x47, 0x6e, 0x6b, 0x4d, 0x39, 0xf2, 0x8b, 0x4b, 0x4b, 0xe4, 0x18, 0xe0, 0x17, 0x94, 0x66, + 0x05, 0x49, 0x57, 0xab, 0xbd, 0xac, 0xe7, 0xa8, 0x97, 0x05, 0xb4, 0xc9, 0x37, 0xd0, 0x4c, 0x8d, + 0x34, 0xf9, 0x64, 0x49, 0xfd, 0x32, 0x92, 0xa3, 0x41, 0x11, 0xd4, 0xb6, 0xdf, 0x43, 0x3b, 0x33, + 0x74, 0xe4, 0x83, 0x19, 0xfa, 0xec, 0x48, 0x8f, 0x36, 0x57, 0xc1, 0x8a, 0xe1, 0xc7, 0x01, 0x90, + 0x69, 0xf4, 0x38, 0x9e, 0x46, 0x1c, 0x23, 0x31, 0xf6, 0xf1, 0x59, 0x69, 0xde, 0xd4, 0xf4, 0x4f, + 0xd1, 0x97, 0x1f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xd1, 0x00, 0x08, 0xae, 0x25, 0x09, 0x00, 0x00, } diff --git a/api/api.proto b/api/api.proto index fbb9537a..7b91e822 100644 --- a/api/api.proto +++ b/api/api.proto @@ -41,9 +41,8 @@ message UpdateClientReq { string id = 1; repeated string redirect_uris = 2; repeated string trusted_peers = 3; - bool public = 4; - string name = 5; - string logo_url = 6; + string name = 4; + string logo_url = 5; } // UpdateClientResp returns the reponse form updating a client. diff --git a/server/api_test.go b/server/api_test.go index 7e77a010..14759e63 100644 --- a/server/api_test.go +++ b/server/api_test.go @@ -357,7 +357,6 @@ func TestUpdateClient(t *testing.T) { Id: "test", RedirectUris: []string{"https://redirect"}, TrustedPeers: []string{"test"}, - Public: true, Name: "test", LogoUrl: "https://logout", }, @@ -373,7 +372,6 @@ func TestUpdateClient(t *testing.T) { Id: "", RedirectUris: nil, TrustedPeers: nil, - Public: false, Name: "test", LogoUrl: "test", }, @@ -387,7 +385,6 @@ func TestUpdateClient(t *testing.T) { Id: "test", RedirectUris: nil, TrustedPeers: nil, - Public: false, Name: "test", LogoUrl: "test", },