Skip to content

Commit c7fa18c

Browse files
committed
Change information collection to comply with GDPR
With Couchbase's new GDPR policies, we need to be very careful in handling any person data we collect. We had a GDPR meeting this week concerning phone home data, and we came to the following conclusions: 1) We should not collect Name/Email/Company Name, because we have never actually used that information, and we don't want to have to come up with a privacy statement and figure out how to safely handle all the data. 2) We need some kind of privacy statement in the configuration page relating to "Enable software update notifications in the web console." To solve #1, I removed the "Register for Updates" section in the configuration panel. To solve #2, I copied the toolip that currently exists in the "Settings" panel to the "New Cluster / Configure" panel. I also removed replication IP address from the XDCR information included in PhoneHome, because that is potentially identifiable information. Change-Id: Id6e983a3cc9474852a5672b515aff88da66467c9 Reviewed-on: http://review.couchbase.org/92205 Tested-by: Eben Haber <[email protected]> Well-Formed: Build Bot <[email protected]> Reviewed-by: Rob Ashcom <[email protected]> Reviewed-by: Pavel Blagodov <[email protected]>
1 parent 7f9df65 commit c7fa18c

File tree

7 files changed

+12
-102
lines changed

7 files changed

+12
-102
lines changed

priv/public/ui/app/mn_admin/mn_settings/notifications/mn_settings_notifications_service.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ angular.module('mnSettingsNotificationsService', [
136136
if (remotes && remotes.filtered) {
137137
stats.xdcr.remotes = remotes.filtered.map(function (remote) {
138138
return {
139-
hostname: remote.hostname,
140139
name: remote.name,
141140
uuid: remote.uuid
142141
};

priv/public/ui/app/mn_wizard/mn_cluster_configuration/mn_cluster_configuration.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,15 @@ <h2>Couchbase &gt; New Cluster / Configure </h2>
152152
id="init-notifications-updates-enabled"
153153
ng-model="clusterConfigurationCtl.sendStats"
154154
checked="checked">
155-
<label for="init-notifications-updates-enabled">
156-
Enable software update notifications in the web console
157-
</label>
155+
<label for="init-notifications-updates-enabled" class="margin-right-zero">
156+
Enable software update notifications in the web console.
157+
</label>
158+
<span class="fa-stack icon-info"
159+
uib-tooltip="Enabling software update notifications allows notification in the Couchbase web console when a new version of Couchbase Server is available. Configuration information transferred in the update check is anonymous and does not include any stored key-value data."
160+
tooltip-placement="top">
161+
<span class="icon fa-circle-thin fa-stack-2x"></span>
162+
<span class="icon fa-info fa-stack-1x"></span>
163+
</span>
158164
</div>
159165
</div>
160166
<div class="panel-footer">

priv/public/ui/app/mn_wizard/mn_cluster_configuration/mn_cluster_configuration_controller.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@
119119
return addErrorHandler(mnClusterConfigurationService.postJoinCluster(data), "postJoinCluster");
120120
}
121121
function postStats() {
122-
var user = mnWizardService.getTermsAndConditionsState();
123-
var promise = mnClusterConfigurationService.postStats(user, vm.sendStats);
122+
var promise = mnClusterConfigurationService.postStats(vm.sendStats);
124123

125124
return mnPromiseHelper(vm, promise)
126125
.catchGlobalErrors()

priv/public/ui/app/mn_wizard/mn_cluster_configuration/mn_cluster_configuration_service.js

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
lookup: lookup,
1919
getConfig: getConfig,
2020
postAuth: postAuth,
21-
postEmail: postEmail,
2221
postStats: postStats,
2322
getQuerySettings: getQuerySettings,
2423
postQuerySettings: postQuerySettings,
@@ -110,21 +109,10 @@
110109
});
111110
}
112111

113-
function postStats(user, sendStats) {
114-
user.email && postEmail(user);
112+
function postStats(sendStats) {
115113
return doPostStats({sendStats: sendStats});
116114
}
117115

118-
function postEmail(register) {
119-
var params = _.clone(register);
120-
delete params.agree;
121-
122-
return $http({
123-
method: 'JSONP',
124-
url: 'https://ph.couchbase.net/email',
125-
params: params
126-
});
127-
}
128116
function doPostStats(data) {
129117
return $http({
130118
method: 'POST',

priv/public/ui/app/mn_wizard/mn_terms_and_conditions/mn_terms_and_conditions.html

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -52,73 +52,6 @@ <h4 class="inline">Terms and Conditions&nbsp;</h4>
5252
</span>
5353
</label>
5454
</div>
55-
56-
<div
57-
class="formrow disclosure"
58-
ng-click="termsCtl.toggleRegisterSection = !termsCtl.toggleRegisterSection"
59-
ng-class="{'disclosed': termsCtl.toggleRegisterSection}">
60-
Register for updates
61-
</div>
62-
</div>
63-
64-
<div ng-show="termsCtl.toggleRegisterSection">
65-
<div
66-
class="error error-form"
67-
ng-show="termsCtl.form.$invalid">
68-
<span ng-show="termsCtl.form.email.$error.email">Email appears to be invalid</span>
69-
<span ng-show="termsCtl.errors">{{errors}}</span>
70-
</div>
71-
72-
<div class="row margin-bottom-half">
73-
<div class="column width-6">
74-
<label for="init-join-community-firstname">First Name</label>
75-
<input
76-
type="text"
77-
autocorrect="off"
78-
spellcheck="false"
79-
autocapitalize="off"
80-
id="init-join-community-firstname"
81-
ng-model="termsCtl.register.firstname">
82-
</div>
83-
84-
<div class="column width-6">
85-
<label for="init-join-community-lastname">Last Name</label>
86-
<input
87-
type="text"
88-
autocorrect="off"
89-
spellcheck="false"
90-
autocapitalize="off"
91-
id="init-join-community-lastname"
92-
ng-model="termsCtl.register.lastname">
93-
</div>
94-
</div>
95-
96-
<div class="formrow row">
97-
<div class="column width-6">
98-
<label for="init-join-community-company">Company</label>
99-
<input
100-
type="text"
101-
autocorrect="off"
102-
spellcheck="false"
103-
autocapitalize="off"
104-
id="init-join-community-company"
105-
ng-model="termsCtl.register.company">
106-
</div>
107-
<div class="column width-6">
108-
<label for="init-join-community-email">Email</label>
109-
<input
110-
id="init-join-community-email"
111-
type="email"
112-
name="email"
113-
autocorrect="off"
114-
spellcheck="false"
115-
autocapitalize="off"
116-
ng-model="termsCtl.register.email">
117-
</div>
118-
</div>
119-
120-
121-
12255
</div>
12356
</div>
12457
<div class="panel-footer">

priv/public/ui/app/mn_wizard/mn_terms_and_conditions/mn_terms_and_conditions_controller.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
vm.onSubmit = onSubmit;
1313
vm.finishWithDefault = finishWithDefault;
1414

15-
16-
mnWizardService.getTermsAndConditionsState().version = (pools.implementationVersion || 'unknown');
17-
vm.register = mnWizardService.getTermsAndConditionsState();
1815
activate();
1916
function activate() {
2017
var promise;
@@ -38,7 +35,7 @@
3835
}
3936

4037
mnClusterConfigurationService
41-
.postStats(vm.register, true).then(function () {
38+
.postStats(true).then(function () {
4239
var services = "kv,index,fts,n1ql";
4340
if (vm.isEnterprise) {
4441
services += ",eventing";

priv/public/ui/app/mn_wizard/mn_wizard_service.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
var mnWizardService = {
1010
getNewClusterState: getNewClusterState,
1111
getState: getState,
12-
getTermsAndConditionsState: getTermsAndConditionsState,
1312
getCELicense: getCELicense,
1413
getEELicense: getEELicense
1514
};
@@ -22,13 +21,6 @@
2221
password: '',
2322
verifyPassword: ''
2423
}
25-
},
26-
termsAndConditionsState: {
27-
email: '',
28-
firstname: '',
29-
lastname: '',
30-
company: '',
31-
version: ''
3224
}
3325
};
3426

@@ -61,9 +53,5 @@
6153
return state.newClusterState;
6254
}
6355

64-
function getTermsAndConditionsState() {
65-
return state.termsAndConditionsState;
66-
}
67-
6856
}
6957
})();

0 commit comments

Comments
 (0)