${state.modal(state, emit, close)}
diff --git a/app/ui/noStreams.js b/app/ui/noStreams.js
index d31ad7772..52cb7d052 100644
--- a/app/ui/noStreams.js
+++ b/app/ui/noStreams.js
@@ -19,9 +19,9 @@ module.exports = function(state, emit) {
diff --git a/app/ui/report.js b/app/ui/report.js
new file mode 100644
index 000000000..1c2ae3d77
--- /dev/null
+++ b/app/ui/report.js
@@ -0,0 +1,139 @@
+const html = require('choo/html');
+const raw = require('choo/html/raw');
+const assets = require('../../common/assets');
+
+const REPORTABLES = ['Malware', 'Pii', 'Abuse'];
+
+module.exports = function(state, emit) {
+ let submitting = false;
+ const file = state.fileInfo;
+ if (!file) {
+ return html`
+
+
+
+ ${state.translate('reportUnknownDescription')}
+
+
+ ${raw(
+ replaceLinks(state.translate('reportReasonCopyright'), [
+ 'https://www.mozilla.org/about/legal/report-infringement/'
+ ])
+ )}
+
+
+
+ `;
+ }
+ if (file.reported) {
+ return html`
+
+
+
+ `;
+ }
+ return html`
+
+
+
+
+ ${state.translate('reportFile')}
+
+
+ ${state.translate('reportDescription')}
+
+
+
+ `;
+
+ function optionChanged(event) {
+ event.stopPropagation();
+ const button = event.currentTarget.nextElementSibling;
+ button.disabled = false;
+ }
+
+ function report(event) {
+ event.stopPropagation();
+ event.preventDefault();
+ if (submitting) {
+ return;
+ }
+ submitting = true;
+ state.fileInfo.reported = true;
+ const form = event.target;
+ emit('report', { reason: form.reason.value });
+ }
+
+ function replaceLinks(str, urls) {
+ let i = 0;
+ const s = str.replace(
+ /
([^<]+)<\/a>/g,
+ (m, v) => `${v}`
+ );
+ return `
${s}
`;
+ }
+};
diff --git a/app/ui/shareDialog.js b/app/ui/shareDialog.js
index de6f6f9c2..a85633ecc 100644
--- a/app/ui/shareDialog.js
+++ b/app/ui/shareDialog.js
@@ -9,11 +9,9 @@ module.exports = function(name, url) {
${state.translate('notifyUploadEncryptDone')}
-
+
${state.translate('shareLinkDescription')}
- ${name}
+ ${name}
})
-
-
+
+
${state.translate('accountBenefitTitle')}
- ${state.translate('accountBenefitSync')}
- - ${state.translate('accountBenefitMoz')}
-
+
-
+ ${state.user.loginRequired
+ ? ''
+ : html`
+
+ `}
`;
diff --git a/app/user.js b/app/user.js
index c43039417..49d8decb6 100644
--- a/app/user.js
+++ b/app/user.js
@@ -76,6 +76,10 @@ export default class User {
return this.info.access_token;
}
+ get refreshToken() {
+ return this.info.refresh_token;
+ }
+
get maxSize() {
return this.loggedIn
? this.limits.MAX_FILE_SIZE
@@ -94,6 +98,10 @@ export default class User {
: this.limits.ANON.MAX_DOWNLOADS;
}
+ get loginRequired() {
+ return this.authConfig && this.authConfig.fxa_required;
+ }
+
async metricId() {
return this.loggedIn ? hashId(this.info.uid) : undefined;
}
@@ -135,6 +143,7 @@ export default class User {
const code_challenge = await preparePkce(this.storage);
const options = {
action: 'email',
+ access_type: 'offline',
client_id: this.authConfig.client_id,
code_challenge,
code_challenge_method: 'S256',
@@ -192,12 +201,69 @@ export default class User {
});
const userInfo = await infoResponse.json();
userInfo.access_token = auth.access_token;
+ userInfo.refresh_token = auth.refresh_token;
userInfo.fileListKey = await getFileListKey(this.storage, auth.keys_jwe);
this.info = userInfo;
this.storage.remove('pkceVerifier');
}
- logout() {
+ async refresh() {
+ if (!this.refreshToken) {
+ return false;
+ }
+ try {
+ const tokenResponse = await fetch(this.authConfig.token_endpoint, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify({
+ client_id: this.authConfig.client_id,
+ grant_type: 'refresh_token',
+ refresh_token: this.refreshToken
+ })
+ });
+ if (tokenResponse.ok) {
+ const auth = await tokenResponse.json();
+ const info = { ...this.info, access_token: auth.access_token };
+ this.info = info;
+ return true;
+ }
+ } catch (e) {
+ console.error(e);
+ }
+ await this.logout();
+ return false;
+ }
+
+ async logout() {
+ try {
+ if (this.refreshToken) {
+ await fetch(this.authConfig.revocation_endpoint, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify({
+ refresh_token: this.refreshToken
+ })
+ });
+ }
+ if (this.bearerToken) {
+ await fetch(this.authConfig.revocation_endpoint, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify({
+ token: this.bearerToken
+ })
+ });
+ }
+ } catch (e) {
+ console.error(e);
+ // oh well, we tried
+ }
this.storage.clearLocalFiles();
this.info = {};
}
@@ -211,6 +277,14 @@ export default class User {
const key = b64ToArray(this.info.fileListKey);
const sha = await crypto.subtle.digest('SHA-256', key);
const kid = arrayToB64(new Uint8Array(sha)).substring(0, 16);
+ const retry = async () => {
+ const refreshed = await this.refresh();
+ if (refreshed) {
+ return await this.syncFileList();
+ } else {
+ return { incoming: true };
+ }
+ };
try {
const encrypted = await getFileList(this.bearerToken, kid);
const decrypted = await streamToArrayBuffer(
@@ -219,8 +293,7 @@ export default class User {
list = JSON.parse(textDecoder.decode(decrypted));
} catch (e) {
if (e.message === '401') {
- this.logout();
- return { incoming: true };
+ return retry(e);
}
}
changes = await this.storage.merge(list);
@@ -236,7 +309,9 @@ export default class User {
);
await setFileList(this.bearerToken, kid, encrypted);
} catch (e) {
- //
+ if (e.message === '401') {
+ return retry(e);
+ }
}
return changes;
}
diff --git a/app/utils.js b/app/utils.js
index 65a17262c..dd7fbf687 100644
--- a/app/utils.js
+++ b/app/utils.js
@@ -1,5 +1,10 @@
/* global Android */
-const html = require('choo/html');
+let html;
+try {
+ html = require('choo/html');
+} catch (e) {
+ // running in the service worker
+}
const b64 = require('base64-js');
function arrayToB64(array) {
@@ -137,12 +142,16 @@ function openLinksInNewTab(links, should = true) {
function browserName() {
try {
+ // order of these matters
if (/firefox/i.test(navigator.userAgent)) {
return 'firefox';
}
if (/edge/i.test(navigator.userAgent)) {
return 'edge';
}
+ if (/edg/i.test(navigator.userAgent)) {
+ return 'edgium';
+ }
if (/trident/i.test(navigator.userAgent)) {
return 'ie';
}
@@ -267,7 +276,15 @@ function setTranslate(t) {
translate = t;
}
+function concat(b1, b2) {
+ const result = new Uint8Array(b1.length + b2.length);
+ result.set(b1, 0);
+ result.set(b2, b1.length);
+ return result;
+}
+
module.exports = {
+ concat,
locale,
fadeOut,
delay,
diff --git a/app/zip.js b/app/zip.js
index 1363da828..bf62726f3 100644
--- a/app/zip.js
+++ b/app/zip.js
@@ -1,4 +1,4 @@
-import crc32 from 'crc/crc32';
+import crc32 from './crc32';
const encoder = new TextEncoder();
diff --git a/assets/wordmark.svg b/assets/wordmark.svg
index 58ed9db98..4f4b3689f 100644
--- a/assets/wordmark.svg
+++ b/assets/wordmark.svg
@@ -1,5 +1,5 @@
})
+ })
- })
- }#logo){kind=logo}
+=======
+ })
+
+>>>>>>> 11319080a8fe012cc6bde61b4ad4ccdec3c2e618
`;
return html`
diff --git a/app/ui/home.js b/app/ui/home.js
index cfa385649..aa12bedc1 100644
--- a/app/ui/home.js
+++ b/app/ui/home.js
@@ -5,6 +5,9 @@ const modal = require('./modal');
const intro = require('./intro');
module.exports = function(state, emit) {
+ if (state.user.loginRequired && !state.user.loggedIn) {
+ emit('signup-cta', 'required');
+ }
const archives = state.storage.files
.filter(archive => !archive.expired)
.map(archive => archiveTile(state, emit, archive));
diff --git a/app/ui/legal.js b/app/ui/legal.js
index 41763226b..1f4aad6e5 100644
--- a/app/ui/legal.js
+++ b/app/ui/legal.js
@@ -2,6 +2,7 @@ const html = require('choo/html');
const modal = require('./modal');
module.exports = function(state, emit) {
+ state.modal = null;
return html`
})
+
+