1
=== removed file 'tests/utils/com.ubuntu.OnlineAccounts.Manager.xml'
2
--- tests/utils/com.ubuntu.OnlineAccounts.Manager.xml	2016-07-12 02:25:26 +0000
3
+++ tests/utils/com.ubuntu.OnlineAccounts.Manager.xml	1970-01-01 00:00:00 +0000
4
@@ -1,153 +0,0 @@
5
1
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
6
2
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
7
3
8
4
<node name="/com/ubuntu/OnlineAccounts/Manager">
9
5
  <interface name="com.ubuntu.OnlineAccounts.Manager">
10
6
11
7
    <!--
12
8
      Global concepts:
13
9
14
10
      Clients are identified by their "applicationId", which is the
15
11
      "<package>_<app>" of the client.
16
12
17
13
      The "serviceId" is an application-specific name for an account provider.
18
14
      That is, the "serviceId" contains the information about the application
19
15
      which will use it, and the account provider (e.g. "google", "facebook").
20
16
      "serviceId"s are backed by files shipped with the application, which can
21
17
      contain application/account-provider specific information, such as the
22
18
      ClientId and ClientSecret to be used when authentication with OAuth 2.0. 
23
19
      An application can ship more than one "serviceId", if they refer to
24
20
      different account providers; that is, one application can have a
25
21
      serviceId for Google and one for Facebook, but the same application
26
22
      cannot have one for GMail and another for Picasa.
27
23
    -->
28
24
29
25
    <!--
30
26
      GetAccounts: returns a list of account IDs that satisfy the given
31
27
      filters.
32
28
33
29
      Allowed keys for the "filters" parameter (any combination is allowed,
34
30
      though not all combinations might make sense):
35
31
36
32
      - "applicationId" ("s"): the "<package>_<app>" of the client. An
37
33
        unconfined application can specify this in order to restrict the set
38
34
        of results to only those accounts that the application has been
39
35
        authorized to use. For confined apps, OA will deduce the
40
36
        applicationId from the apparmor label of the caller.
41
37
42
38
      - "serviceId" ("s"): if the application wants to list only those
43
39
        accounts coming from a specific provider (e.g., "Facebook").
44
40
45
41
      - "accountId" ("u"): the ID of an account.
46
42
47
43
      In any case, an application will receive only those accounts which the
48
44
      user has authorized the application to use. See
49
45
        http://wiki.ubuntu.com/OnlineAccounts
50
46
      for an overview of the UI experience.
51
47
52
48
      Disabled accounts will not be returned.
53
49
    -->
54
50
    <method name="GetAccounts">
55
51
      <arg name="filters" type="a{sv}" direction="in" />
56
52
      <!--
57
53
        The return value is a list of account IDs paired with a dictionary of account data.
58
54
        This will always include:
59
55
        - "serviceId" (s)
60
56
        - "displayName" (s)
61
57
        Other settings stored on the account will also be included, such as the
62
58
        server address and port of an owncloud or IMAP account, but we haven't
63
59
        defined exactly how. Possibly, all account-specific keys will be
64
60
        prefixed by "settings/", in order not to clash with the keys defined at
65
61
        the framework level.
66
62
      -->
67
63
      <arg name="accounts" type="a(ua{sv})" direction="out" />
68
64
      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
69
65
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0"
70
66
                  value="QList&lt;AccountInfo&gt;"/>
71
67
    </method>
72
68
73
69
    <!--
74
70
      Authenticate: request authentication credentials for the given
75
71
      account ID in the context of a particular service.
76
72
77
73
      If "interactive" is false, an error will be returned if
78
74
      user interaction would be required to retrieve the
79
75
      credentials.
80
76
81
77
      If "invalidate" is true, any stored credentials will be
82
78
      ignored and new credentials will be requested from the account
83
79
      provider.
84
80
    -->
85
81
    <method name="Authenticate">
86
82
      <arg name="accountId" type="u" direction="in" />
87
83
      <arg name="serviceId" type="s" direction="in" />
88
84
      <arg name="interactive" type="b" direction="in" />
89
85
      <arg name="invalidate" type="b" direction="in" />
90
86
      <!--
91
87
        This dictionary can be used to specify OAuth client keys or permission
92
88
        scopes. While it's possible to statically define them a the "serviceId"
93
89
        level, some apps might want to change this information at runtime.
94
90
        Possible use cases:
95
91
        1) OAuth keys are retrieved from a server (so that they can be updated
96
92
           when the old ones are revoked).
97
93
        2) An app might want to use different keys when talking to GMail and
98
94
           Picasa.
99
95
        3) The scope list can also be dynamic, and depending on how the user is
100
96
           using the app.
101
97
        4) SASL: the parameters would contain the latest challenge got from the
102
98
           server.
103
99
      --> 
104
100
      <arg name="parameters" type="a{sv}" direction="in" />
105
101
      <arg name="credentials" type="a{sv}" direction="out" />
106
102
      <annotation name="org.qtproject.QtDBus.QtTypeName.In4" value="QVariantMap"/>
107
103
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
108
104
    </method>
109
105
110
106
    <!--
111
107
      RequestAccess: register a new account for use with the given
112
108
      service.
113
109
      This method also performs the authentication, since that's what apps
114
110
      would do as soon as they get the account.
115
111
    -->
116
112
    <method name="RequestAccess">
117
113
      <arg name="serviceId" type="s" direction="in" />
118
114
      <arg name="parameters" type="a{sv}" direction="in" />
119
115
      <arg name="account" type="(ua{sv})" direction="out" />
120
116
      <arg name="credentials" type="a{sv}" direction="out" />
121
117
      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
122
118
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="AccountInfo"/>
123
119
      <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap"/>
124
120
    </method>
125
121
126
122
    <!--
127
123
      AccountChanged: emitted when account details are changed.
128
124
129
125
      The apparmor policy will NOT ALLOW confined applications to receive
130
126
      this signal on the account manager object path (which might be
131
127
      /com/ubuntu/OnlineAccounts/Manager). Only unconfined applications will
132
128
      be able to listen to this signal from that object path.
133
129
134
130
      Confined apps will have to catch this signal from a different object path:
135
131
      /com/ubuntu/OnlineAccounts/Manager/@{APP_PKGNAME_DBUS}, which will
136
132
      deliver the signal only for those accounts which the app has been
137
133
      authorized to use.
138
134
    -->
139
135
    <signal name="AccountChanged">
140
136
      <!--
141
137
        The serviceId will also be included in the "account" dictionary. The
142
138
        reason for having it also here is to allow clients to filter D-Bus
143
139
        messages by arg0. This can be important for unconfined clients, which
144
140
        would otherwise be woken up by any account change, even those not
145
141
          relevant to them.
146
142
      -->
147
143
      <arg name="serviceId" type="s" />
148
144
      <!--
149
145
        The dictionary contains a changeType key, type "u", whose value is
150
146
        enum { enabled, disabled, changed }
151
147
      -->
152
148
      <arg name="account" type="(ua{sv})" />
153
149
      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="AccountInfo"/>
154
150
    </signal>
155
151
156
152
  </interface>
157
153
</node>
158
154
0
159
=== modified file 'tests/utils/fake-online-accounts-daemon.py'
160
--- tests/utils/fake-online-accounts-daemon.py	2016-11-01 03:36:29 +0000
161
+++ tests/utils/fake-online-accounts-daemon.py	2016-11-16 06:09:36 +0000
162
@@ -17,7 +17,6 @@
163
17
17
164
18
"""A fake version of the OnlineAccounts D-Bus service."""
18
"""A fake version of the OnlineAccounts D-Bus service."""
165
19
19
166
20
import os
167
21
import sys
20
import sys
168
22
21
169
23
import dbus.service
22
import dbus.service
170
@@ -28,9 +27,6 @@
171
28
OBJECT_PATH = "/com/ubuntu/OnlineAccounts/Manager"
27
OBJECT_PATH = "/com/ubuntu/OnlineAccounts/Manager"
172
29
OA_IFACE = "com.ubuntu.OnlineAccounts.Manager"
28
OA_IFACE = "com.ubuntu.OnlineAccounts.Manager"
173
30
29
174
31
INTERFACE_XML = os.path.join(os.path.dirname(__file__),
175
32
                             "com.ubuntu.OnlineAccounts.Manager.xml")
176
33
177
34
AUTH_OAUTH1 = 1
30
AUTH_OAUTH1 = 1
178
35
AUTH_OAUTH2 = 2
31
AUTH_OAUTH2 = 2
179
36
AUTH_PASSWORD = 3
32
AUTH_PASSWORD = 3
180
@@ -114,12 +110,12 @@
181
114
        self.accounts = accounts
110
        self.accounts = accounts
182
115
111
183
116
    @dbus.service.method(dbus_interface=OA_IFACE,
112
    @dbus.service.method(dbus_interface=OA_IFACE,
185
117
                         in_signature="a{sv}", out_signature="a(ua{sv})")
113
                         in_signature="a{sv}", out_signature="a(ua{sv})aa{sv}")
186
118
    def GetAccounts(self, filters):
114
    def GetAccounts(self, filters):
187
119
        #print("GetAccounts %r" % filters)
115
        #print("GetAccounts %r" % filters)
188
120
        sys.stdout.flush()
116
        sys.stdout.flush()
189
121
        return dbus.Array([a.serialise() for a in self.accounts],
117
        return dbus.Array([a.serialise() for a in self.accounts],
191
122
                          signature="a(ua{sv})")
118
                          signature="a(ua{sv})"), dbus.Array(signature="a{sv}")
192
123
119
193
124
    @dbus.service.method(dbus_interface=OA_IFACE,
120
    @dbus.service.method(dbus_interface=OA_IFACE,
194
125
                         in_signature="usbba{sv}", out_signature="a{sv}")
121
                         in_signature="usbba{sv}", out_signature="a{sv}")
Status:	Merged
Approved by:	Michi Henning on 2016-11-16
Approved revision:	94
Merged at revision:	93
Proposed branch:	lp:~jamesh/storage-framework/fix-fake-oa
Merge into:	lp:storage-framework/devel
Diff against target:	194 lines (+2/-159) 2 files modified tests/utils/com.ubuntu.OnlineAccounts.Manager.xml (+0/-153) tests/utils/fake-online-accounts-daemon.py (+2/-6)
To merge this branch:	bzr merge lp:~jamesh/storage-framework/fix-fake-oa
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
unity-api-1-bot	continuous-integration		Approve on 2016-11-16
Michi Henning (community)		2016-11-16	Approve on 2016-11-16
Review via email: mp+310962@code.launchpad.net