MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Swapping admin -> global in worker to reduce confusion in API url naming.

This commit is contained in:
mike12345567 2021-07-22 12:56:47 +01:00
parent 371e38fcb9
commit 27b2a13817
50 changed files with 180 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosting/envoy.dev.yaml.hbs
View File

@ -26,7 +26,7 @@ static_resources:
cluster: couchdb-service
prefix_rewrite: "/"
- match: { prefix: "/api/admin/" }
- match: { prefix: "/api/global/" }
route:
cluster: worker-dev

2
hosting/envoy.yaml
View File

@ -38,7 +38,7 @@ static_resources:
cluster: app-service
# special case for worker admin API
- match: { prefix: "/api/admin/" }
- match: { prefix: "/api/global/" }
route:
cluster: worker-service

2
packages/auth/src/middleware/passport/tests/google.spec.js
View File

@ -29,7 +29,7 @@ describe("google", () => {
it("should create successfully create a google strategy", async () => {
const google = require("../google")
await google.strategyFactory(googleConfig, `/api/admin/auth/${TENANT_ID}/google/callback`)
await google.strategyFactory(googleConfig, `/api/global/auth/${TENANT_ID}/google/callback`)
const expectedOptions = {
clientID: googleConfig.clientID,

2
packages/builder/src/pages/builder/admin/index.svelte
View File

@ -24,7 +24,7 @@
try {
adminUser.tenantId = tenantId
// Save the admin user
const response = await api.post(`/api/admin/users/init`, adminUser)
const response = await api.post(`/api/global/users/init`, adminUser)
const json = await response.json()
if (response.status !== 200) {
throw new Error(json.message)

2
packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte
View File

@ -11,7 +11,7 @@
{#if show}
<ActionButton
on:click={() => window.open(`/api/admin/auth/${tenantId}/google`, "_blank")}
on:click={() => window.open(`/api/global/auth/${tenantId}/google`, "_blank")}
>
<div class="inner">
<img src={GoogleLogo} alt="google icon" />

2
packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte
View File

@ -31,7 +31,7 @@
{#if show}
<ActionButton
on:click={() =>
window.open(`/api/admin/auth/oidc/configs/${$oidc.uuid}`, "_blank")}
window.open(`/api/global/auth/oidc/configs/${$oidc.uuid}`, "_blank")}
>
<div class="inner">
<img {src} alt="oidc icon" />

16
packages/builder/src/pages/builder/portal/manage/auth/index.svelte
View File

@ -39,7 +39,7 @@
name: "callbackURL",
label: "Callback URL",
readonly: true,
placeholder: `/api/admin/auth/${tenantId}/google/callback`,
placeholder: `/api/global/auth/${tenantId}/google/callback`,
},
],
}
@ -53,7 +53,7 @@
name: "callbackURL",
label: "Callback URL",
readonly: true,
placeholder: `/api/admin/auth/${tenantId}/oidc/callback`,
placeholder: `/api/global/auth/${tenantId}/oidc/callback`,
},
],
}
@ -129,7 +129,7 @@
let data = new FormData()
data.append("file", file)
const res = await api.post(
`/api/admin/configs/upload/logos_oidc/${file.name}`,
`/api/global/configs/upload/logos_oidc/${file.name}`,
data,
{}
)
@ -163,7 +163,7 @@
`Please fill in all required ${ConfigTypes.OIDC} fields`
)
} else {
calls.push(api.post(`/api/admin/configs`, element))
calls.push(api.post(`/api/global/configs`, element))
// turn the save button grey when clicked
oidcSaveButtonDisabled = true
originalOidcDoc = cloneDeep(providers.oidc)
@ -178,7 +178,7 @@
)
} else {
delete element.config.callbackURL
calls.push(api.post(`/api/admin/configs`, element))
calls.push(api.post(`/api/global/configs`, element))
googleSaveButtonDisabled = true
originalGoogleDoc = cloneDeep(providers.google)
}
@ -211,7 +211,7 @@
await organisation.init()
// fetch the configs for oauth
const googleResponse = await api.get(
`/api/admin/configs/${ConfigTypes.Google}`
`/api/global/configs/${ConfigTypes.Google}`
)
const googleDoc = await googleResponse.json()
@ -228,7 +228,7 @@
//Get the list of user uploaded logos and push it to the dropdown options.
//This needs to be done before the config call so they're available when the dropdown renders
const res = await api.get(`/api/admin/configs/logos_oidc`)
const res = await api.get(`/api/global/configs/logos_oidc`)
const configSettings = await res.json()
if (configSettings.config) {
@ -243,7 +243,7 @@
})
})
}
const oidcResponse = await api.get(`/api/admin/configs/${ConfigTypes.OIDC}`)
const oidcResponse = await api.get(`/api/global/configs/${ConfigTypes.OIDC}`)
const oidcDoc = await oidcResponse.json()
if (!oidcDoc._id) {
providers.oidc = {

4
packages/builder/src/pages/builder/portal/manage/email/index.svelte
View File

@ -53,7 +53,7 @@
delete smtp.config.auth
}
// Save your SMTP config
const response = await api.post(`/api/admin/configs`, smtp)
const response = await api.post(`/api/global/configs`, smtp)
if (response.status !== 200) {
const error = await response.text()
@ -75,7 +75,7 @@
async function fetchSmtp() {
loading = true
// fetch the configs for smtp
const smtpResponse = await api.get(`/api/admin/configs/${ConfigTypes.SMTP}`)
const smtpResponse = await api.get(`/api/global/configs/${ConfigTypes.SMTP}`)
const smtpDoc = await smtpResponse.json()
if (!smtpDoc._id) {

4
packages/builder/src/pages/builder/portal/manage/users/[userId].svelte
View File

@ -45,8 +45,8 @@
})
let selectedApp
const userFetch = fetchData(`/api/admin/users/${userId}`)
const apps = fetchData(`/api/admin/roles`)
const userFetch = fetchData(`/api/global/users/${userId}`)
const apps = fetchData(`/api/global/roles`)
async function deleteUser() {
const res = await users.delete(userId)

2
packages/builder/src/pages/builder/portal/settings/organisation.svelte
View File

@ -37,7 +37,7 @@
async function uploadLogo(file) {
let data = new FormData()
data.append("file", file)
const res = await post("/api/admin/configs/upload/settings/logo", data, {})
const res = await post("/api/global/configs/upload/settings/logo", data, {})
return await res.json()
}

4
packages/builder/src/stores/portal/admin.js
View File

@ -9,7 +9,7 @@ export function createAdminStore() {
try {
const tenantId = get(auth).tenantId
const response = await api.get(
`/api/admin/configs/checklist?tenantId=${tenantId}`
`/api/global/configs/checklist?tenantId=${tenantId}`
)
const json = await response.json()
@ -38,7 +38,7 @@ export function createAdminStore() {
async function multiTenancyEnabled() {
let enabled = false
try {
const response = await api.get(`/api/admin/tenants/enabled`)
const response = await api.get(`/api/global/tenants/enabled`)
const json = await response.json()
enabled = json.enabled
} catch (err) {

14
packages/builder/src/stores/portal/auth.js
View File

@ -68,7 +68,7 @@ export function createAuthStore() {
setOrganisation(tenantId)
},
checkAuth: async () => {
const response = await api.get("/api/admin/users/self")
const response = await api.get("/api/global/users/self")
if (response.status !== 200) {
setUser(null)
} else {
@ -79,7 +79,7 @@ export function createAuthStore() {
login: async creds => {
const tenantId = get(store).tenantId
const response = await api.post(
`/api/admin/auth/${tenantId}/login`,
`/api/global/auth/${tenantId}/login`,
creds
)
const json = await response.json()
@ -91,7 +91,7 @@ export function createAuthStore() {
return json
},
logout: async () => {
const response = await api.post(`/api/admin/auth/logout`)
const response = await api.post(`/api/global/auth/logout`)
if (response.status !== 200) {
throw "Unable to create logout"
}
@ -100,7 +100,7 @@ export function createAuthStore() {
},
updateSelf: async fields => {
const newUser = { ...get(auth).user, ...fields }
const response = await api.post("/api/admin/users/self", newUser)
const response = await api.post("/api/global/users/self", newUser)
if (response.status === 200) {
setUser(newUser)
} else {
@ -109,7 +109,7 @@ export function createAuthStore() {
},
forgotPassword: async email => {
const tenantId = get(store).tenantId
const response = await api.post(`/api/admin/auth/${tenantId}/reset`, {
const response = await api.post(`/api/global/auth/${tenantId}/reset`, {
email,
})
if (response.status !== 200) {
@ -120,7 +120,7 @@ export function createAuthStore() {
resetPassword: async (password, code) => {
const tenantId = get(store).tenantId
const response = await api.post(
`/api/admin/auth/${tenantId}/reset/update`,
`/api/global/auth/${tenantId}/reset/update`,
{
password,
resetCode: code,
@ -132,7 +132,7 @@ export function createAuthStore() {
await response.json()
},
createUser: async user => {
const response = await api.post(`/api/admin/users`, user)
const response = await api.post(`/api/global/users`, user)
if (response.status !== 200) {
throw "Unable to create user"
}

6
packages/builder/src/stores/portal/email.js
View File

@ -9,11 +9,11 @@ export function createEmailStore() {
templates: {
fetch: async () => {
// fetch the email template definitions
const response = await api.get(`/api/admin/template/definitions`)
const response = await api.get(`/api/global/template/definitions`)
const definitions = await response.json()
// fetch the email templates themselves
const templatesResponse = await api.get(`/api/admin/template/email`)
const templatesResponse = await api.get(`/api/global/template/email`)
const templates = await templatesResponse.json()
store.set({
@ -23,7 +23,7 @@ export function createEmailStore() {
},
save: async template => {
// Save your template config
const response = await api.post(`/api/admin/template`, template)
const response = await api.post(`/api/global/template`, template)
const json = await response.json()
if (response.status !== 200) throw new Error(json.message)
template._rev = json._rev

2
packages/builder/src/stores/portal/oidc.js
View File

@ -15,7 +15,7 @@ export function createOidcStore() {
async function init() {
const tenantId = get(auth).tenantId
const res = await api.get(
`/api/admin/configs/public/oidc?tenantId=${tenantId}`
`/api/global/configs/public/oidc?tenantId=${tenantId}`
)
const json = await res.json()

4
packages/builder/src/stores/portal/organisation.js
View File

@ -17,7 +17,7 @@ export function createOrganisationStore() {
async function init() {
const tenantId = get(auth).tenantId
const res = await api.get(`/api/admin/configs/public?tenantId=${tenantId}`)
const res = await api.get(`/api/global/configs/public?tenantId=${tenantId}`)
const json = await res.json()
if (json.status === 400) {
@ -28,7 +28,7 @@ export function createOrganisationStore() {
}
async function save(config) {
const res = await api.post("/api/admin/configs", {
const res = await api.post("/api/global/configs", {
type: "settings",
config: { ...get(store), ...config },
_rev: get(store)._rev,

12
packages/builder/src/stores/portal/users.js
View File

@ -6,7 +6,7 @@ export function createUsersStore() {
const { subscribe, set } = writable([])
async function init() {
const response = await api.get(`/api/admin/users`)
const response = await api.get(`/api/global/users`)
const json = await response.json()
set(json)
}
@ -23,12 +23,12 @@ export function createUsersStore() {
global: true,
}
}
const response = await api.post(`/api/admin/users/invite`, body)
const response = await api.post(`/api/global/users/invite`, body)
return await response.json()
}
async function acceptInvite(inviteCode, password) {
const response = await api.post("/api/admin/users/invite/accept", {
const response = await api.post("/api/global/users/invite/accept", {
inviteCode,
password,
})
@ -47,20 +47,20 @@ export function createUsersStore() {
if (admin) {
body.admin = { global: true }
}
const response = await api.post("/api/admin/users", body)
const response = await api.post("/api/global/users", body)
await init()
return await response.json()
}
async function del(id) {
const response = await api.delete(`/api/admin/users/${id}`)
const response = await api.delete(`/api/global/users/${id}`)
update(users => users.filter(user => user._id !== id))
return await response.json()
}
async function save(data) {
try {
const res = await post(`/api/admin/users`, data)
const res = await post(`/api/global/users`, data)
return await res.json()
} catch (error) {
console.log(error)

4
packages/client/src/api/auth.js
View File

@ -13,7 +13,7 @@ export const logIn = async ({ email, password }) => {
return API.error("Please enter your password")
}
return await API.post({
url: "/api/admin/auth",
url: "/api/global/auth",
body: { username: email, password },
})
}
@ -23,7 +23,7 @@ export const logIn = async ({ email, password }) => {
*/
export const fetchSelf = async () => {
const user = await API.get({ url: "/api/self" })
if (user?._id) {
if (user && user._id) {
if (user.roleId === "PUBLIC") {
// Don't try to enrich a public user as it will 403
return user

2
packages/server/__mocks__/node-fetch.ts
View File

@ -16,7 +16,7 @@ module FetchMock {
}
}
if (url.includes("/api/admin")) {
if (url.includes("/api/global")) {
return json({
email: "test@test.com",
_id: "us_test@test.com",

3
packages/server/src/api/controllers/dev.js
View File

@ -9,8 +9,9 @@ const { DocumentTypes } = require("../../db/utils")
async function redirect(ctx, method) {
const { devPath } = ctx.params
const queryString = ctx.originalUrl.split("?")[1] || ""
const response = await fetch(
checkSlashesInUrl(`${env.WORKER_URL}/api/admin/${devPath}`),
checkSlashesInUrl(`${env.WORKER_URL}/api/global/${devPath}?${queryString}`),
request(
ctx,
{

6
packages/server/src/api/routes/dev.js
View File

@ -8,9 +8,9 @@ const router = Router()
if (env.isDev() || env.isTest()) {
router
.get("/api/admin/:devPath(.*)", controller.redirectGet)
.post("/api/admin/:devPath(.*)", controller.redirectPost)
.delete("/api/admin/:devPath(.*)", controller.redirectDelete)
.get("/api/global/:devPath(.*)", controller.redirectGet)
.post("/api/global/:devPath(.*)", controller.redirectPost)
.delete("/api/global/:devPath(.*)", controller.redirectDelete)
}
router

10
packages/server/src/utilities/workerRequests.js
View File

@ -30,7 +30,7 @@ exports.request = request
exports.sendSmtpEmail = async (tenantId, to, from, subject, contents) => {
const response = await fetch(
checkSlashesInUrl(env.WORKER_URL + `/api/admin/email/send`),
checkSlashesInUrl(env.WORKER_URL + `/api/global/email/send`),
request(null, {
method: "POST",
body: {
@ -74,7 +74,7 @@ exports.getDeployedApps = async ctx => {
}
exports.getGlobalSelf = async (ctx, appId = null) => {
const endpoint = `/api/admin/users/self`
const endpoint = `/api/global/users/self`
const response = await fetch(
checkSlashesInUrl(env.WORKER_URL + endpoint),
// we don't want to use API key when getting self
@ -96,11 +96,11 @@ exports.addAppRoleToUser = async (ctx, appId, roleId, userId = null) => {
body = {}
if (!userId) {
user = await exports.getGlobalSelf(ctx)
endpoint = `/api/admin/users/self`
endpoint = `/api/global/users/self`
} else {
user = await getGlobalUser(ctx, appId, userId)
body._id = userId
endpoint = `/api/admin/users`
endpoint = `/api/global/users`
}
body = {
...body,
@ -125,7 +125,7 @@ exports.addAppRoleToUser = async (ctx, appId, roleId, userId = null) => {
exports.removeAppFromUserRoles = async (ctx, appId) => {
const deployedAppId = getDeployedAppID(appId)
const response = await fetch(
checkSlashesInUrl(env.WORKER_URL + `/api/admin/roles/${deployedAppId}`),
checkSlashesInUrl(env.WORKER_URL + `/api/global/roles/${deployedAppId}`),
request(ctx, {
method: "DELETE",
})

6
packages/worker/src/api/controllers/admin/auth.js → packages/worker/src/api/controllers/global/auth.js
View File

@ -103,7 +103,7 @@ exports.logout = async ctx => {
exports.googlePreAuth = async (ctx, next) => {
const tenantId = ctx.params.tenantId
const db = getGlobalDB(tenantId)
const callbackUrl = `/api/admin/auth/${tenantId}/google/callback`
const callbackUrl = `/api/global/auth/${tenantId}/google/callback`
const config = await authPkg.db.getScopedConfig(db, {
type: Configs.GOOGLE,
@ -119,7 +119,7 @@ exports.googlePreAuth = async (ctx, next) => {
exports.googleAuth = async (ctx, next) => {
const tenantId = ctx.params.tenantId
const db = getGlobalDB(tenantId)
const callbackUrl = `/api/admin/auth/${tenantId}/google/callback`
const callbackUrl = `/api/global/auth/${tenantId}/google/callback`
const config = await authPkg.db.getScopedConfig(db, {
type: Configs.GOOGLE,
@ -148,7 +148,7 @@ async function oidcStrategyFactory(ctx, configId) {
const chosenConfig = config.configs.filter(c => c.uuid === configId)[0]
const callbackUrl = `${ctx.protocol}://${ctx.host}/api/admin/auth/${tenantId}/oidc/callback`
const callbackUrl = `${ctx.protocol}://${ctx.host}/api/global/auth/${tenantId}/oidc/callback`
return oidc.strategyFactory(chosenConfig, callbackUrl)
}

2
packages/worker/src/api/controllers/admin/configs.js → packages/worker/src/api/controllers/global/configs.js
View File

@ -230,7 +230,7 @@ exports.configChecklist = async function (ctx) {
const oidcConfig = await getScopedFullConfig(db, {
type: Configs.OIDC,
})
// They have set up an admin user
// They have set up an global user
const users = await db.allDocs(
getGlobalUserParams(null, {
include_docs: true,

0
packages/worker/src/api/controllers/admin/email.js → packages/worker/src/api/controllers/global/email.js
View File

0
packages/worker/src/api/controllers/admin/roles.js → packages/worker/src/api/controllers/global/roles.js
View File

0
packages/worker/src/api/controllers/admin/sessions.js → packages/worker/src/api/controllers/global/sessions.js
View File

0
packages/worker/src/api/controllers/admin/templates.js → packages/worker/src/api/controllers/global/templates.js
View File

0
packages/worker/src/api/controllers/admin/tenants.js → packages/worker/src/api/controllers/global/tenants.js
View File

4
packages/worker/src/api/controllers/admin/users.js → packages/worker/src/api/controllers/global/users.js
View File

@ -149,7 +149,7 @@ exports.adminUser = async ctx => {
)
if (response.rows.some(row => row.doc.admin)) {
ctx.throw(403, "You cannot initialise once an admin user has been created.")
ctx.throw(403, "You cannot initialise once an global user has been created.")
}
const user = {
@ -280,7 +280,7 @@ exports.invite = async ctx => {
exports.inviteAccept = async ctx => {
const { inviteCode, password, firstName, lastName } = ctx.request.body
try {
// info is an extension of the user object that was stored by admin
// info is an extension of the user object that was stored by global
const { email, info } = await checkInviteCode(inviteCode)
// only pass through certain props for accepting
ctx.request.body = {

0
packages/worker/src/api/controllers/admin/workspaces.js → packages/worker/src/api/controllers/global/workspaces.js
View File

14
packages/worker/src/api/index.js
View File

@ -7,33 +7,33 @@ const { buildAuthMiddleware, auditLog } = require("@budibase/auth").auth
const PUBLIC_ENDPOINTS = [
{
// this covers all of the POST auth routes
route: "/api/admin/auth/:tenantId",
route: "/api/global/auth/:tenantId",
method: "POST",
},
{
// this covers all of the GET auth routes
route: "/api/admin/auth/:tenantId",
route: "/api/global/auth/:tenantId",
method: "GET",
},
{
// this covers all of the public config routes
route: "/api/admin/configs/public",
route: "/api/global/configs/public",
method: "GET",
},
{
route: "api/admin/tenants/enabled",
route: "api/global/tenants/enabled",
method: "GET",
},
{
route: "/api/admin/configs/checklist",
route: "/api/global/configs/checklist",
method: "GET",
},
{
route: "/api/admin/users/init",
route: "/api/global/users/init",
method: "POST",
},
{
route: "/api/admin/users/invite/accept",
route: "/api/global/users/invite/accept",
method: "POST",
},
]

11
packages/worker/src/api/routes/admin/roles.js
View File

@ -1,11 +0,0 @@
const Router = require("@koa/router")
const controller = require("../../controllers/admin/roles")
const adminOnly = require("../../../middleware/adminOnly")
const router = Router()
router
.get("/api/admin/roles", adminOnly, controller.fetch)
.get("/api/admin/roles/:appId", adminOnly, controller.find)
module.exports = router

14
packages/worker/src/api/routes/admin/sessions.js
View File

@ -1,14 +0,0 @@
const Router = require("@koa/router")
const controller = require("../../controllers/admin/sessions")
const adminOnly = require("../../../middleware/adminOnly")
const router = Router()
router
.get("/api/admin/sessions", adminOnly, controller.fetch)
.get("/api/admin/sessions/self", controller.selfSessions)
.get("/api/admin/sessions/:userId", adminOnly, controller.find)
.delete("/api/admin/sessions/:userId", adminOnly, controller.invalidateUser)
.delete("/api/admin/sessions/self/:sessionId", controller.invalidateSession)
module.exports = router

12
packages/worker/src/api/routes/admin/tenants.js
View File

@ -1,12 +0,0 @@
const Router = require("@koa/router")
const controller = require("../../controllers/admin/tenants")
const adminOnly = require("../../../middleware/adminOnly")
const router = Router()
router
.get("/api/admin/tenants/enabled", controller.multiTenancyEnabled)
.get("/api/admin/tenants/:tenantId/exists", controller.exists)
.get("/api/admin/tenants", adminOnly, controller.fetch)
module.exports = router

18
packages/worker/src/api/routes/admin/auth.js → packages/worker/src/api/routes/global/auth.js
View File

@ -1,5 +1,5 @@
const Router = require("@koa/router")
const authController = require("../../controllers/admin/auth")
const authController = require("../../controllers/global/auth")
const joiValidator = require("../../../middleware/joi-validator")
const Joi = require("joi")
@ -30,27 +30,27 @@ function buildResetUpdateValidation() {
router
.post(
"/api/admin/auth/:tenantId/login",
"/api/global/auth/:tenantId/login",
buildAuthValidation(),
authController.authenticate
)
.post(
"/api/admin/auth/:tenantId/reset",
"/api/global/auth/:tenantId/reset",
buildResetValidation(),
authController.reset
)
.post(
"/api/admin/auth/:tenantId/reset/update",
"/api/global/auth/:tenantId/reset/update",
buildResetUpdateValidation(),
authController.resetUpdate
)
.post("/api/admin/auth/logout", authController.logout)
.get("/api/admin/auth/:tenantId/google", authController.googlePreAuth)
.get("/api/admin/auth/:tenantId/google/callback", authController.googleAuth)
.post("/api/global/auth/logout", authController.logout)
.get("/api/global/auth/:tenantId/google", authController.googlePreAuth)
.get("/api/global/auth/:tenantId/google/callback", authController.googleAuth)
.get(
"/api/admin/auth/:tenantId/oidc/configs/:configId",
"/api/global/auth/:tenantId/oidc/configs/:configId",
authController.oidcPreAuth
)
.get("/api/admin/auth/:tenantId/oidc/callback", authController.oidcAuth)
.get("/api/global/auth/:tenantId/oidc/callback", authController.oidcAuth)
module.exports = router

20
packages/worker/src/api/routes/admin/configs.js → packages/worker/src/api/routes/global/configs.js
View File

@ -1,5 +1,5 @@
const Router = require("@koa/router")
const controller = require("../../controllers/admin/configs")
const controller = require("../../controllers/global/configs")
const joiValidator = require("../../../middleware/joi-validator")
const adminOnly = require("../../../middleware/adminOnly")
const Joi = require("joi")
@ -96,24 +96,24 @@ function buildConfigGetValidation() {
router
.post(
"/api/admin/configs",
"/api/global/configs",
adminOnly,
buildConfigSaveValidation(),
controller.save
)
.delete("/api/admin/configs/:id/:rev", adminOnly, controller.destroy)
.get("/api/admin/configs", controller.fetch)
.get("/api/admin/configs/checklist", controller.configChecklist)
.delete("/api/global/configs/:id/:rev", adminOnly, controller.destroy)
.get("/api/global/configs", controller.fetch)
.get("/api/global/configs/checklist", controller.configChecklist)
.get(
"/api/admin/configs/all/:type",
"/api/global/configs/all/:type",
buildConfigGetValidation(),
controller.fetch
)
.get("/api/admin/configs/public", controller.publicSettings)
.get("/api/admin/configs/public/oidc", controller.publicOidc)
.get("/api/admin/configs/:type", buildConfigGetValidation(), controller.find)
.get("/api/global/configs/public", controller.publicSettings)
.get("/api/global/configs/public/oidc", controller.publicOidc)
.get("/api/global/configs/:type", buildConfigGetValidation(), controller.find)
.post(
"/api/admin/configs/upload/:type/:name",
"/api/global/configs/upload/:type/:name",
adminOnly,
buildUploadValidation(),
controller.upload

4
packages/worker/src/api/routes/admin/email.js → packages/worker/src/api/routes/global/email.js
View File

@ -1,5 +1,5 @@
const Router = require("@koa/router")
const controller = require("../../controllers/admin/email")
const controller = require("../../controllers/global/email")
const { EmailTemplatePurpose } = require("../../../constants")
const joiValidator = require("../../../middleware/joi-validator")
const adminOnly = require("../../../middleware/adminOnly")
@ -20,7 +20,7 @@ function buildEmailSendValidation() {
}
router.post(
"/api/admin/email/send",
"/api/global/email/send",
buildEmailSendValidation(),
adminOnly,
controller.sendEmail

11
packages/worker/src/api/routes/global/roles.js Normal file
View File

@ -0,0 +1,11 @@
const Router = require("@koa/router")
const controller = require("../../controllers/global/roles")
const adminOnly = require("../../../middleware/adminOnly")
const router = Router()
router
.get("/api/global/roles", adminOnly, controller.fetch)
.get("/api/global/roles/:appId", adminOnly, controller.find)
module.exports = router

14
packages/worker/src/api/routes/global/sessions.js Normal file
View File

@ -0,0 +1,14 @@
const Router = require("@koa/router")
const controller = require("../../controllers/global/sessions")
const adminOnly = require("../../../middleware/adminOnly")
const router = Router()
router
.get("/api/global/sessions", adminOnly, controller.fetch)
.get("/api/global/sessions/self", controller.selfSessions)
.get("/api/global/sessions/:userId", adminOnly, controller.find)
.delete("/api/global/sessions/:userId", adminOnly, controller.invalidateUser)
.delete("/api/global/sessions/self/:sessionId", controller.invalidateSession)
module.exports = router

16
packages/worker/src/api/routes/admin/templates.js → packages/worker/src/api/routes/global/templates.js
View File

@ -1,5 +1,5 @@
const Router = require("@koa/router")
const controller = require("../../controllers/admin/templates")
const controller = require("../../controllers/global/templates")
const joiValidator = require("../../../middleware/joi-validator")
const Joi = require("joi")
const { TemplatePurpose, TemplateTypes } = require("../../../constants")
@ -21,17 +21,17 @@ function buildTemplateSaveValidation() {
}
router
.get("/api/admin/template/definitions", controller.definitions)
.get("/api/global/template/definitions", controller.definitions)
.post(
"/api/admin/template",
"/api/global/template",
adminOnly,
buildTemplateSaveValidation(),
controller.save
)
.get("/api/admin/template", controller.fetch)
.get("/api/admin/template/:type", controller.fetchByType)
.get("/api/admin/template/:ownerId", controller.fetchByOwner)
.get("/api/admin/template/:id", controller.find)
.delete("/api/admin/template/:id/:rev", adminOnly, controller.destroy)
.get("/api/global/template", controller.fetch)
.get("/api/global/template/:type", controller.fetchByType)
.get("/api/global/template/:ownerId", controller.fetchByOwner)
.get("/api/global/template/:id", controller.find)
.delete("/api/global/template/:id/:rev", adminOnly, controller.destroy)
module.exports = router

12
packages/worker/src/api/routes/global/tenants.js Normal file
View File

@ -0,0 +1,12 @@
const Router = require("@koa/router")
const controller = require("../../controllers/global/tenants")
const adminOnly = require("../../../middleware/adminOnly")
const router = Router()
router
.get("/api/global/tenants/enabled", controller.multiTenancyEnabled)
.get("/api/global/tenants/:tenantId/exists", controller.exists)
.get("/api/global/tenants", adminOnly, controller.fetch)
module.exports = router

28
packages/worker/src/api/routes/admin/users.js → packages/worker/src/api/routes/global/users.js
View File

@ -1,5 +1,5 @@
const Router = require("@koa/router")
const controller = require("../../controllers/admin/users")
const controller = require("../../controllers/global/users")
const joiValidator = require("../../../middleware/joi-validator")
const adminOnly = require("../../../middleware/adminOnly")
const Joi = require("joi")
@ -62,39 +62,39 @@ function buildInviteAcceptValidation() {
router
.post(
"/api/admin/users",
"/api/global/users",
adminOnly,
buildUserSaveValidation(),
controller.save
)
.get("/api/admin/users", adminOnly, controller.fetch)
.delete("/api/admin/roles/:appId", adminOnly, controller.removeAppRole)
.delete("/api/admin/users/:id", adminOnly, controller.destroy)
.get("/api/admin/roles/:appId")
.get("/api/global/users", adminOnly, controller.fetch)
.delete("/api/global/roles/:appId", adminOnly, controller.removeAppRole)
.delete("/api/global/users/:id", adminOnly, controller.destroy)
.get("/api/global/roles/:appId")
.post(
"/api/admin/users/invite",
"/api/global/users/invite",
adminOnly,
buildInviteValidation(),
controller.invite
)
// non-admin endpoints
// non-global endpoints
.post(
"/api/admin/users/self",
"/api/global/users/self",
buildUserSaveValidation(true),
controller.updateSelf
)
.post(
"/api/admin/users/invite/accept",
"/api/global/users/invite/accept",
buildInviteAcceptValidation(),
controller.inviteAccept
)
.post(
"/api/admin/users/init",
"/api/global/users/init",
buildAdminInitValidation(),
controller.adminUser
)
.get("/api/admin/users/self", controller.getSelf)
// admin endpoint but needs to come at end (blocks other endpoints otherwise)
.get("/api/admin/users/:id", adminOnly, controller.find)
.get("/api/global/users/self", controller.getSelf)
// global endpoint but needs to come at end (blocks other endpoints otherwise)
.get("/api/global/users/:id", adminOnly, controller.find)
module.exports = router

10
packages/worker/src/api/routes/admin/workspaces.js → packages/worker/src/api/routes/global/workspaces.js
View File

@ -1,5 +1,5 @@
const Router = require("@koa/router")
const controller = require("../../controllers/admin/workspaces")
const controller = require("../../controllers/global/workspaces")
const joiValidator = require("../../../middleware/joi-validator")
const adminOnly = require("../../../middleware/adminOnly")
const Joi = require("joi")
@ -26,13 +26,13 @@ function buildWorkspaceSaveValidation() {
router
.post(
"/api/admin/workspaces",
"/api/global/workspaces",
adminOnly,
buildWorkspaceSaveValidation(),
controller.save
)
.delete("/api/admin/workspaces/:id", adminOnly, controller.destroy)
.get("/api/admin/workspaces", controller.fetch)
.get("/api/admin/workspaces/:id", controller.find)
.delete("/api/global/workspaces/:id", adminOnly, controller.destroy)
.get("/api/global/workspaces", controller.fetch)
.get("/api/global/workspaces/:id", controller.find)
module.exports = router

18
packages/worker/src/api/routes/index.js
View File

@ -1,12 +1,12 @@
const userRoutes = require("./admin/users")
const configRoutes = require("./admin/configs")
const workspaceRoutes = require("./admin/workspaces")
const templateRoutes = require("./admin/templates")
const tenantsRoutes = require("./admin/tenants")
const emailRoutes = require("./admin/email")
const authRoutes = require("./admin/auth")
const roleRoutes = require("./admin/roles")
const sessionRoutes = require("./admin/sessions")
const userRoutes = require("./global/users")
const configRoutes = require("./global/configs")
const workspaceRoutes = require("./global/workspaces")
const templateRoutes = require("./global/templates")
const tenantsRoutes = require("./global/tenants")
const emailRoutes = require("./global/email")
const authRoutes = require("./global/auth")
const roleRoutes = require("./global/roles")
const sessionRoutes = require("./global/sessions")
const appRoutes = require("./app")
exports.routes = [

12
packages/worker/src/api/routes/tests/auth.spec.js
View File

@ -5,7 +5,7 @@ const TENANT_ID = "default"
jest.mock("nodemailer")
const sendMailMock = setup.emailMock()
describe("/api/admin/auth", () => {
describe("/api/global/auth", () => {
let request = setup.getRequest()
let config = setup.getConfig()
let code
@ -26,7 +26,7 @@ describe("/api/admin/auth", () => {
await config.saveSettingsConfig()
await config.createUser("test@test.com")
const res = await request
.post(`/api/admin/auth/${TENANT_ID}/reset`)
.post(`/api/global/auth/${TENANT_ID}/reset`)
.send({
email: "test@test.com",
})
@ -43,7 +43,7 @@ describe("/api/admin/auth", () => {
it("should allow resetting user password with code", async () => {
const res = await request
.post(`/api/admin/auth/${TENANT_ID}/reset/update`)
.post(`/api/global/auth/${TENANT_ID}/reset/update`)
.send({
password: "newpassword",
resetCode: code,
@ -76,13 +76,13 @@ describe("/api/admin/auth", () => {
afterEach(() => {
expect(strategyFactory).toBeCalledWith(
chosenConfig,
`http://127.0.0.1:4003/api/admin/auth/${TENANT_ID}/oidc/callback` // calculated url
`http://127.0.0.1:4003/api/global/auth/${TENANT_ID}/oidc/callback` // calculated url
)
})
describe("oidc configs", () => {
it("should load strategy and delegate to passport", async () => {
await request.get(`/api/admin/auth/${TENANT_ID}/oidc/configs/${configId}`)
await request.get(`/api/global/auth/${TENANT_ID}/oidc/configs/${configId}`)
expect(passportSpy).toBeCalledWith(mockStrategyReturn, {
scope: ["profile", "email"],
@ -93,7 +93,7 @@ describe("/api/admin/auth", () => {
describe("oidc callback", () => {
it("should load strategy and delegate to passport", async () => {
await request.get(`/api/admin/auth/${TENANT_ID}/oidc/callback`)
await request.get(`/api/global/auth/${TENANT_ID}/oidc/callback`)
.set(config.getOIDConfigCookie(configId))
expect(passportSpy).toBeCalledWith(mockStrategyReturn, {

4
packages/worker/src/api/routes/tests/configs.spec.js
View File

@ -8,7 +8,7 @@ nodemailer.createTransport.mockReturnValue({
verify: jest.fn()
})
describe("/api/admin/configs/checklist", () => {
describe("/api/global/configs/checklist", () => {
let request = setup.getRequest()
let config = setup.getConfig()
@ -24,7 +24,7 @@ describe("/api/admin/configs/checklist", () => {
await config.saveSmtpConfig()
const res = await request
.get(`/api/admin/configs/checklist`)
.get(`/api/global/configs/checklist`)
.set(config.defaultHeaders())
.expect("Content-Type", /json/)
.expect(200)

4
packages/worker/src/api/routes/tests/email.spec.js
View File

@ -10,7 +10,7 @@ nodemailer.createTransport.mockReturnValue({
verify: jest.fn()
})
describe("/api/admin/email", () => {
describe("/api/global/email", () => {
let request = setup.getRequest()
let config = setup.getConfig()
@ -25,7 +25,7 @@ describe("/api/admin/email", () => {
await config.saveSmtpConfig()
await config.saveSettingsConfig()
const res = await request
.post(`/api/admin/email/send`)
.post(`/api/global/email/send`)
.send({
email: "test@test.com",
purpose: EmailTemplatePurpose.INVITATION,

4
packages/worker/src/api/routes/tests/realEmail.spec.js
View File

@ -6,7 +6,7 @@ const fetch = require("node-fetch")
// need a longer timeout for getting these
jest.setTimeout(30000)
describe("/api/admin/email", () => {
describe("/api/global/email", () => {
let request = setup.getRequest()
let config = setup.getConfig()
@ -21,7 +21,7 @@ describe("/api/admin/email", () => {
await config.saveSettingsConfig()
const user = await config.getUser("test@test.com")
const res = await request
.post(`/api/admin/email/send`)
.post(`/api/global/email/send`)
.send({
email: "test@test.com",
purpose,

6
packages/worker/src/api/routes/tests/users.spec.js
View File

@ -3,7 +3,7 @@ const setup = require("./utilities")
jest.mock("nodemailer")
const sendMailMock = setup.emailMock()
describe("/api/admin/users", () => {
describe("/api/global/users", () => {
let request = setup.getRequest()
let config = setup.getConfig()
let code
@ -19,7 +19,7 @@ describe("/api/admin/users", () => {
await config.saveSmtpConfig()
await config.saveSettingsConfig()
const res = await request
.post(`/api/admin/users/invite`)
.post(`/api/global/users/invite`)
.send({
email: "invite@test.com",
})
@ -37,7 +37,7 @@ describe("/api/admin/users", () => {
it("should be able to create new user from invite", async () => {
const res = await request
.post(`/api/admin/users/invite/accept`)
.post(`/api/global/users/invite/accept`)
.send({
password: "newpassword",
inviteCode: code,

10
packages/worker/src/api/routes/tests/utilities/controllers.js
View File

@ -1,7 +1,7 @@
module.exports = {
email: require("../../../controllers/admin/email"),
workspaces: require("../../../controllers/admin/workspaces"),
config: require("../../../controllers/admin/configs"),
templates: require("../../../controllers/admin/templates"),
users: require("../../../controllers/admin/users"),
email: require("../../../controllers/global/email"),
workspaces: require("../../../controllers/global/workspaces"),
config: require("../../../controllers/global/configs"),
templates: require("../../../controllers/global/templates"),
users: require("../../../controllers/global/users"),
}