natty
/
fox-send
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1201 from mozilla/html-pn 

Html pn
This commit is contained in:
Danny Coates 2019-03-07 10:29:28 -08:00 committed by GitHub
parent 0371f1906a a28aad274d
commit 28e31f4870
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 150 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
app/ui/legal.js
View File

@ -1,5 +1,4 @@
const html = require('choo/html'); const html = require('choo/html');
const raw = require('choo/html/raw');
const modal = require('./modal'); const modal = require('./modal');
module.exports = function(state, emit) { module.exports = function(state, emit) {
@ -11,53 +10,88 @@ module.exports = function(state, emit) {
> >
<h1 class="text-center">${state.translate('legalTitle')}</h1> <h1 class="text-center">${state.translate('legalTitle')}</h1>
<p class="mt-2">${state.translate('legalDateStamp')}</p> <p class="mt-2">${state.translate('legalDateStamp')}</p>
<div class="overflow-scroll px-4"> <div class="overflow-scroll py-8 px-12">
${raw( <p class="leading-normal">
replaceLinks(state.translate('legalNoticeSend'), [ When Mozilla receives information from you, our
'https://www.mozilla.org/privacy/', <a
'https://github.com/mozilla/send/blob/master/docs/metrics.md' href="https://www.mozilla.org/privacy/"
]) target="__blank"
)} rel="noopener noreferrer"
<ul class="mt-10 max-w-md leading-normal"> >Mozilla Privacy Policy</a
>
describes how we handle that information. Below are the top things
you should know about Firefox Send. You can also view the code
<a
href="https://github.com/mozilla/send/blob/master/docs/metrics.md"
target="__blank"
rel="noopener noreferrer"
>here</a
>.
</p>
<ul class="mt-6 leading-normal">
<li class="mb-4"> <li class="mb-4">
<b>${state.translate('legalNoticeSendContentHeader')}:</b> <b>Content</b>: Mozilla receives an encrypted copy of the file you
${state.translate('legalNoticeSendContent')} upload but we cannot access the content or name of your encrypted
file. By default, files are stored for a maximum of either 24
hours or 7 days. If you choose a download cap, the file can be
deleted from our server sooner.
</li> </li>
<li class="mb-4"> <li class="mb-4">
<b>${state.translate('legalNoticeSendDataHeader')}:</b> <b>Data on your device</b>: So that you can check status or delete
${state.translate('legalNoticeSendData')} files, basic information about your uploaded files is stored on
your local device. This includes our identifier for the file, the
filename, and the file’s unique download URL. This is cleared if
you delete your uploaded file or upon visiting Send after the file
expires. Note, however, that the URL will persist in your browsing
history (and with whomever you shared it) until manually deleted.
</li> </li>
<li class="mb-4"> <li class="mb-4">
<b>${state.translate('legalNoticeSendPersonalHeader')}:</b> <b>Personal data</b>: The following is necessary to provide the
${state.translate('legalNoticeSendPersonal')}: service:
<ul class="leading-normal"> <ul class="mt-6 leading-normal">
<li class="my-4"> <li class="mb-4">
<u>${state.translate('legalNoticeSendIPHeader')}:</u> <u>IP addresses</u>: We receive IP addresses of downloaders
${state.translate('legalNoticeSendIP')} and uploaders as part of our standard server logs. These are
retained for 90 days, and for that period, may be connected to
activity of a file’s download URL. Although we develop our
services in ways that minimize identification, you should know
that it may be possible to correlate the IP address of a Send
user to the IP address of other Mozilla services with
accounts; and if there is a match, this could identify the
account email address.
</li> </li>
<li class="mb-4"> <li class="mb-4">
<u>${state.translate('legalNoticeSendFXAHeader')}:</u> <u>Firefox Account</u>: This is required for authentication
${state.translate('legalNoticeSendFXA')} only if you wish to upload larger file sizes. Your Firefox
Account record will retain aggregate data on your usage of
Send: for example, if you created a Firefox Account in
connection with Send, number of files sent and approximate
file sizes, and how many times you’ve used the service.
</li> </li>
</ul> </ul>
</li> </li>
<li class="mb-4"> <li class="mb-4">
<b>${state.translate('legalNoticeSendNonPersonalHeader')}:</b> <b>Non-personal data</b>: We receive the following to improve our
${state.translate('legalNoticeSendNonPersonal')}: service and performance:
<ul class="leading-normal"> <ul class="mt-6 leading-normal">
<li class="my-4"> <li class="mb-4">
<u>${state.translate('legalNoticeSendInteractionHeader')}:</u> <u>Interaction data</u>: This includes information such as
${state.translate('legalNoticeSendInteraction')} number of people sending and receiving files, number of files
uploaded and approximate file sizes, percentage of file
downloaders who become uploaders, how people engage with the
website (time spent, clicks, referrer information, site exit
path, use of passwords).
</li> </li>
<li class="mb-4"> <li class="mb-4">
<u>${state.translate('legalNoticeSendTechnicalHeader')}:</u> <u>Technical data</u>: This includes information such as
${state.translate('legalNoticeSendTechnical')} operating system, browser, language preference, country,
timestamps, duration for file transfer, reasons for errors,
reasons for file expiration.
</li> </li>
</ul> </ul>
</li> </li>
<li class="mb-4"> <li class="mb-4">
<b>${state.translate('legalNoticeSendThirdPartyHeader')}:</b> <b>Third Party Services</b>: We use Google Cloud Platform.
${state.translate('legalNoticeSendThirdParty')}
</li> </li>
</ul> </ul>
</div> </div>
@ -65,12 +99,3 @@ module.exports = function(state, emit) {
</main> </main>
`; `;
}; };
function replaceLinks(str, urls) {
let i = 0;
const s = str.replace(
/<a>([^<]+)<\/a>/g,
(m, v) => `<a class="text-blue" href="${urls[i++]}">${v}</a>`
);
return `<p class="mt-10 max-w-md leading-normal">${s}</p>`;
}

161
package-lock.json generated
View File

@ -5286,6 +5286,14 @@
"requires": { "requires": {
"esm": "3.2.7", "esm": "3.2.7",
"ws": "github:dannycoates/ws#c83cbb3bce478122cedcb8c475d9e86e1112824a" "ws": "github:dannycoates/ws#c83cbb3bce478122cedcb8c475d9e86e1112824a"
},
"dependencies": {
"ws": {
"version": "github:dannycoates/ws#c83cbb3bce478122cedcb8c475d9e86e1112824a",
"requires": {
"async-limiter": "1.0.0"
}
}
} }
}, },
"extend": { "extend": {
@ -5993,8 +6001,8 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"delegates": "^1.0.0", "delegates": "1.0.0",
"readable-stream": "^2.0.6" "readable-stream": "2.3.6"
} }
}, },
"balanced-match": { "balanced-match": {
@ -6009,7 +6017,7 @@
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true, "dev": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
} }
}, },
@ -6083,7 +6091,7 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"minipass": "^2.2.1" "minipass": "2.3.5"
} }
}, },
"fs.realpath": { "fs.realpath": {
@ -6100,14 +6108,14 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"aproba": "^1.0.3", "aproba": "1.2.0",
"console-control-strings": "^1.0.0", "console-control-strings": "1.1.0",
"has-unicode": "^2.0.0", "has-unicode": "2.0.1",
"object-assign": "^4.1.0", "object-assign": "4.1.1",
"signal-exit": "^3.0.0", "signal-exit": "3.0.2",
"string-width": "^1.0.1", "string-width": "1.0.2",
"strip-ansi": "^3.0.1", "strip-ansi": "3.0.1",
"wide-align": "^1.1.0" "wide-align": "1.1.3"
} }
}, },
"glob": { "glob": {
@ -6117,12 +6125,12 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"fs.realpath": "^1.0.0", "fs.realpath": "1.0.0",
"inflight": "^1.0.4", "inflight": "1.0.6",
"inherits": "2", "inherits": "2.0.3",
"minimatch": "^3.0.4", "minimatch": "3.0.4",
"once": "^1.3.0", "once": "1.4.0",
"path-is-absolute": "^1.0.0" "path-is-absolute": "1.0.1"
} }
}, },
"has-unicode": { "has-unicode": {
@ -6139,7 +6147,7 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"safer-buffer": ">= 2.1.2 < 3" "safer-buffer": "2.1.2"
} }
}, },
"ignore-walk": { "ignore-walk": {
@ -6149,7 +6157,7 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"minimatch": "^3.0.4" "minimatch": "3.0.4"
} }
}, },
"inflight": { "inflight": {
@ -6159,8 +6167,8 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"once": "^1.3.0", "once": "1.4.0",
"wrappy": "1" "wrappy": "1.0.2"
} }
}, },
"inherits": { "inherits": {
@ -6182,7 +6190,7 @@
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true, "dev": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "1.0.1"
} }
}, },
"isarray": { "isarray": {
@ -6198,7 +6206,7 @@
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"dev": true, "dev": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "1.1.11"
} }
}, },
"minimist": { "minimist": {
@ -6213,8 +6221,8 @@
"integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
"dev": true, "dev": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "5.1.2",
"yallist": "^3.0.0" "yallist": "3.0.3"
} }
}, },
"minizlib": { "minizlib": {
@ -6224,7 +6232,7 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"minipass": "^2.2.1" "minipass": "2.3.5"
} }
}, },
"mkdirp": { "mkdirp": {
@ -6250,9 +6258,9 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"debug": "^2.1.2", "debug": "2.6.9",
"iconv-lite": "^0.4.4", "iconv-lite": "0.4.24",
"sax": "^1.2.4" "sax": "1.2.4"
} }
}, },
"node-pre-gyp": { "node-pre-gyp": {
@ -6262,16 +6270,16 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"detect-libc": "^1.0.2", "detect-libc": "1.0.3",
"mkdirp": "^0.5.1", "mkdirp": "0.5.1",
"needle": "^2.2.1", "needle": "2.2.4",
"nopt": "^4.0.1", "nopt": "4.0.1",
"npm-packlist": "^1.1.6", "npm-packlist": "1.2.0",
"npmlog": "^4.0.2", "npmlog": "4.1.2",
"rc": "^1.2.7", "rc": "1.2.8",
"rimraf": "^2.6.1", "rimraf": "2.6.3",
"semver": "^5.3.0", "semver": "5.6.0",
"tar": "^4" "tar": "4.4.8"
} }
}, },
"nopt": { "nopt": {
@ -6281,8 +6289,8 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"abbrev": "1", "abbrev": "1.1.1",
"osenv": "^0.1.4" "osenv": "0.1.5"
} }
}, },
"npm-bundled": { "npm-bundled": {
@ -6299,8 +6307,8 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"ignore-walk": "^3.0.1", "ignore-walk": "3.0.1",
"npm-bundled": "^1.0.1" "npm-bundled": "1.0.5"
} }
}, },
"npmlog": { "npmlog": {
@ -6310,10 +6318,10 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"are-we-there-yet": "~1.1.2", "are-we-there-yet": "1.1.5",
"console-control-strings": "~1.1.0", "console-control-strings": "1.1.0",
"gauge": "~2.7.3", "gauge": "2.7.4",
"set-blocking": "~2.0.0" "set-blocking": "2.0.0"
} }
}, },
"number-is-nan": { "number-is-nan": {
@ -6335,7 +6343,7 @@
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"dev": true, "dev": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1.0.2"
} }
}, },
"os-homedir": { "os-homedir": {
@ -6359,8 +6367,8 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"os-homedir": "^1.0.0", "os-homedir": "1.0.2",
"os-tmpdir": "^1.0.0" "os-tmpdir": "1.0.2"
} }
}, },
"path-is-absolute": { "path-is-absolute": {
@ -6384,10 +6392,10 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"deep-extend": "^0.6.0", "deep-extend": "0.6.0",
"ini": "~1.3.0", "ini": "1.3.5",
"minimist": "^1.2.0", "minimist": "1.2.0",
"strip-json-comments": "~2.0.1" "strip-json-comments": "2.0.1"
}, },
"dependencies": { "dependencies": {
"minimist": { "minimist": {
@ -6406,13 +6414,13 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"core-util-is": "~1.0.0", "core-util-is": "1.0.2",
"inherits": "~2.0.3", "inherits": "2.0.3",
"isarray": "~1.0.0", "isarray": "1.0.0",
"process-nextick-args": "~2.0.0", "process-nextick-args": "2.0.0",
"safe-buffer": "~5.1.1", "safe-buffer": "5.1.2",
"string_decoder": "~1.1.1", "string_decoder": "1.1.1",
"util-deprecate": "~1.0.1" "util-deprecate": "1.0.2"
} }
}, },
"rimraf": { "rimraf": {
@ -6422,7 +6430,7 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"glob": "^7.1.3" "glob": "7.1.3"
} }
}, },
"safe-buffer": { "safe-buffer": {
@ -6472,9 +6480,9 @@
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true, "dev": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "1.1.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "1.0.0",
"strip-ansi": "^3.0.0" "strip-ansi": "3.0.1"
} }
}, },
"string_decoder": { "string_decoder": {
@ -6484,7 +6492,7 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"safe-buffer": "~5.1.0" "safe-buffer": "5.1.2"
} }
}, },
"strip-ansi": { "strip-ansi": {
@ -6493,7 +6501,7 @@
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true, "dev": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "2.1.1"
} }
}, },
"strip-json-comments": { "strip-json-comments": {
@ -6510,13 +6518,13 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"chownr": "^1.1.1", "chownr": "1.1.1",
"fs-minipass": "^1.2.5", "fs-minipass": "1.2.5",
"minipass": "^2.3.4", "minipass": "2.3.5",
"minizlib": "^1.1.1", "minizlib": "1.2.1",
"mkdirp": "^0.5.0", "mkdirp": "0.5.1",
"safe-buffer": "^5.1.2", "safe-buffer": "5.1.2",
"yallist": "^3.0.2" "yallist": "3.0.3"
} }
}, },
"util-deprecate": { "util-deprecate": {
@ -6533,7 +6541,7 @@
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"string-width": "^1.0.2 || 2" "string-width": "1.0.2"
} }
}, },
"wrappy": { "wrappy": {
@ -17351,6 +17359,7 @@
}, },
"ws": { "ws": {
"version": "github:dannycoates/ws#c83cbb3bce478122cedcb8c475d9e86e1112824a", "version": "github:dannycoates/ws#c83cbb3bce478122cedcb8c475d9e86e1112824a",
"dev": true,
"requires": { "requires": {
"async-limiter": "1.0.0" "async-limiter": "1.0.0"
} }