ufkc7e3d
/
budibase
forked from tsai/budibase
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

routes for serving UI, now tested

gh-pages
michael shanks 7 years ago
parent
7bc6dfbdd3
commit
601755f17a
9 changed files with 62 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      packages/server/appPackages/testApp/dist/package.tar.gz
  2. 1
      packages/server/appPackages/testApp/ui/main/public/app.js
  3. 3
      packages/server/appPackages/testApp/ui/main/public/index.html
  4. 1
      packages/server/appPackages/testApp/ui/unauthenticated/public/app.js
  5. 3
      packages/server/appPackages/testApp/ui/unauthenticated/public/index.html
  6. 4
      packages/server/middleware/routers.js
  7. 2
      packages/server/tests/all.spec.js
  8. 48
      packages/server/tests/serveui.js
  9. 8
      packages/server/utilities/createAppPackage.js

BIN
packages/server/appPackages/testApp/dist/package.tar.gz
View File

Binary file not shown.

1
packages/server/appPackages/testApp/ui/main/public/app.js
View File

@ -0,0 +1 @@
console.log("test app 1 - main");

3
packages/server/appPackages/testApp/ui/main/public/index.html
View File

@ -0,0 +1,3 @@
<html>
<body>MAIN - TEST APP 1</body>
</html>

1
packages/server/appPackages/testApp/ui/unauthenticated/public/app.js
View File

@ -0,0 +1 @@
console.log("test app 1 - unauthenticated");

3
packages/server/appPackages/testApp/ui/unauthenticated/public/index.html
View File

@ -0,0 +1,3 @@
<html>
<body>UNAUTHENTICATED - TEST APP 1</body>
</html>

4
packages/server/middleware/routers.js
View File

@ -69,10 +69,6 @@ module.exports = (config, app) => {
await send(ctx, path, { root: builderPath }); await send(ctx, path, { root: builderPath });
} }
}) })
.get("/:appname", async (ctx) => {
ctx.response.status = StatusCodes.OK;
ctx.response.body = "UI Served Here";
})
.post("/:appname/api/authenticate", async (ctx, next) => { .post("/:appname/api/authenticate", async (ctx, next) => {
const user = await ctx.master.authenticate( const user = await ctx.master.authenticate(
ctx.sessionId, ctx.sessionId,

2
packages/server/tests/all.spec.js
View File

@ -2,6 +2,7 @@ const app = require("./testApp")();
const authenticateMaster = require("./authenticate"); const authenticateMaster = require("./authenticate");
const createNewApp = require("./createNewApp"); const createNewApp = require("./createNewApp");
const multipleInstances = require("./multipleInstances"); const multipleInstances = require("./multipleInstances");
const serveui = require("./serveui");
beforeAll(async () => await app.start()) beforeAll(async () => await app.start())
@ -11,5 +12,6 @@ describe("authenticateMaster", () => authenticateMaster(app, "_master", "masterO
describe("createNewApp", () => createNewApp(app)); describe("createNewApp", () => createNewApp(app));
describe("authenticateTestApp", () => authenticateMaster(app, "testApp", "testAppUser1")); describe("authenticateTestApp", () => authenticateMaster(app, "testApp", "testAppUser1"));
describe("multipleInstances", () => multipleInstances(app)); describe("multipleInstances", () => multipleInstances(app));
describe("serveUi", () => serveui(app));

48
packages/server/tests/serveui.js
View File

@ -0,0 +1,48 @@
const statusCodes = require("../utilities/statusCodes");
const { readFile } = require("../utilities/fsawait");
module.exports = (app) => {
it("should serve unauthenticated index.html as default", async () => {
const response = await app.get("/testApp")
.expect(statusCodes.OK);
const expectedIndexHtml = await readFile("appPackages/testApp/ui/unauthenticated/public/index.html", "utf8");
expect(response.text).toBe(expectedIndexHtml);
});
it("should serve specified files when unauthenticated", async () => {
const response = await app.get("/testApp/app.js")
.expect(statusCodes.OK);
const expectedFile = await readFile("appPackages/testApp/ui/unauthenticated/public/app.js", "utf8");
expect(response.text).toBe(expectedFile);
});
it("should serve main index.html as default when authenticated", async () => {
const response = await app.get("/testApp")
.set("cookie", app.credentials.testAppUser1.cookie)
.expect(statusCodes.OK);
const expectedIndexHtml = await readFile("appPackages/testApp/ui/main/public/index.html", "utf8");
expect(response.text).toBe(expectedIndexHtml);
});
it("should serve specified files when authenticated", async () => {
const response = await app.get("/testApp/app.js")
.set("cookie", app.credentials.testAppUser1.cookie)
.expect(statusCodes.OK);
const expectedFile = await readFile("appPackages/testApp/ui/main/public/app.js", "utf8");
expect(response.text).toBe(expectedFile);
});
}

8
packages/server/utilities/createAppPackage.js
View File

@ -64,10 +64,10 @@ const applictionVersionPath = (appname, versionId) =>
join("..", getRuntimePackageDirectory(appname, versionId)) join("..", getRuntimePackageDirectory(appname, versionId))
const publicPaths = (appPath) => ({ const publicPaths = (appPath) => ({
mainUiPath: join( mainUiPath: resolve(join(
appPath, "ui", "main", "public"), __dirname, appPath, "ui", "main", "public")),
unauthenticatedUiPath: join( unauthenticatedUiPath: resolve(join(
appPath, "ui", "unauthenticated", "public") __dirname, appPath, "ui", "unauthenticated", "public"))
}); });

Write Preview
Loading…
Cancel
Save