unity-scopes-shell

Merge lp:~marcustomlinson/unity-scopes-shell/fix_acl into lp:unity-scopes-shell

  1. fix_acl
  2. Merge into trunk
Proposed by Marcus Tomlinson
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 188
Merged at revision: 188
Proposed branch: lp:~marcustomlinson/unity-scopes-shell/fix_acl
Merge into: lp:unity-scopes-shell
Diff against target: 92 lines (+15/-9)
3 files modified
src/Unity/previewstack.cpp (+4/-2)
src/Unity/scope.cpp (+10/-6)
src/Unity/scope.h (+1/-1)
To merge this branch: bzr merge lp:~marcustomlinson/unity-scopes-shell/fix_acl
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+247550@code.launchpad.net

Commit message

Read scope ID from the OA details embedded in a log-in item

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:188
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/273/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/273/rebuild

review: Approve (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Unity/previewstack.cpp'
2--- src/Unity/previewstack.cpp 2014-11-19 13:08:17 +0000
3+++ src/Unity/previewstack.cpp 2015-01-26 06:03:37 +0000
4@@ -154,13 +154,15 @@
5 if (m_associatedScope && widgetData->data.contains("online_account_details"))
6 {
7 QVariantMap details = widgetData->data.value("online_account_details").toMap();
8- if (details.contains("service_name") &&
9+ if (details.contains("scope_id") &&
10+ details.contains("service_name") &&
11 details.contains("service_type") &&
12 details.contains("provider_name") &&
13 details.contains("login_passed_action") &&
14 details.contains("login_failed_action"))
15 {
16- bool success = m_associatedScope->loginToAccount(details.value("service_name").toString(),
17+ bool success = m_associatedScope->loginToAccount(details.value("scope_id").toString(),
18+ details.value("service_name").toString(),
19 details.value("service_type").toString(),
20 details.value("provider_name").toString());
21 int action_code_index = success ? details.value("login_passed_action").toInt() : details.value("login_failed_action").toInt();
22
23=== modified file 'src/Unity/scope.cpp'
24--- src/Unity/scope.cpp 2014-12-12 12:35:07 +0000
25+++ src/Unity/scope.cpp 2015-01-26 06:03:37 +0000
26@@ -1109,13 +1109,15 @@
27 if (result->contains("online_account_details"))
28 {
29 QVariantMap details = scopeVariantToQVariant(result->value("online_account_details")).toMap();
30- if (details.contains("service_name") &&
31+ if (details.contains("scope_id") &&
32+ details.contains("service_name") &&
33 details.contains("service_type") &&
34 details.contains("provider_name") &&
35 details.contains("login_passed_action") &&
36 details.contains("login_failed_action"))
37 {
38- bool success = loginToAccount(details.value("service_name").toString(),
39+ bool success = loginToAccount(details.value("scope_id").toString(),
40+ details.value("service_name").toString(),
41 details.value("service_type").toString(),
42 details.value("provider_name").toString());
43
44@@ -1173,13 +1175,15 @@
45 if (result->contains("online_account_details"))
46 {
47 QVariantMap details = scopeVariantToQVariant(result->value("online_account_details")).toMap();
48- if (details.contains("service_name") &&
49+ if (details.contains("scope_id") &&
50+ details.contains("service_name") &&
51 details.contains("service_type") &&
52 details.contains("provider_name") &&
53 details.contains("login_passed_action") &&
54 details.contains("login_failed_action"))
55 {
56- bool success = loginToAccount(details.value("service_name").toString(),
57+ bool success = loginToAccount(details.value("scope_id").toString(),
58+ details.value("service_name").toString(),
59 details.value("service_type").toString(),
60 details.value("provider_name").toString());
61
62@@ -1260,7 +1264,7 @@
63 }
64 }
65
66-bool Scope::loginToAccount(QString const& service_name, QString const& service_type, QString const& provider_name)
67+bool Scope::loginToAccount(QString const& scope_id, QString const& service_name, QString const& service_type, QString const& provider_name)
68 {
69 // Set the UNITY_SCOPES_OA_UI_POLICY environment variable here so that OnlineAccountClient knows we're
70 // calling it from the shell (hence it will use the default UI policy when talking to libsignon).
71@@ -1299,7 +1303,7 @@
72 if (!service_enabled)
73 {
74 OnlineAccountsClient::Setup setup;
75- setup.setApplicationId(id());
76+ setup.setApplicationId(scope_id.isEmpty() ? id() : scope_id);
77 setup.setServiceTypeId(service_type);
78 setup.setProviderId(provider_name);
79 setup.exec();
80
81=== modified file 'src/Unity/scope.h'
82--- src/Unity/scope.h 2014-12-03 11:07:31 +0000
83+++ src/Unity/scope.h 2015-01-26 06:03:37 +0000
84@@ -166,7 +166,7 @@
85
86 unity::shell::scopes::ScopeInterface* findTempScope(QString const& id) const;
87
88- bool loginToAccount(QString const& service_name, QString const& service_type, QString const& provider_name);
89+ bool loginToAccount(QString const& scope_id, QString const& service_name, QString const& service_type, QString const& provider_name);
90
91 public Q_SLOTS:
92 void invalidateResults();

Subscribers

People subscribed via source and target branches

to all changes: