|
7 | 7 | // Specific username used when providing multiple sharings |
8 | 8 | var kPYSharingsUsername = "Pryv Sharings"; |
9 | 9 | // Campaign manager endpoint used to retrieve sharings from a campaign |
10 | | - var campaignManagerUrl = 'https://sw.pryv.me/campaign-manager/'; |
| 10 | + var campaignManagerUrl = 'pryvcampaign://'; |
11 | 11 | var pyConnections = []; |
12 | 12 | var settings = getSettingsFromURL(); |
13 | 13 | var domain = settings.domain || 'pryv.me'; |
|
87 | 87 |
|
88 | 88 | // Clean-up and create a coma separated list |
89 | 89 | var sharings = sharingLink.split(/[\s,\n]+/).filter(function(el) {return el.length != 0}); |
90 | | - |
| 90 | + |
| 91 | + |
91 | 92 | // If using a campaign manager link, we need to retrieve sharings from it first. |
92 | 93 | // Then a second call to this function is required to actually load the sharings. |
93 | 94 | if (sharings.length > 0 && sharings[0].substring(0, campaignManagerUrl.length) === campaignManagerUrl) { |
|
99 | 100 | getPYConnections(); |
100 | 101 | updateUI(); |
101 | 102 | } |
| 103 | + |
| 104 | + |
| 105 | + |
102 | 106 |
|
103 | 107 | // Specific call to retrieve sharings from a campaign manager link |
104 | 108 | function getSharingsFromCampaignManager (sharingLinks) { |
105 | | - var CMlink = sharingLinks[0]; |
| 109 | + var CMlink = sharingLinks[0].substring(campaignManagerUrl.length); |
| 110 | + |
| 111 | + var baseurl = CMlink.split('?')[0]; |
| 112 | + |
106 | 113 | /** |
107 | 114 | * WARNING Campaign manager is hard-coded !! CM should send the domain alognside the user |
108 | 115 | */ |
109 | 116 | $.ajax({ |
110 | 117 | type: 'GET', |
111 | | - url: "https://cm.pryv.me/invitations?username=" + getParameterByName('username', CMlink), |
| 118 | + url: baseurl + '?username=' + getParameterByName('username', CMlink), |
112 | 119 | headers: { |
113 | | - "authorization": getParameterByName('token', CMlink), |
| 120 | + "authorization": getParameterByName('auth', CMlink), |
114 | 121 | } |
115 | 122 | }).done(function(data) { |
116 | 123 | var sharings = ""; |
|
122 | 129 | } |
123 | 130 | }); |
124 | 131 | $("#sharingLink").val(sharings); |
| 132 | + }).fail(function(xhr, status, error) { |
| 133 | + tableau.abortWithError(error); |
125 | 134 | }); |
126 | 135 | } |
127 | 136 |
|
|
0 commit comments