Added webclient config.js for storing recaptcha public key.

pull/10/head
Kegan Dougal 2014-09-05 17:36:09 -07:00
parent 130458385e
commit c80f739461
4 changed files with 31 additions and 5 deletions

2
.gitignore vendored
View File

@ -24,4 +24,6 @@ graph/*.svg
graph/*.png
graph/*.dot
webclient/config.js
uploads

View File

@ -1,12 +1,24 @@
Basic Usage
-----------
The Synapse web client needs to be hosted by a basic HTTP server.
You can use the Python simple HTTP server::
The web client should automatically run when running the home server. Alternatively, you can run
it stand-alone:
$ python -m SimpleHTTPServer
Then, open this URL in a WEB browser::
http://127.0.0.1:8000/
ReCaptcha Keys
--------------
The web client will look for the global variable webClientConfig for config options. You should
put your ReCaptcha public key there like so:
webClientConfig = {
recaptcha_public_key: "YOUR_PUBLIC_KEY"
}
This should be put in webclient/config.js which is already .gitignored, rather than in the web
client source files.

View File

@ -17,6 +17,7 @@
<script src="js/angular-sanitize.min.js"></script>
<script type='text/javascript' src='js/ng-infinite-scroll-matrix.js'></script>
<script src="app.js"></script>
<script src="config.js"></script>
<script src="app-controller.js"></script>
<script src="app-directive.js"></script>
<script src="app-filter.js"></script>

View File

@ -19,7 +19,7 @@ angular.module('RegisterController', ['matrixService'])
function($scope, $rootScope, $location, matrixService, eventStreamService) {
'use strict';
var useCaptcha = false;
var useCaptcha = true;
// FIXME: factor out duplication with login-controller.js
@ -147,7 +147,18 @@ angular.module('RegisterController', ['matrixService'])
var setupCaptcha = function() {
console.log("Setting up ReCaptcha")
Recaptcha.create("6Le31_kSAAAAAK-54VKccKamtr-MFA_3WS1d_fGV",
var config = window.webClientConfig;
var public_key = undefined;
if (config === undefined) {
console.error("Couldn't find webClientConfig. Cannot get public key for captcha.");
}
else {
public_key = webClientConfig.recaptcha_public_key;
if (public_key === undefined) {
console.error("No public key defined for captcha!")
}
}
Recaptcha.create(public_key,
"regcaptcha",
{
theme: "red",