dylan.derr/Send
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

a new approach for the ui

Browse source
This commit is contained in:
Danny Coates 2018-10-24 19:07:10 -07:00
parent cc85486414
commit f0cfc19f8c
No known key found for this signature in database
GPG key ID: 4C442633C62E00CB
34 changed files with 2246 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

5
server/fxa.js
View file

@ -9,7 +9,10 @@ async function getFxaConfig() {
if (fxaConfig && Date.now() - lastConfigRefresh < 1000 * 60 * 5) {
return fxaConfig;
}
const res = await fetch(`${config.fxa_url}/.well-known/openid-configuration`);
const res = await fetch(
`${config.fxa_url}/.well-known/openid-configuration`,
{ timeout: 3000 }
);
fxaConfig = await res.json();
lastConfigRefresh = Date.now();
return fxaConfig;

10
server/routes/jsconfig.js
View file

@ -31,9 +31,13 @@ if (config.analytics_id) {
module.exports = async function(req, res) {
let authConfig = '';
if (config.fxa_client_id) {
const fxaConfig = await getFxaConfig();
fxaConfig.client_id = config.fxa_client_id;
authConfig = `var AUTH_CONFIG = ${JSON.stringify(fxaConfig)};`;
try {
const fxaConfig = await getFxaConfig();
fxaConfig.client_id = config.fxa_client_id;
authConfig = `var AUTH_CONFIG = ${JSON.stringify(fxaConfig)};`;
} catch (e) {
// continue without accounts
}
}
/* eslint-disable no-useless-escape */
const jsconfig = `