diff --git a/example/primary/provision.html b/example/primary/provision.html index 94395c345c921b38b0949f727cd28b1f9f03cda7..c8b7cd583c4c38008d9df3181fa2ee3539bbce92 100644 --- a/example/primary/provision.html +++ b/example/primary/provision.html @@ -33,7 +33,7 @@ $.ajax({ url: '/api/cert_key', data: JSON.stringify({ - pubkey: pubkey, + pubkey: JSON.parse(pubkey), duration: cert_duration }), type: 'POST', diff --git a/lib/browserid/views.js b/lib/browserid/views.js index 15fcadb077e7c06f9d9525bb52398d988239b053..5d8b14e046a6c652322cd677f8b20486fd45631b 100644 --- a/lib/browserid/views.js +++ b/lib/browserid/views.js @@ -168,7 +168,7 @@ exports.setup = function(app) { if ([ 'https://login.persona.org', 'https://login.anosrep.org' ].indexOf(config.get('public_url')) === -1) { // serve test.ejs to /test or /test/ or /test/index.html app.get(/^\/test\/(?:index.html)?$/, function (req, res) { - res.render('test.ejs', {title: 'BrowserID QUnit Test', layout: false}); + res.render('test.ejs', {title: 'Mozilla Persona QUnit Test', layout: false}); }); } else { // this is stage or production, explicitly disable all resources under /test diff --git a/resources/static/shared/error-messages.js b/resources/static/shared/error-messages.js index 5b3530452890c3d112c358fdc92164a68bda9e85..f761aabf63ff14e628987e485123a9a311698476 100644 --- a/resources/static/shared/error-messages.js +++ b/resources/static/shared/error-messages.js @@ -56,7 +56,7 @@ BrowserID.Errors = (function(){ }, cookiesDisabled: { - title: gettext("BrowserID requires cookies"), + title: gettext("Persona requires cookies"), message: format(gettext("Please close this window, <a %s>enable cookies</a> and try again"), [" target='_blank' href='" + enableCookiesURL + "'"]) }, diff --git a/resources/static/shared/provisioning.js b/resources/static/shared/provisioning.js index 177ad14a68e0b076456d601968817301cfdccdd8..fa91170c2ea3941fa2c59b5b1b53ff748125f2d7 100644 --- a/resources/static/shared/provisioning.js +++ b/resources/static/shared/provisioning.js @@ -72,7 +72,7 @@ BrowserID.Provisioning = (function() { trans.delayReturn(true); jwcrypto.generateKeypair({algorithm: "DS", keysize: BrowserID.KEY_LENGTH}, function(err, kp) { keypair = kp; - trans.complete(keypair.publicKey.toSimpleObject()); + trans.complete(keypair.publicKey.serialize()); }); });