Skip to content

Commit 7ce6ef7

Browse files
author
Thiébaud Modoux
authored
Merge pull request #3 from pryv/master
Updated for new campaign manager schema
2 parents 84339bc + f492901 commit 7ce6ef7

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

connector.js

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Specific username used when providing multiple sharings
88
var kPYSharingsUsername = "Pryv Sharings";
99
// Campaign manager endpoint used to retrieve sharings from a campaign
10-
var campaignManagerUrl = 'https://sw.pryv.me/campaign-manager/';
10+
var campaignManagerUrl = 'pryvcampaign://';
1111
var pyConnections = [];
1212
var settings = getSettingsFromURL();
1313
var domain = settings.domain || 'pryv.me';
@@ -87,7 +87,8 @@
8787

8888
// Clean-up and create a coma separated list
8989
var sharings = sharingLink.split(/[\s,\n]+/).filter(function(el) {return el.length != 0});
90-
90+
91+
9192
// If using a campaign manager link, we need to retrieve sharings from it first.
9293
// Then a second call to this function is required to actually load the sharings.
9394
if (sharings.length > 0 && sharings[0].substring(0, campaignManagerUrl.length) === campaignManagerUrl) {
@@ -99,18 +100,24 @@
99100
getPYConnections();
100101
updateUI();
101102
}
103+
104+
105+
102106

103107
// Specific call to retrieve sharings from a campaign manager link
104108
function getSharingsFromCampaignManager (sharingLinks) {
105-
var CMlink = sharingLinks[0];
109+
var CMlink = sharingLinks[0].substring(campaignManagerUrl.length);
110+
111+
var baseurl = CMlink.split('?')[0];
112+
106113
/**
107114
* WARNING Campaign manager is hard-coded !! CM should send the domain alognside the user
108115
*/
109116
$.ajax({
110117
type: 'GET',
111-
url: "https://cm.pryv.me/invitations?username=" + getParameterByName('username', CMlink),
118+
url: baseurl + '?username=' + getParameterByName('username', CMlink),
112119
headers: {
113-
"authorization": getParameterByName('token', CMlink),
120+
"authorization": getParameterByName('auth', CMlink),
114121
}
115122
}).done(function(data) {
116123
var sharings = "";
@@ -122,6 +129,8 @@
122129
}
123130
});
124131
$("#sharingLink").val(sharings);
132+
}).fail(function(xhr, status, error) {
133+
tableau.abortWithError(error);
125134
});
126135
}
127136

0 commit comments

Comments
 (0)