diff --git a/services/identity/src/client_service.rs b/services/identity/src/client_service.rs --- a/services/identity/src/client_service.rs +++ b/services/identity/src/client_service.rs @@ -24,7 +24,7 @@ OpaqueLoginFinishRequest, OpaqueLoginStartRequest, OpaqueLoginStartResponse, RegistrationFinishRequest, RegistrationStartRequest, RegistrationStartResponse, RemoveReservedUsernameRequest, - ReservedRegistrationStartRequest, ReservedWalletLoginRequest, + ReservedRegistrationStartRequest, ReservedWalletRegistrationRequest, VerifyUserAccessTokenRequest, VerifyUserAccessTokenResponse, WalletLoginRequest, }; @@ -497,9 +497,9 @@ Ok(Response::new(response)) } - async fn log_in_reserved_wallet_user( + async fn register_reserved_wallet_user( &self, - request: tonic::Request, + request: tonic::Request, ) -> Result, tonic::Status> { let code_version = get_code_version(&request); let message = request.into_inner(); diff --git a/services/identity/src/grpc_utils.rs b/services/identity/src/grpc_utils.rs --- a/services/identity/src/grpc_utils.rs +++ b/services/identity/src/grpc_utils.rs @@ -9,7 +9,7 @@ }, unauth::{ DeviceKeyUpload, OpaqueLoginStartRequest, RegistrationStartRequest, - ReservedRegistrationStartRequest, ReservedWalletLoginRequest, + ReservedRegistrationStartRequest, ReservedWalletRegistrationRequest, WalletLoginRequest, }, }, @@ -87,7 +87,7 @@ } } -impl DeviceKeyUploadData for ReservedWalletLoginRequest { +impl DeviceKeyUploadData for ReservedWalletRegistrationRequest { fn device_key_upload(&self) -> Option<&DeviceKeyUpload> { self.device_key_upload.as_ref() } diff --git a/shared/protos/identity_unauth.proto b/shared/protos/identity_unauth.proto --- a/shared/protos/identity_unauth.proto +++ b/shared/protos/identity_unauth.proto @@ -23,7 +23,7 @@ rpc LogInPasswordUserFinish(OpaqueLoginFinishRequest) returns (AuthResponse) {} rpc LogInWalletUser(WalletLoginRequest) returns (AuthResponse) {} - rpc LogInReservedWalletUser(ReservedWalletLoginRequest) returns + rpc RegisterReservedWalletUser(ReservedWalletRegistrationRequest) returns (AuthResponse) {} // Sign-In with Ethereum actions @@ -185,7 +185,7 @@ DeviceKeyUpload device_key_upload = 3; } -message ReservedWalletLoginRequest { +message ReservedWalletRegistrationRequest { string siwe_message = 1; string siwe_signature = 2; // Information specific to a user's device needed to open a new channel of diff --git a/web/protobufs/identity-unauth-structs.cjs b/web/protobufs/identity-unauth-structs.cjs --- a/web/protobufs/identity-unauth-structs.cjs +++ b/web/protobufs/identity-unauth-structs.cjs @@ -41,7 +41,7 @@ goog.exportSymbol('proto.identity.unauth.RegistrationStartResponse', null, global); goog.exportSymbol('proto.identity.unauth.RemoveReservedUsernameRequest', null, global); goog.exportSymbol('proto.identity.unauth.ReservedRegistrationStartRequest', null, global); -goog.exportSymbol('proto.identity.unauth.ReservedWalletLoginRequest', null, global); +goog.exportSymbol('proto.identity.unauth.ReservedWalletRegistrationRequest', null, global); goog.exportSymbol('proto.identity.unauth.VerifyUserAccessTokenRequest', null, global); goog.exportSymbol('proto.identity.unauth.VerifyUserAccessTokenResponse', null, global); goog.exportSymbol('proto.identity.unauth.WalletLoginRequest', null, global); @@ -328,16 +328,16 @@ * @extends {jspb.Message} * @constructor */ -proto.identity.unauth.ReservedWalletLoginRequest = function(opt_data) { +proto.identity.unauth.ReservedWalletRegistrationRequest = function(opt_data) { jspb.Message.initialize(this, opt_data, 0, -1, null, null); }; -goog.inherits(proto.identity.unauth.ReservedWalletLoginRequest, jspb.Message); +goog.inherits(proto.identity.unauth.ReservedWalletRegistrationRequest, jspb.Message); if (goog.DEBUG && !COMPILED) { /** * @public * @override */ - proto.identity.unauth.ReservedWalletLoginRequest.displayName = 'proto.identity.unauth.ReservedWalletLoginRequest'; + proto.identity.unauth.ReservedWalletRegistrationRequest.displayName = 'proto.identity.unauth.ReservedWalletRegistrationRequest'; } /** * Generated by JsPbCodeGenerator. @@ -3231,8 +3231,8 @@ * http://goto/soy-param-migration * @return {!Object} */ -proto.identity.unauth.ReservedWalletLoginRequest.prototype.toObject = function(opt_includeInstance) { - return proto.identity.unauth.ReservedWalletLoginRequest.toObject(opt_includeInstance, this); +proto.identity.unauth.ReservedWalletRegistrationRequest.prototype.toObject = function(opt_includeInstance) { + return proto.identity.unauth.ReservedWalletRegistrationRequest.toObject(opt_includeInstance, this); }; @@ -3241,11 +3241,11 @@ * @param {boolean|undefined} includeInstance Deprecated. Whether to include * the JSPB instance for transitional soy proto support: * http://goto/soy-param-migration - * @param {!proto.identity.unauth.ReservedWalletLoginRequest} msg The msg instance to transform. + * @param {!proto.identity.unauth.ReservedWalletRegistrationRequest} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ -proto.identity.unauth.ReservedWalletLoginRequest.toObject = function(includeInstance, msg) { +proto.identity.unauth.ReservedWalletRegistrationRequest.toObject = function(includeInstance, msg) { var f, obj = { siweMessage: jspb.Message.getFieldWithDefault(msg, 1, ""), siweSignature: jspb.Message.getFieldWithDefault(msg, 2, ""), @@ -3265,23 +3265,23 @@ /** * Deserializes binary data (in protobuf wire format). * @param {jspb.ByteSource} bytes The bytes to deserialize. - * @return {!proto.identity.unauth.ReservedWalletLoginRequest} + * @return {!proto.identity.unauth.ReservedWalletRegistrationRequest} */ -proto.identity.unauth.ReservedWalletLoginRequest.deserializeBinary = function(bytes) { +proto.identity.unauth.ReservedWalletRegistrationRequest.deserializeBinary = function(bytes) { var reader = new jspb.BinaryReader(bytes); - var msg = new proto.identity.unauth.ReservedWalletLoginRequest; - return proto.identity.unauth.ReservedWalletLoginRequest.deserializeBinaryFromReader(msg, reader); + var msg = new proto.identity.unauth.ReservedWalletRegistrationRequest; + return proto.identity.unauth.ReservedWalletRegistrationRequest.deserializeBinaryFromReader(msg, reader); }; /** * Deserializes binary data (in protobuf wire format) from the * given reader into the given message object. - * @param {!proto.identity.unauth.ReservedWalletLoginRequest} msg The message object to deserialize into. + * @param {!proto.identity.unauth.ReservedWalletRegistrationRequest} msg The message object to deserialize into. * @param {!jspb.BinaryReader} reader The BinaryReader to use. - * @return {!proto.identity.unauth.ReservedWalletLoginRequest} + * @return {!proto.identity.unauth.ReservedWalletRegistrationRequest} */ -proto.identity.unauth.ReservedWalletLoginRequest.deserializeBinaryFromReader = function(msg, reader) { +proto.identity.unauth.ReservedWalletRegistrationRequest.deserializeBinaryFromReader = function(msg, reader) { while (reader.nextField()) { if (reader.isEndGroup()) { break; @@ -3322,9 +3322,9 @@ * Serializes the message to binary data (in protobuf wire format). * @return {!Uint8Array} */ -proto.identity.unauth.ReservedWalletLoginRequest.prototype.serializeBinary = function() { +proto.identity.unauth.ReservedWalletRegistrationRequest.prototype.serializeBinary = function() { var writer = new jspb.BinaryWriter(); - proto.identity.unauth.ReservedWalletLoginRequest.serializeBinaryToWriter(this, writer); + proto.identity.unauth.ReservedWalletRegistrationRequest.serializeBinaryToWriter(this, writer); return writer.getResultBuffer(); }; @@ -3332,11 +3332,11 @@ /** * Serializes the given message to binary data (in protobuf wire * format), writing to the given BinaryWriter. - * @param {!proto.identity.unauth.ReservedWalletLoginRequest} message + * @param {!proto.identity.unauth.ReservedWalletRegistrationRequest} message * @param {!jspb.BinaryWriter} writer * @suppress {unusedLocalVariables} f is only used for nested messages */ -proto.identity.unauth.ReservedWalletLoginRequest.serializeBinaryToWriter = function(message, writer) { +proto.identity.unauth.ReservedWalletRegistrationRequest.serializeBinaryToWriter = function(message, writer) { var f = undefined; f = message.getSiweMessage(); if (f.length > 0) { @@ -3381,16 +3381,16 @@ * optional string siwe_message = 1; * @return {string} */ -proto.identity.unauth.ReservedWalletLoginRequest.prototype.getSiweMessage = function() { +proto.identity.unauth.ReservedWalletRegistrationRequest.prototype.getSiweMessage = function() { return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, "")); }; /** * @param {string} value - * @return {!proto.identity.unauth.ReservedWalletLoginRequest} returns this + * @return {!proto.identity.unauth.ReservedWalletRegistrationRequest} returns this */ -proto.identity.unauth.ReservedWalletLoginRequest.prototype.setSiweMessage = function(value) { +proto.identity.unauth.ReservedWalletRegistrationRequest.prototype.setSiweMessage = function(value) { return jspb.Message.setProto3StringField(this, 1, value); }; @@ -3399,16 +3399,16 @@ * optional string siwe_signature = 2; * @return {string} */ -proto.identity.unauth.ReservedWalletLoginRequest.prototype.getSiweSignature = function() { +proto.identity.unauth.ReservedWalletRegistrationRequest.prototype.getSiweSignature = function() { return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, "")); }; /** * @param {string} value - * @return {!proto.identity.unauth.ReservedWalletLoginRequest} returns this + * @return {!proto.identity.unauth.ReservedWalletRegistrationRequest} returns this */ -proto.identity.unauth.ReservedWalletLoginRequest.prototype.setSiweSignature = function(value) { +proto.identity.unauth.ReservedWalletRegistrationRequest.prototype.setSiweSignature = function(value) { return jspb.Message.setProto3StringField(this, 2, value); }; @@ -3417,7 +3417,7 @@ * optional DeviceKeyUpload device_key_upload = 3; * @return {?proto.identity.unauth.DeviceKeyUpload} */ -proto.identity.unauth.ReservedWalletLoginRequest.prototype.getDeviceKeyUpload = function() { +proto.identity.unauth.ReservedWalletRegistrationRequest.prototype.getDeviceKeyUpload = function() { return /** @type{?proto.identity.unauth.DeviceKeyUpload} */ ( jspb.Message.getWrapperField(this, proto.identity.unauth.DeviceKeyUpload, 3)); }; @@ -3425,18 +3425,18 @@ /** * @param {?proto.identity.unauth.DeviceKeyUpload|undefined} value - * @return {!proto.identity.unauth.ReservedWalletLoginRequest} returns this + * @return {!proto.identity.unauth.ReservedWalletRegistrationRequest} returns this */ -proto.identity.unauth.ReservedWalletLoginRequest.prototype.setDeviceKeyUpload = function(value) { +proto.identity.unauth.ReservedWalletRegistrationRequest.prototype.setDeviceKeyUpload = function(value) { return jspb.Message.setWrapperField(this, 3, value); }; /** * Clears the message field making it undefined. - * @return {!proto.identity.unauth.ReservedWalletLoginRequest} returns this + * @return {!proto.identity.unauth.ReservedWalletRegistrationRequest} returns this */ -proto.identity.unauth.ReservedWalletLoginRequest.prototype.clearDeviceKeyUpload = function() { +proto.identity.unauth.ReservedWalletRegistrationRequest.prototype.clearDeviceKeyUpload = function() { return this.setDeviceKeyUpload(undefined); }; @@ -3445,7 +3445,7 @@ * Returns whether this field is set. * @return {boolean} */ -proto.identity.unauth.ReservedWalletLoginRequest.prototype.hasDeviceKeyUpload = function() { +proto.identity.unauth.ReservedWalletRegistrationRequest.prototype.hasDeviceKeyUpload = function() { return jspb.Message.getField(this, 3) != null; }; @@ -3454,16 +3454,16 @@ * optional string keyserver_message = 4; * @return {string} */ -proto.identity.unauth.ReservedWalletLoginRequest.prototype.getKeyserverMessage = function() { +proto.identity.unauth.ReservedWalletRegistrationRequest.prototype.getKeyserverMessage = function() { return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, "")); }; /** * @param {string} value - * @return {!proto.identity.unauth.ReservedWalletLoginRequest} returns this + * @return {!proto.identity.unauth.ReservedWalletRegistrationRequest} returns this */ -proto.identity.unauth.ReservedWalletLoginRequest.prototype.setKeyserverMessage = function(value) { +proto.identity.unauth.ReservedWalletRegistrationRequest.prototype.setKeyserverMessage = function(value) { return jspb.Message.setProto3StringField(this, 4, value); }; @@ -3472,16 +3472,16 @@ * optional string keyserver_signature = 5; * @return {string} */ -proto.identity.unauth.ReservedWalletLoginRequest.prototype.getKeyserverSignature = function() { +proto.identity.unauth.ReservedWalletRegistrationRequest.prototype.getKeyserverSignature = function() { return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, "")); }; /** * @param {string} value - * @return {!proto.identity.unauth.ReservedWalletLoginRequest} returns this + * @return {!proto.identity.unauth.ReservedWalletRegistrationRequest} returns this */ -proto.identity.unauth.ReservedWalletLoginRequest.prototype.setKeyserverSignature = function(value) { +proto.identity.unauth.ReservedWalletRegistrationRequest.prototype.setKeyserverSignature = function(value) { return jspb.Message.setProto3StringField(this, 5, value); }; diff --git a/web/protobufs/identity-unauth-structs.cjs.flow b/web/protobufs/identity-unauth-structs.cjs.flow --- a/web/protobufs/identity-unauth-structs.cjs.flow +++ b/web/protobufs/identity-unauth-structs.cjs.flow @@ -334,33 +334,33 @@ deviceKeyUpload?: DeviceKeyUploadObject, }; -declare export class ReservedWalletLoginRequest extends Message { +declare export class ReservedWalletRegistrationRequest extends Message { getSiweMessage(): string; - setSiweMessage(value: string): ReservedWalletLoginRequest; + setSiweMessage(value: string): ReservedWalletRegistrationRequest; getSiweSignature(): string; - setSiweSignature(value: string): ReservedWalletLoginRequest; + setSiweSignature(value: string): ReservedWalletRegistrationRequest; getDeviceKeyUpload(): DeviceKeyUpload | void; - setDeviceKeyUpload(value?: DeviceKeyUpload): ReservedWalletLoginRequest; + setDeviceKeyUpload(value?: DeviceKeyUpload): ReservedWalletRegistrationRequest; hasDeviceKeyUpload(): boolean; - clearDeviceKeyUpload(): ReservedWalletLoginRequest; + clearDeviceKeyUpload(): ReservedWalletRegistrationRequest; getKeyserverMessage(): string; - setKeyserverMessage(value: string): ReservedWalletLoginRequest; + setKeyserverMessage(value: string): ReservedWalletRegistrationRequest; getKeyserverSignature(): string; - setKeyserverSignature(value: string): ReservedWalletLoginRequest; + setKeyserverSignature(value: string): ReservedWalletRegistrationRequest; serializeBinary(): Uint8Array; - toObject(includeInstance?: boolean): ReservedWalletLoginRequestObject; - static toObject(includeInstance: boolean, msg: ReservedWalletLoginRequest): ReservedWalletLoginRequestObject; - static serializeBinaryToWriter(message: ReservedWalletLoginRequest, writer: BinaryWriter): void; - static deserializeBinary(bytes: Uint8Array): ReservedWalletLoginRequest; - static deserializeBinaryFromReader(message: ReservedWalletLoginRequest, reader: BinaryReader): ReservedWalletLoginRequest; + toObject(includeInstance?: boolean): ReservedWalletRegistrationRequestObject; + static toObject(includeInstance: boolean, msg: ReservedWalletRegistrationRequest): ReservedWalletRegistrationRequestObject; + static serializeBinaryToWriter(message: ReservedWalletRegistrationRequest, writer: BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): ReservedWalletRegistrationRequest; + static deserializeBinaryFromReader(message: ReservedWalletRegistrationRequest, reader: BinaryReader): ReservedWalletRegistrationRequest; } -export type ReservedWalletLoginRequestObject = { +export type ReservedWalletRegistrationRequestObject = { siweMessage: string, siweSignature: string, deviceKeyUpload?: DeviceKeyUploadObject, diff --git a/web/protobufs/identity-unauth.cjs b/web/protobufs/identity-unauth.cjs --- a/web/protobufs/identity-unauth.cjs +++ b/web/protobufs/identity-unauth.cjs @@ -445,16 +445,16 @@ /** * @const * @type {!grpc.web.MethodDescriptor< - * !proto.identity.unauth.ReservedWalletLoginRequest, + * !proto.identity.unauth.ReservedWalletRegistrationRequest, * !proto.identity.unauth.AuthResponse>} */ -const methodDescriptor_IdentityClientService_LogInReservedWalletUser = new grpc.web.MethodDescriptor( - '/identity.unauth.IdentityClientService/LogInReservedWalletUser', +const methodDescriptor_IdentityClientService_RegisterReservedWalletUser = new grpc.web.MethodDescriptor( + '/identity.unauth.IdentityClientService/RegisterReservedWalletUser', grpc.web.MethodType.UNARY, - proto.identity.unauth.ReservedWalletLoginRequest, + proto.identity.unauth.ReservedWalletRegistrationRequest, proto.identity.unauth.AuthResponse, /** - * @param {!proto.identity.unauth.ReservedWalletLoginRequest} request + * @param {!proto.identity.unauth.ReservedWalletRegistrationRequest} request * @return {!Uint8Array} */ function(request) { @@ -465,7 +465,7 @@ /** - * @param {!proto.identity.unauth.ReservedWalletLoginRequest} request The + * @param {!proto.identity.unauth.ReservedWalletRegistrationRequest} request The * request proto * @param {?Object} metadata User defined * call metadata @@ -474,32 +474,32 @@ * @return {!grpc.web.ClientReadableStream|undefined} * The XHR Node Readable Stream */ -proto.identity.unauth.IdentityClientServiceClient.prototype.logInReservedWalletUser = +proto.identity.unauth.IdentityClientServiceClient.prototype.registerReservedWalletUser = function(request, metadata, callback) { return this.client_.rpcCall(this.hostname_ + - '/identity.unauth.IdentityClientService/LogInReservedWalletUser', + '/identity.unauth.IdentityClientService/RegisterReservedWalletUser', request, metadata || {}, - methodDescriptor_IdentityClientService_LogInReservedWalletUser, + methodDescriptor_IdentityClientService_RegisterReservedWalletUser, callback); }; /** - * @param {!proto.identity.unauth.ReservedWalletLoginRequest} request The + * @param {!proto.identity.unauth.ReservedWalletRegistrationRequest} request The * request proto * @param {?Object=} metadata User defined * call metadata * @return {!Promise} * Promise that resolves to the response */ -proto.identity.unauth.IdentityClientServicePromiseClient.prototype.logInReservedWalletUser = +proto.identity.unauth.IdentityClientServicePromiseClient.prototype.registerReservedWalletUser = function(request, metadata) { return this.client_.unaryCall(this.hostname_ + - '/identity.unauth.IdentityClientService/LogInReservedWalletUser', + '/identity.unauth.IdentityClientService/RegisterReservedWalletUser', request, metadata || {}, - methodDescriptor_IdentityClientService_LogInReservedWalletUser); + methodDescriptor_IdentityClientService_RegisterReservedWalletUser); }; diff --git a/web/protobufs/identity-unauth.cjs.flow b/web/protobufs/identity-unauth.cjs.flow --- a/web/protobufs/identity-unauth.cjs.flow +++ b/web/protobufs/identity-unauth.cjs.flow @@ -51,8 +51,8 @@ response: identityStructs.AuthResponse) => void ): grpcWeb.ClientReadableStream; - logInReservedWalletUser( - request: identityStructs.ReservedWalletLoginRequest, + registerReservedWalletUser( + request: identityStructs.ReservedWalletRegistrationRequest, metadata: grpcWeb.Metadata | void, callback: (err: grpcWeb.RpcError, response: identityStructs.AuthResponse) => void @@ -137,8 +137,8 @@ metadata?: grpcWeb.Metadata ): Promise; - logInReservedWalletUser( - request: identityStructs.ReservedWalletLoginRequest, + registerReservedWalletUser( + request: identityStructs.ReservedWalletRegistrationRequest, metadata?: grpcWeb.Metadata ): Promise;