Skip to content

Commit ea7e562

Browse files
committed
Expose PLConfig to backend to access server URL.
1 parent 077c529 commit ea7e562

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

backend/server.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ var PrairieStats = requireFrontend("PrairieStats");
3535
var PrairieModel = requireFrontend("PrairieModel");
3636
var PrairieRole = requireFrontend("PrairieRole");
3737
var PrairieGeom = requireFrontend("PrairieGeom");
38+
var PLConfig = require(path.join(config.frontendDir, "config"));
3839
var express = require("express");
3940
var bodyParser = require('body-parser');
4041
var cookieParser = require('cookie-parser');
@@ -960,6 +961,8 @@ app.get("/qInstances/:qiid/:filename", function(req, res) {
960961
var template = _.template(data.toString());
961962
var templatedText;
962963
try {
964+
var defaultApiServer = (
965+
config.serverType + '://localhost:' + config.serverPort);
963966
templatedText = template({
964967
authUID: req.authUID,
965968
authName: req.authName,
@@ -968,7 +971,8 @@ app.get("/qInstances/:qiid/:filename", function(req, res) {
968971
userUID: req.userUID,
969972
qid: qid,
970973
qiid: qiid,
971-
tiid: qInstance.tiid
974+
tiid: qInstance.tiid,
975+
apiServer: PLConfig.apiServer || defaultApiServer
972976
});
973977
} catch (e) {
974978
return sendError(res, 500, "Error rendering template", e);

exampleCourse/questions/fibonacci/checkout.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
dir_name = 'fib'
1414
archive_name = 'fib.tar.gz'
15-
base_url = 'http://localhost:3000'
15+
base_url = """<%= apiServer %>"""
1616

1717
red = lambda s: '\033[31m%s\033[39m' % s
1818
green = lambda s: '\033[32m%s\033[39m' % s

frontend/config.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
1-
document.PLConfig = {
1+
var PLConfig = {
22
};
3+
4+
if (typeof document !== "undefined") {
5+
document.PLConfig = PLConfig;
6+
}
7+
8+
if (typeof module !== "undefined") {
9+
module.exports = PLConfig;
10+
}

0 commit comments

Comments
 (0)