@restorecommerce/protos 2.0.2 → 3.0.1

package/io/restorecommerce/tax_type.proto

@@ -11,9 +11,7 @@ import "io/restorecommerce/options.proto";
 /*
 * Microservice definition.
 */
-service Service {
-  option (io.restorecommerce.options.service_name) = "tax_type";
-
+service TaxTypeService {
   rpc Read (io.restorecommerce.resourcebase.ReadRequest) returns (TaxTypeListResponse) {
     option (io.restorecommerce.options.is_query) = true;
   };
@@ -23,13 +21,18 @@ service Service {
   rpc Upsert (TaxTypeList) returns (TaxTypeListResponse);
 }
 
+enum Behavior {
+  NONE = 0;
+  ADDITIVE_ON_GROSS = 1;
+}
+
 message Deleted {
-  string id = 1;
+  optional string id = 1;
 }
 
 message TaxTypeList {
   repeated TaxType items = 1;
-  uint32 total_count = 2;
+  optional uint32 total_count = 2;
   io.restorecommerce.auth.Subject subject = 3;
 }
 
@@ -45,8 +48,9 @@ message TaxTypeResponse {
 }
 
 message TaxType {
-  string id = 1;
-  io.restorecommerce.meta.Meta meta = 2;
-  string type = 3;
-  string description = 4;
+  optional string id = 1;
+  optional io.restorecommerce.meta.Meta meta = 2;
+  optional string type = 3;
+  optional string description = 4;
+  optional Behavior behavior = 5;
 }

package/io/restorecommerce/timezone.proto

@@ -11,9 +11,7 @@ import "io/restorecommerce/options.proto";
 /*
 * Microservice definition.
 */
-service Service {
-  option (io.restorecommerce.options.service_name) = "timezone";
-
+service TimezoneService {
   rpc Read (io.restorecommerce.resourcebase.ReadRequest) returns (TimezoneListResponse) {
     option (io.restorecommerce.options.is_query) = true;
   };
@@ -29,7 +27,7 @@ message Deleted {
 
 message TimezoneList {
   repeated Timezone items = 1;
-  uint32 total_count = 2;
+  optional uint32 total_count = 2;
   io.restorecommerce.auth.Subject subject = 3;
 }
 
@@ -45,7 +43,7 @@ message TimezoneResponse {
 }
 
 message Timezone {
-  string id = 1;
-  io.restorecommerce.meta.Meta meta = 2;
-  string description = 3;
+  optional string id = 1;
+  optional io.restorecommerce.meta.Meta meta = 2;
+  optional string description = 3;
 }

package/io/restorecommerce/token.proto

@@ -9,9 +9,7 @@ import "io/restorecommerce/options.proto";
 /*
 * Microservice definition.
 */
-service Service {
-  option (io.restorecommerce.options.service_name) = "token";
-
+service TokenService {
   rpc upsert (TokenData) returns (google.protobuf.Any); // creates or upserts ID_token to `Redis` and returns sucess or failure message
   rpc find (Identifier) returns (google.protobuf.Any) {
     option (io.restorecommerce.options.is_query) = true;
@@ -22,20 +20,20 @@ service Service {
 }
 
 message TokenData {
-  string id = 1;
-  google.protobuf.Any payload = 2;
-  double expires_in = 3;
-  string type = 4;
-  io.restorecommerce.auth.Subject subject = 5;
+  optional string id = 1;
+  optional google.protobuf.Any payload = 2;
+  optional double expires_in = 3;
+  optional string type = 4;
+  optional io.restorecommerce.auth.Subject subject = 5;
 }
 
 message Identifier {
-  string id = 1;
-  string type = 2;
-  io.restorecommerce.auth.Subject subject = 3;
+  optional string id = 1;
+  optional string type = 2;
+  optional io.restorecommerce.auth.Subject subject = 3;
 }
 
 message GrantId {
-  string grant_id = 1;
-  io.restorecommerce.auth.Subject subject = 2;
+  optional string grant_id = 1;
+  optional io.restorecommerce.auth.Subject subject = 2;
 }

package/io/restorecommerce/user.proto

@@ -19,9 +19,7 @@ import "io/restorecommerce/locale.proto";
 /**
  * The microservice for the user resource.
  */
-service Service {
-  option (io.restorecommerce.options.service_name) = "user";
-
+service UserService {
   rpc Read (io.restorecommerce.resourcebase.ReadRequest) returns (UserListWithRoleResponse) {
     option (io.restorecommerce.options.is_query) = true;
   };
@@ -60,8 +58,8 @@ service Service {
 */
 message LoginRequest {
   string identifier = 1; // User name or email
-  string password = 2; // Raw password
-  string token = 3;
+  optional string password = 2; // Raw password
+  optional string token = 3;
 }
 
 message OrgIDRequest {
@@ -75,9 +73,9 @@ message DeleteUsersByOrgResponse {
 }
 
 message FindRequest {
-  string id = 1; /// User ID
-  string name = 2;
-  string email = 3;
+  optional string id = 1; /// User ID
+  optional string name = 2;
+  optional string email = 3;
   io.restorecommerce.auth.Subject subject = 4;
 }
 
@@ -93,20 +91,20 @@ enum UserType {
 }
 
 message RegisterRequest {
-  string id = 1;
-  bool guest = 2;
-  io.restorecommerce.meta.Meta meta = 3;
-  string name = 4;
-  string first_name = 5;
-  string last_name = 6;
-  string email = 7;
-  string password = 8;
-  string timezone_id = 9;
-  string locale_id = 10;
-
-  string default_scope = 11; // default hierarchical scope
-  UserType user_type = 12;
-  string captcha_code = 13;
+  optional string id = 1;
+  optional bool guest = 2;
+  optional io.restorecommerce.meta.Meta meta = 3;
+  optional string name = 4;
+  optional string first_name = 5;
+  optional string last_name = 6;
+  optional string email = 7;
+  optional string password = 8;
+  optional string timezone_id = 9;
+  optional string locale_id = 10;
+
+  optional string default_scope = 11; // default hierarchical scope
+  optional UserType user_type = 12;
+  optional string captcha_code = 13;
 }
 
 message ActivateRequest {
@@ -129,7 +127,6 @@ message SendInvitationEmailRequest {
 }
 
 message ChangePasswordRequest {
-  string identifier = 1; /// user name or email
   string password = 2;
   string new_password = 3;
   io.restorecommerce.auth.Subject subject = 4;
@@ -215,7 +212,7 @@ message EmailChangeConfirmed {
  */
 message UserList {
   repeated User items = 1;
-  uint32 total_count = 2;
+  optional uint32 total_count = 2;
   io.restorecommerce.auth.Subject subject = 3;
 }
 
@@ -266,19 +263,19 @@ message User {
     deleted: "userDeleted"
   };
 
-  string id = 1; /// User ID, unique, key
-  io.restorecommerce.meta.Meta meta = 2;
-  string name = 3; // The name of the user, can be used for login
-  string first_name = 4;
-  string last_name = 5;
-  string email = 6; /// Email address, can be used for login
-  string new_email = 7; /// New email address; set by `requestEmailChange` and overrides actual email upon `confirmEmailChange`
-  bool active = 8; /// If the user was activated via the activation process
-  string activation_code = 9; /// Activation code used in the activation process
-  string password = 10; /// Raw password, not stored
-  string password_hash = 11; /// Encrypted password, stored
+  optional string id = 1; /// User ID, unique, key
+  optional io.restorecommerce.meta.Meta meta = 2;
+  optional string name = 3; // The name of the user, can be used for login
+  optional string first_name = 4;
+  optional string last_name = 5;
+  optional string email = 6; /// Email address, can be used for login
+  optional string new_email = 7; /// New email address; set by `requestEmailChange` and overrides actual email upon `confirmEmailChange`
+  optional bool active = 8; /// If the user was activated via the activation process
+  optional string activation_code = 9; /// Activation code used in the activation process
+  optional string password = 10; /// Raw password, not stored
+  optional string password_hash = 11; /// Encrypted password, stored
   repeated io.restorecommerce.auth.RoleAssociation role_associations = 12; // A user can have multiple roles and different attributes coupled with each role
-  string timezone_id = 13 [
+  optional string timezone_id = 13 [
     (io.restorecommerce.options.resolver) = {
       target_type: ".io.restorecommerce.timezone.Timezone",
       target_service: "resource",
@@ -287,7 +284,7 @@ message User {
       field_name: "timezone",
     }
   ];  // timezone_id specifications
-  string locale_id = 14 [
+  optional string locale_id = 14 [
     (io.restorecommerce.options.resolver) = {
       target_type: ".io.restorecommerce.locale.Locale",
       target_service: "resource",
@@ -296,18 +293,18 @@ message User {
       field_name: "locale",
     }
   ];  // locale specifications
-  string default_scope = 15; // default hierarchical scope
-  bool unauthenticated = 16; // true in case in case of `register`; set to false after activation
-  bool guest = 17; /// Is the user a guest. A guest is a automatically generated user which can later be turned in a non-guest user.
-  io.restorecommerce.image.Image image = 18;
-  UserType user_type = 19;
-  bool invite = 20; // For user invitation
-  string invited_by_user_name = 21; // user who is inviting
-  string invited_by_user_first_name = 22; // First name of user inviting
-  string invited_by_user_last_name = 23; // Last name of user inviting
+  optional string default_scope = 15; // default hierarchical scope
+  optional bool unauthenticated = 16; // true in case in case of `register`; set to false after activation
+  optional bool guest = 17; /// Is the user a guest. A guest is a automatically generated user which can later be turned in a non-guest user.
+  optional io.restorecommerce.image.Image image = 18;
+  optional UserType user_type = 19;
+  optional bool invite = 20; // For user invitation
+  optional string invited_by_user_name = 21; // user who is inviting
+  optional string invited_by_user_first_name = 22; // First name of user inviting
+  optional string invited_by_user_last_name = 23; // Last name of user inviting
   repeated io.restorecommerce.auth.Tokens tokens = 24;
-  double last_access = 25;
-  google.protobuf.Any data = 26; /// additional data
+  optional double last_access = 25;
+  optional google.protobuf.Any data = 26; /// additional data
 }
 
 /**
@@ -356,5 +353,5 @@ message UserRole {
   repeated io.restorecommerce.auth.Tokens tokens = 24;
   double last_access = 25;
   google.protobuf.Any data = 26; /// additional data
-  repeated io.restorecommerce.role.Role role = 27;
+  repeated io.restorecommerce.role.Role roles = 27;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@restorecommerce/protos",
-  "version": "2.0.2",
+  "version": "3.0.1",
   "description": "Protobuf descriptors for Restorecommerce services",
   "author": "n-fuse GmbH",
   "repository": {
@@ -15,5 +15,5 @@
     "protobufs"
   ],
   "scripts": {},
-  "gitHead": "2ec001696f611681778a13842a9e047f1db08059"
+  "gitHead": "1c4ac0aaccaa55439930b96256d6db3884690cb0"
 }