| Index: mojo/dart/packages/mojo_services/lib/authentication/authentication.mojom.dart
|
| diff --git a/mojo/dart/packages/mojo_services/lib/authentication/authentication.mojom.dart b/mojo/dart/packages/mojo_services/lib/authentication/authentication.mojom.dart
|
| index babd02f386d9d72c6b98890d144cbb0d7d312108..e9ebee6a10c1f5109018280769b92a012d036c0e 100644
|
| --- a/mojo/dart/packages/mojo_services/lib/authentication/authentication.mojom.dart
|
| +++ b/mojo/dart/packages/mojo_services/lib/authentication/authentication.mojom.dart
|
| @@ -426,9 +426,370 @@ class _AuthenticationServiceClearOAuth2TokenParams extends bindings.Struct {
|
| }
|
| }
|
|
|
| +
|
| +class _AuthenticationServiceGetOAuth2DeviceCodeParams extends bindings.Struct {
|
| + static const List<bindings.StructDataHeader> kVersions = const [
|
| + const bindings.StructDataHeader(16, 0)
|
| + ];
|
| + List<String> scopes = null;
|
| +
|
| + _AuthenticationServiceGetOAuth2DeviceCodeParams() : super(kVersions.last.size);
|
| +
|
| + static _AuthenticationServiceGetOAuth2DeviceCodeParams deserialize(bindings.Message message) {
|
| + var decoder = new bindings.Decoder(message);
|
| + var result = decode(decoder);
|
| + if (decoder.excessHandles != null) {
|
| + decoder.excessHandles.forEach((h) => h.close());
|
| + }
|
| + return result;
|
| + }
|
| +
|
| + static _AuthenticationServiceGetOAuth2DeviceCodeParams decode(bindings.Decoder decoder0) {
|
| + if (decoder0 == null) {
|
| + return null;
|
| + }
|
| + _AuthenticationServiceGetOAuth2DeviceCodeParams result = new _AuthenticationServiceGetOAuth2DeviceCodeParams();
|
| +
|
| + var mainDataHeader = decoder0.decodeStructDataHeader();
|
| + if (mainDataHeader.version <= kVersions.last.version) {
|
| + // Scan in reverse order to optimize for more recent versions.
|
| + for (int i = kVersions.length - 1; i >= 0; --i) {
|
| + if (mainDataHeader.version >= kVersions[i].version) {
|
| + if (mainDataHeader.size == kVersions[i].size) {
|
| + // Found a match.
|
| + break;
|
| + }
|
| + throw new bindings.MojoCodecError(
|
| + 'Header size doesn\'t correspond to known version size.');
|
| + }
|
| + }
|
| + } else if (mainDataHeader.size < kVersions.last.size) {
|
| + throw new bindings.MojoCodecError(
|
| + 'Message newer than the last known version cannot be shorter than '
|
| + 'required by the last known version.');
|
| + }
|
| + if (mainDataHeader.version >= 0) {
|
| +
|
| + var decoder1 = decoder0.decodePointer(8, false);
|
| + {
|
| + var si1 = decoder1.decodeDataHeaderForPointerArray(bindings.kUnspecifiedArrayLength);
|
| + result.scopes = new List<String>(si1.numElements);
|
| + for (int i1 = 0; i1 < si1.numElements; ++i1) {
|
| +
|
| + result.scopes[i1] = decoder1.decodeString(bindings.ArrayDataHeader.kHeaderSize + bindings.kPointerSize * i1, false);
|
| + }
|
| + }
|
| + }
|
| + return result;
|
| + }
|
| +
|
| + void encode(bindings.Encoder encoder) {
|
| + var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last);
|
| + try {
|
| + if (scopes == null) {
|
| + encoder0.encodeNullPointer(8, false);
|
| + } else {
|
| + var encoder1 = encoder0.encodePointerArray(scopes.length, 8, bindings.kUnspecifiedArrayLength);
|
| + for (int i0 = 0; i0 < scopes.length; ++i0) {
|
| + encoder1.encodeString(scopes[i0], bindings.ArrayDataHeader.kHeaderSize + bindings.kPointerSize * i0, false);
|
| + }
|
| + }
|
| + } on bindings.MojoCodecError catch(e) {
|
| + e.message = "Error encountered while encoding field "
|
| + "scopes of struct _AuthenticationServiceGetOAuth2DeviceCodeParams: $e";
|
| + rethrow;
|
| + }
|
| + }
|
| +
|
| + String toString() {
|
| + return "_AuthenticationServiceGetOAuth2DeviceCodeParams("
|
| + "scopes: $scopes" ")";
|
| + }
|
| +
|
| + Map toJson() {
|
| + Map map = new Map();
|
| + map["scopes"] = scopes;
|
| + return map;
|
| + }
|
| +}
|
| +
|
| +
|
| +class AuthenticationServiceGetOAuth2DeviceCodeResponseParams extends bindings.Struct {
|
| + static const List<bindings.StructDataHeader> kVersions = const [
|
| + const bindings.StructDataHeader(40, 0)
|
| + ];
|
| + String verificationUrl = null;
|
| + String deviceCode = null;
|
| + String userCode = null;
|
| + String error = null;
|
| +
|
| + AuthenticationServiceGetOAuth2DeviceCodeResponseParams() : super(kVersions.last.size);
|
| +
|
| + static AuthenticationServiceGetOAuth2DeviceCodeResponseParams deserialize(bindings.Message message) {
|
| + var decoder = new bindings.Decoder(message);
|
| + var result = decode(decoder);
|
| + if (decoder.excessHandles != null) {
|
| + decoder.excessHandles.forEach((h) => h.close());
|
| + }
|
| + return result;
|
| + }
|
| +
|
| + static AuthenticationServiceGetOAuth2DeviceCodeResponseParams decode(bindings.Decoder decoder0) {
|
| + if (decoder0 == null) {
|
| + return null;
|
| + }
|
| + AuthenticationServiceGetOAuth2DeviceCodeResponseParams result = new AuthenticationServiceGetOAuth2DeviceCodeResponseParams();
|
| +
|
| + var mainDataHeader = decoder0.decodeStructDataHeader();
|
| + if (mainDataHeader.version <= kVersions.last.version) {
|
| + // Scan in reverse order to optimize for more recent versions.
|
| + for (int i = kVersions.length - 1; i >= 0; --i) {
|
| + if (mainDataHeader.version >= kVersions[i].version) {
|
| + if (mainDataHeader.size == kVersions[i].size) {
|
| + // Found a match.
|
| + break;
|
| + }
|
| + throw new bindings.MojoCodecError(
|
| + 'Header size doesn\'t correspond to known version size.');
|
| + }
|
| + }
|
| + } else if (mainDataHeader.size < kVersions.last.size) {
|
| + throw new bindings.MojoCodecError(
|
| + 'Message newer than the last known version cannot be shorter than '
|
| + 'required by the last known version.');
|
| + }
|
| + if (mainDataHeader.version >= 0) {
|
| +
|
| + result.verificationUrl = decoder0.decodeString(8, true);
|
| + }
|
| + if (mainDataHeader.version >= 0) {
|
| +
|
| + result.deviceCode = decoder0.decodeString(16, true);
|
| + }
|
| + if (mainDataHeader.version >= 0) {
|
| +
|
| + result.userCode = decoder0.decodeString(24, true);
|
| + }
|
| + if (mainDataHeader.version >= 0) {
|
| +
|
| + result.error = decoder0.decodeString(32, true);
|
| + }
|
| + return result;
|
| + }
|
| +
|
| + void encode(bindings.Encoder encoder) {
|
| + var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last);
|
| + try {
|
| + encoder0.encodeString(verificationUrl, 8, true);
|
| + } on bindings.MojoCodecError catch(e) {
|
| + e.message = "Error encountered while encoding field "
|
| + "verificationUrl of struct AuthenticationServiceGetOAuth2DeviceCodeResponseParams: $e";
|
| + rethrow;
|
| + }
|
| + try {
|
| + encoder0.encodeString(deviceCode, 16, true);
|
| + } on bindings.MojoCodecError catch(e) {
|
| + e.message = "Error encountered while encoding field "
|
| + "deviceCode of struct AuthenticationServiceGetOAuth2DeviceCodeResponseParams: $e";
|
| + rethrow;
|
| + }
|
| + try {
|
| + encoder0.encodeString(userCode, 24, true);
|
| + } on bindings.MojoCodecError catch(e) {
|
| + e.message = "Error encountered while encoding field "
|
| + "userCode of struct AuthenticationServiceGetOAuth2DeviceCodeResponseParams: $e";
|
| + rethrow;
|
| + }
|
| + try {
|
| + encoder0.encodeString(error, 32, true);
|
| + } on bindings.MojoCodecError catch(e) {
|
| + e.message = "Error encountered while encoding field "
|
| + "error of struct AuthenticationServiceGetOAuth2DeviceCodeResponseParams: $e";
|
| + rethrow;
|
| + }
|
| + }
|
| +
|
| + String toString() {
|
| + return "AuthenticationServiceGetOAuth2DeviceCodeResponseParams("
|
| + "verificationUrl: $verificationUrl" ", "
|
| + "deviceCode: $deviceCode" ", "
|
| + "userCode: $userCode" ", "
|
| + "error: $error" ")";
|
| + }
|
| +
|
| + Map toJson() {
|
| + Map map = new Map();
|
| + map["verificationUrl"] = verificationUrl;
|
| + map["deviceCode"] = deviceCode;
|
| + map["userCode"] = userCode;
|
| + map["error"] = error;
|
| + return map;
|
| + }
|
| +}
|
| +
|
| +
|
| +class _AuthenticationServiceAddAccountParams extends bindings.Struct {
|
| + static const List<bindings.StructDataHeader> kVersions = const [
|
| + const bindings.StructDataHeader(16, 0)
|
| + ];
|
| + String deviceCode = null;
|
| +
|
| + _AuthenticationServiceAddAccountParams() : super(kVersions.last.size);
|
| +
|
| + static _AuthenticationServiceAddAccountParams deserialize(bindings.Message message) {
|
| + var decoder = new bindings.Decoder(message);
|
| + var result = decode(decoder);
|
| + if (decoder.excessHandles != null) {
|
| + decoder.excessHandles.forEach((h) => h.close());
|
| + }
|
| + return result;
|
| + }
|
| +
|
| + static _AuthenticationServiceAddAccountParams decode(bindings.Decoder decoder0) {
|
| + if (decoder0 == null) {
|
| + return null;
|
| + }
|
| + _AuthenticationServiceAddAccountParams result = new _AuthenticationServiceAddAccountParams();
|
| +
|
| + var mainDataHeader = decoder0.decodeStructDataHeader();
|
| + if (mainDataHeader.version <= kVersions.last.version) {
|
| + // Scan in reverse order to optimize for more recent versions.
|
| + for (int i = kVersions.length - 1; i >= 0; --i) {
|
| + if (mainDataHeader.version >= kVersions[i].version) {
|
| + if (mainDataHeader.size == kVersions[i].size) {
|
| + // Found a match.
|
| + break;
|
| + }
|
| + throw new bindings.MojoCodecError(
|
| + 'Header size doesn\'t correspond to known version size.');
|
| + }
|
| + }
|
| + } else if (mainDataHeader.size < kVersions.last.size) {
|
| + throw new bindings.MojoCodecError(
|
| + 'Message newer than the last known version cannot be shorter than '
|
| + 'required by the last known version.');
|
| + }
|
| + if (mainDataHeader.version >= 0) {
|
| +
|
| + result.deviceCode = decoder0.decodeString(8, false);
|
| + }
|
| + return result;
|
| + }
|
| +
|
| + void encode(bindings.Encoder encoder) {
|
| + var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last);
|
| + try {
|
| + encoder0.encodeString(deviceCode, 8, false);
|
| + } on bindings.MojoCodecError catch(e) {
|
| + e.message = "Error encountered while encoding field "
|
| + "deviceCode of struct _AuthenticationServiceAddAccountParams: $e";
|
| + rethrow;
|
| + }
|
| + }
|
| +
|
| + String toString() {
|
| + return "_AuthenticationServiceAddAccountParams("
|
| + "deviceCode: $deviceCode" ")";
|
| + }
|
| +
|
| + Map toJson() {
|
| + Map map = new Map();
|
| + map["deviceCode"] = deviceCode;
|
| + return map;
|
| + }
|
| +}
|
| +
|
| +
|
| +class AuthenticationServiceAddAccountResponseParams extends bindings.Struct {
|
| + static const List<bindings.StructDataHeader> kVersions = const [
|
| + const bindings.StructDataHeader(24, 0)
|
| + ];
|
| + String username = null;
|
| + String error = null;
|
| +
|
| + AuthenticationServiceAddAccountResponseParams() : super(kVersions.last.size);
|
| +
|
| + static AuthenticationServiceAddAccountResponseParams deserialize(bindings.Message message) {
|
| + var decoder = new bindings.Decoder(message);
|
| + var result = decode(decoder);
|
| + if (decoder.excessHandles != null) {
|
| + decoder.excessHandles.forEach((h) => h.close());
|
| + }
|
| + return result;
|
| + }
|
| +
|
| + static AuthenticationServiceAddAccountResponseParams decode(bindings.Decoder decoder0) {
|
| + if (decoder0 == null) {
|
| + return null;
|
| + }
|
| + AuthenticationServiceAddAccountResponseParams result = new AuthenticationServiceAddAccountResponseParams();
|
| +
|
| + var mainDataHeader = decoder0.decodeStructDataHeader();
|
| + if (mainDataHeader.version <= kVersions.last.version) {
|
| + // Scan in reverse order to optimize for more recent versions.
|
| + for (int i = kVersions.length - 1; i >= 0; --i) {
|
| + if (mainDataHeader.version >= kVersions[i].version) {
|
| + if (mainDataHeader.size == kVersions[i].size) {
|
| + // Found a match.
|
| + break;
|
| + }
|
| + throw new bindings.MojoCodecError(
|
| + 'Header size doesn\'t correspond to known version size.');
|
| + }
|
| + }
|
| + } else if (mainDataHeader.size < kVersions.last.size) {
|
| + throw new bindings.MojoCodecError(
|
| + 'Message newer than the last known version cannot be shorter than '
|
| + 'required by the last known version.');
|
| + }
|
| + if (mainDataHeader.version >= 0) {
|
| +
|
| + result.username = decoder0.decodeString(8, true);
|
| + }
|
| + if (mainDataHeader.version >= 0) {
|
| +
|
| + result.error = decoder0.decodeString(16, true);
|
| + }
|
| + return result;
|
| + }
|
| +
|
| + void encode(bindings.Encoder encoder) {
|
| + var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last);
|
| + try {
|
| + encoder0.encodeString(username, 8, true);
|
| + } on bindings.MojoCodecError catch(e) {
|
| + e.message = "Error encountered while encoding field "
|
| + "username of struct AuthenticationServiceAddAccountResponseParams: $e";
|
| + rethrow;
|
| + }
|
| + try {
|
| + encoder0.encodeString(error, 16, true);
|
| + } on bindings.MojoCodecError catch(e) {
|
| + e.message = "Error encountered while encoding field "
|
| + "error of struct AuthenticationServiceAddAccountResponseParams: $e";
|
| + rethrow;
|
| + }
|
| + }
|
| +
|
| + String toString() {
|
| + return "AuthenticationServiceAddAccountResponseParams("
|
| + "username: $username" ", "
|
| + "error: $error" ")";
|
| + }
|
| +
|
| + Map toJson() {
|
| + Map map = new Map();
|
| + map["username"] = username;
|
| + map["error"] = error;
|
| + return map;
|
| + }
|
| +}
|
| +
|
| const int _AuthenticationService_selectAccountName = 0;
|
| const int _AuthenticationService_getOAuth2TokenName = 1;
|
| const int _AuthenticationService_clearOAuth2TokenName = 2;
|
| +const int _AuthenticationService_getOAuth2DeviceCodeName = 3;
|
| +const int _AuthenticationService_addAccountName = 4;
|
|
|
| class _AuthenticationServiceServiceDescription implements service_describer.ServiceDescription {
|
| dynamic getTopLevelInterface([Function responseFactory]) =>
|
| @@ -446,6 +807,8 @@ abstract class AuthenticationService {
|
| dynamic selectAccount(bool returnLastSelected,[Function responseFactory = null]);
|
| dynamic getOAuth2Token(String username,List<String> scopes,[Function responseFactory = null]);
|
| void clearOAuth2Token(String token);
|
| + dynamic getOAuth2DeviceCode(List<String> scopes,[Function responseFactory = null]);
|
| + dynamic addAccount(String deviceCode,[Function responseFactory = null]);
|
| }
|
|
|
|
|
| @@ -509,6 +872,46 @@ class _AuthenticationServiceProxyImpl extends bindings.Proxy {
|
| }
|
| c.complete(r);
|
| break;
|
| + case _AuthenticationService_getOAuth2DeviceCodeName:
|
| + var r = AuthenticationServiceGetOAuth2DeviceCodeResponseParams.deserialize(
|
| + message.payload);
|
| + if (!message.header.hasRequestId) {
|
| + proxyError("Expected a message with a valid request Id.");
|
| + return;
|
| + }
|
| + Completer c = completerMap[message.header.requestId];
|
| + if (c == null) {
|
| + proxyError(
|
| + "Message had unknown request Id: ${message.header.requestId}");
|
| + return;
|
| + }
|
| + completerMap.remove(message.header.requestId);
|
| + if (c.isCompleted) {
|
| + proxyError("Response completer already completed");
|
| + return;
|
| + }
|
| + c.complete(r);
|
| + break;
|
| + case _AuthenticationService_addAccountName:
|
| + var r = AuthenticationServiceAddAccountResponseParams.deserialize(
|
| + message.payload);
|
| + if (!message.header.hasRequestId) {
|
| + proxyError("Expected a message with a valid request Id.");
|
| + return;
|
| + }
|
| + Completer c = completerMap[message.header.requestId];
|
| + if (c == null) {
|
| + proxyError(
|
| + "Message had unknown request Id: ${message.header.requestId}");
|
| + return;
|
| + }
|
| + completerMap.remove(message.header.requestId);
|
| + if (c.isCompleted) {
|
| + proxyError("Response completer already completed");
|
| + return;
|
| + }
|
| + c.complete(r);
|
| + break;
|
| default:
|
| proxyError("Unexpected message type: ${message.header.type}");
|
| close(immediate: true);
|
| @@ -555,6 +958,24 @@ class _AuthenticationServiceProxyCalls implements AuthenticationService {
|
| params.token = token;
|
| _proxyImpl.sendMessage(params, _AuthenticationService_clearOAuth2TokenName);
|
| }
|
| + dynamic getOAuth2DeviceCode(List<String> scopes,[Function responseFactory = null]) {
|
| + var params = new _AuthenticationServiceGetOAuth2DeviceCodeParams();
|
| + params.scopes = scopes;
|
| + return _proxyImpl.sendMessageWithRequestId(
|
| + params,
|
| + _AuthenticationService_getOAuth2DeviceCodeName,
|
| + -1,
|
| + bindings.MessageHeader.kMessageExpectsResponse);
|
| + }
|
| + dynamic addAccount(String deviceCode,[Function responseFactory = null]) {
|
| + var params = new _AuthenticationServiceAddAccountParams();
|
| + params.deviceCode = deviceCode;
|
| + return _proxyImpl.sendMessageWithRequestId(
|
| + params,
|
| + _AuthenticationService_addAccountName,
|
| + -1,
|
| + bindings.MessageHeader.kMessageExpectsResponse);
|
| + }
|
| }
|
|
|
|
|
| @@ -648,6 +1069,20 @@ class AuthenticationServiceStub extends bindings.Stub {
|
| mojo_factory_result.error = error;
|
| return mojo_factory_result;
|
| }
|
| + AuthenticationServiceGetOAuth2DeviceCodeResponseParams _AuthenticationServiceGetOAuth2DeviceCodeResponseParamsFactory(String verificationUrl, String deviceCode, String userCode, String error) {
|
| + var mojo_factory_result = new AuthenticationServiceGetOAuth2DeviceCodeResponseParams();
|
| + mojo_factory_result.verificationUrl = verificationUrl;
|
| + mojo_factory_result.deviceCode = deviceCode;
|
| + mojo_factory_result.userCode = userCode;
|
| + mojo_factory_result.error = error;
|
| + return mojo_factory_result;
|
| + }
|
| + AuthenticationServiceAddAccountResponseParams _AuthenticationServiceAddAccountResponseParamsFactory(String username, String error) {
|
| + var mojo_factory_result = new AuthenticationServiceAddAccountResponseParams();
|
| + mojo_factory_result.username = username;
|
| + mojo_factory_result.error = error;
|
| + return mojo_factory_result;
|
| + }
|
|
|
| dynamic handleMessage(bindings.ServiceMessage message) {
|
| if (bindings.ControlMessageHandler.isControlMessage(message)) {
|
| @@ -706,6 +1141,50 @@ class AuthenticationServiceStub extends bindings.Stub {
|
| message.payload);
|
| _impl.clearOAuth2Token(params.token);
|
| break;
|
| + case _AuthenticationService_getOAuth2DeviceCodeName:
|
| + var params = _AuthenticationServiceGetOAuth2DeviceCodeParams.deserialize(
|
| + message.payload);
|
| + var response = _impl.getOAuth2DeviceCode(params.scopes,_AuthenticationServiceGetOAuth2DeviceCodeResponseParamsFactory);
|
| + if (response is Future) {
|
| + return response.then((response) {
|
| + if (response != null) {
|
| + return buildResponseWithId(
|
| + response,
|
| + _AuthenticationService_getOAuth2DeviceCodeName,
|
| + message.header.requestId,
|
| + bindings.MessageHeader.kMessageIsResponse);
|
| + }
|
| + });
|
| + } else if (response != null) {
|
| + return buildResponseWithId(
|
| + response,
|
| + _AuthenticationService_getOAuth2DeviceCodeName,
|
| + message.header.requestId,
|
| + bindings.MessageHeader.kMessageIsResponse);
|
| + }
|
| + break;
|
| + case _AuthenticationService_addAccountName:
|
| + var params = _AuthenticationServiceAddAccountParams.deserialize(
|
| + message.payload);
|
| + var response = _impl.addAccount(params.deviceCode,_AuthenticationServiceAddAccountResponseParamsFactory);
|
| + if (response is Future) {
|
| + return response.then((response) {
|
| + if (response != null) {
|
| + return buildResponseWithId(
|
| + response,
|
| + _AuthenticationService_addAccountName,
|
| + message.header.requestId,
|
| + bindings.MessageHeader.kMessageIsResponse);
|
| + }
|
| + });
|
| + } else if (response != null) {
|
| + return buildResponseWithId(
|
| + response,
|
| + _AuthenticationService_addAccountName,
|
| + message.header.requestId,
|
| + bindings.MessageHeader.kMessageIsResponse);
|
| + }
|
| + break;
|
| default:
|
| throw new bindings.MojoCodecError("Unexpected message name");
|
| break;
|
|
|