Vimeo Scope

Merge lp:~marcustomlinson/unity-scope-vimeo/fix_update_config into lp:unity-scope-vimeo

  1. fix_update_config
  2. Merge into 14.10
Proposed by Marcus Tomlinson
Status: Merged
Merged at revision: 84
Proposed branch: lp:~marcustomlinson/unity-scope-vimeo/fix_update_config
Merge into: lp:unity-scope-vimeo
Diff against target: 28 lines (+3/-3)
1 file modified
src/vimeo/api/client.cpp (+3/-3)
To merge this branch: bzr merge lp:~marcustomlinson/unity-scope-vimeo/fix_update_config
Reviewer Review Type Date Requested Status
Pete Woods Pending
Review via email: mp+243672@code.launchpad.net

Commit message

Initialise Config on entry to update_config() and call anonymous_login() when VIMEO_SCOPE_IGNORE_ACCOUNTS is set

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/vimeo/api/client.cpp'
2--- src/vimeo/api/client.cpp 2014-12-04 12:29:57 +0000
3+++ src/vimeo/api/client.cpp 2014-12-04 14:26:59 +0000
4@@ -208,11 +208,14 @@
5 }
6
7 void update_config() {
8+ config_ = Config();
9+
10 if (getenv("VIMEO_SCOPE_APIROOT")) {
11 config_.apiroot = getenv("VIMEO_SCOPE_APIROOT");
12 }
13
14 if (getenv("VIMEO_SCOPE_IGNORE_ACCOUNTS") != nullptr) {
15+ anonymous_login();
16 return;
17 }
18
19@@ -239,9 +242,6 @@
20 }
21
22 if (!config_.authenticated) {
23- config_.access_token = "";
24- config_.client_id = "";
25- config_.client_secret = "";
26 std::cerr << "Vimeo scope is unauthenticated" << std::endl;
27 anonymous_login();
28 } else {

Subscribers

People subscribed via source and target branches