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 98fc97a72f669074d6c565d3a30fa9c73f0a27f2..5cd9ceff9f52f34d96855b9547cd01766e2931b0 100644 |
--- a/mojo/dart/packages/mojo_services/lib/authentication/authentication.mojom.dart |
+++ b/mojo/dart/packages/mojo_services/lib/authentication/authentication.mojom.dart |
@@ -388,9 +388,331 @@ 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); |
+ |
+ 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); |
+ } |
+ } |
+ } |
+ |
+ 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); |
+ |
+ encoder0.encodeString(verificationUrl, 8, true); |
+ |
+ encoder0.encodeString(deviceCode, 16, true); |
+ |
+ encoder0.encodeString(userCode, 24, true); |
+ |
+ encoder0.encodeString(error, 32, true); |
+ } |
+ |
+ 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); |
+ |
+ encoder0.encodeString(deviceCode, 8, false); |
+ } |
+ |
+ 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); |
+ |
+ encoder0.encodeString(username, 8, true); |
+ |
+ encoder0.encodeString(error, 16, true); |
+ } |
+ |
+ String toString() { |
+ return "AuthenticationServiceAddAccountResponseParams(" |
+ "username: $username" ", " |
+ "error: $error" ")"; |
+ } |
+ |
+ Map toJson() { |
+ Map map = new Map(); |
+ map["username"] = username; |
+ map["error"] = error; |
+ return map; |
+ } |
+} |
+ |
const int kAuthenticationService_selectAccount_name = 0; |
const int kAuthenticationService_getOAuth2Token_name = 1; |
const int kAuthenticationService_clearOAuth2Token_name = 2; |
+const int kAuthenticationService_getOAuth2DeviceCode_name = 3; |
+const int kAuthenticationService_addAccount_name = 4; |
const String AuthenticationServiceName = |
'authentication::AuthenticationService'; |
@@ -399,6 +721,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]); |
} |
@@ -462,6 +786,46 @@ class AuthenticationServiceProxyImpl extends bindings.Proxy { |
} |
c.complete(r); |
break; |
+ case kAuthenticationService_getOAuth2DeviceCode_name: |
+ 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 kAuthenticationService_addAccount_name: |
+ 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); |
@@ -509,6 +873,24 @@ class _AuthenticationServiceProxyCalls implements AuthenticationService { |
_proxyImpl.sendMessage(params, kAuthenticationService_clearOAuth2Token_name); |
} |
+ dynamic getOAuth2DeviceCode(List<String> scopes,[Function responseFactory = null]) { |
+ var params = new AuthenticationServiceGetOAuth2DeviceCodeParams(); |
+ params.scopes = scopes; |
+ return _proxyImpl.sendMessageWithRequestId( |
+ params, |
+ kAuthenticationService_getOAuth2DeviceCode_name, |
+ -1, |
+ bindings.MessageHeader.kMessageExpectsResponse); |
+ } |
+ dynamic addAccount(String deviceCode,[Function responseFactory = null]) { |
+ var params = new AuthenticationServiceAddAccountParams(); |
+ params.deviceCode = deviceCode; |
+ return _proxyImpl.sendMessageWithRequestId( |
+ params, |
+ kAuthenticationService_addAccount_name, |
+ -1, |
+ bindings.MessageHeader.kMessageExpectsResponse); |
+ } |
} |
@@ -603,6 +985,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)) { |
@@ -661,6 +1057,50 @@ class AuthenticationServiceStub extends bindings.Stub { |
message.payload); |
_impl.clearOAuth2Token(params.token); |
break; |
+ case kAuthenticationService_getOAuth2DeviceCode_name: |
+ 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, |
+ kAuthenticationService_getOAuth2DeviceCode_name, |
+ message.header.requestId, |
+ bindings.MessageHeader.kMessageIsResponse); |
+ } |
+ }); |
+ } else if (response != null) { |
+ return buildResponseWithId( |
+ response, |
+ kAuthenticationService_getOAuth2DeviceCode_name, |
+ message.header.requestId, |
+ bindings.MessageHeader.kMessageIsResponse); |
+ } |
+ break; |
+ case kAuthenticationService_addAccount_name: |
+ 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, |
+ kAuthenticationService_addAccount_name, |
+ message.header.requestId, |
+ bindings.MessageHeader.kMessageIsResponse); |
+ } |
+ }); |
+ } else if (response != null) { |
+ return buildResponseWithId( |
+ response, |
+ kAuthenticationService_addAccount_name, |
+ message.header.requestId, |
+ bindings.MessageHeader.kMessageIsResponse); |
+ } |
+ break; |
default: |
throw new bindings.MojoCodecError("Unexpected message name"); |
break; |