Remove tenants from api endpoints (#2765)

backend/src/api/activity/activityAddWithMember.ts

@@ -3,14 +3,13 @@ import ActivityService from '../../services/activityService'
 import PermissionChecker from '../../services/user/permissionChecker'
 
 /**
- * POST /tenant/{tenantId}/activity/with-member
+ * POST /activity/with-member
  * @summary Create or update an activity with a member
  * @tag Activities
  * @security Bearer
  * @description Create or update an activity with a member
  * Activity existence is checked by sourceId and tenantId
  * Member existence is checked by platform and username
- * @pathParam {string} tenantId - Your workspace/tenant ID
  * @bodyContent {ActivityUpsertWithMemberInput} application/json
  * @response 200 - Ok
  * @responseContent {Activity} 200.application/json
@@ -20,10 +19,7 @@ import PermissionChecker from '../../services/user/permissionChecker'
  * @response 429 - Too many requests
  */
 export default async (req, res) => {
-  // Check we have the Create permissions
   new PermissionChecker(req).validateHas(Permissions.values.activityCreate)
-  // Call the createWithMember function in activity service
-  // to create the activity.
   const payload = await new ActivityService(req).createWithMember(req.body)
 
   await req.responseHandler.success(req, res, payload)

backend/src/api/activity/activityChannels.ts

@@ -3,12 +3,11 @@ import ActivityService from '../../services/activityService'
 import PermissionChecker from '../../services/user/permissionChecker'
 
 /**
- * GET /tenant/{tenantId}/activity/channel
+ * GET /activity/channel
  * @summary List activity channels
  * @tag Activities
  * @security Bearer
- * @description Find all activity channels of a given tenant
- * @pathParam {string} tenantId - Your workspace/tenant ID
+ * @description Find all activity channels
  * @response 200 - Ok
  * @responseContent {ActivityResponse} 200.application/json
  * @responseExample {ActivityFind} 200.application/json.Activity

backend/src/api/activity/activityCreate.ts

@@ -4,12 +4,11 @@ import ActivityService from '../../services/activityService'
 import PermissionChecker from '../../services/user/permissionChecker'
 
 /**
- * POST /tenant/{tenantId}/activity
+ * POST /activity
  * @summary Create or update an activity
  * @tag Activities
  * @security Bearer
  * @description Create or update an activity. Existence is checked by sourceId and tenantId
- * @pathParam {string} tenantId - Your workspace/tenant ID
  * @bodyContent {ActivityUpsertInput} application/json
  * @response 200 - Ok
  * @responseContent {Activity} 200.application/json

backend/src/api/activity/activityDestroy.ts

@@ -3,12 +3,11 @@ import ActivityService from '../../services/activityService'
 import PermissionChecker from '../../services/user/permissionChecker'
 
 /**
- * DELETE /tenant/{tenantId}/activity/{id}
+ * DELETE /activity/{id}
  * @summary Delete an activity
  * @tag Activities
  * @security Bearer
  * @description Delete a activity given an ID
- * @pathParam {string} tenantId - Your workspace/tenant ID
  * @pathParam {string} id - The ID of the activity
  * @response 200 - Ok
  * @response 401 - Unauthorized

backend/src/api/activity/activityFind.ts

@@ -3,7 +3,7 @@ import ActivityService from '../../services/activityService'
 import PermissionChecker from '../../services/user/permissionChecker'
 
 /**
- * GET /tenant/{tenantId}/activity/{id}
+ * GET /activity/{id}
  * @summary Find an activity
  * @tag Activities
  * @security Bearer

backend/src/api/activity/activityQuery.ts

@@ -4,12 +4,11 @@ import ActivityService from '../../services/activityService'
 import PermissionChecker from '../../services/user/permissionChecker'
 
 /**
- * POST /tenant/{tenantId}/activity/query
+ * POST /activity/query
  * @summary Query activities
  * @tag Activities
  * @security Bearer
  * @description Query activities. It accepts filters, sorting options and pagination.
- * @pathParam {string} tenantId - Your workspace/tenant ID
  * @bodyContent {ActivityQuery} application/json
  * @response 200 - Ok
  * @responseContent {ActivityList} 200.application/json

backend/src/api/activity/activityTypes.ts

@@ -2,21 +2,6 @@ import Permissions from '../../security/permissions'
 import ActivityService from '../../services/activityService'
 import PermissionChecker from '../../services/user/permissionChecker'
 
-/**
- * GET /tenant/{tenantId}/activity/{id}
- * @summary Find an activity
- * @tag Activities
- * @security Bearer
- * @description Find a single activity by ID
- * @pathParam {string} tenantId - Your workspace/tenant ID
- * @pathParam {string} id - The ID of the activity
- * @response 200 - Ok
- * @responseContent {ActivityResponse} 200.application/json
- * @responseExample {ActivityFind} 200.application/json.Activity
- * @response 401 - Unauthorized
- * @response 404 - Not found
- * @response 429 - Too many requests
- */
 export default async (req, res) => {
   new PermissionChecker(req).validateHas(Permissions.values.activityRead)
   const payload = await new ActivityService(req).findActivityTypes(req.query.segments)

backend/src/api/activity/activityUpdate.ts

@@ -3,12 +3,11 @@ import ActivityService from '../../services/activityService'
 import PermissionChecker from '../../services/user/permissionChecker'
 
 /**
- * PUT /tenant/{tenantId}/activity/{id}
+ * PUT /activity/{id}
  * @summary Update an activity
  * @tag Activities
  * @security Bearer
  * @description Update an activity given an ID.
- * @pathParam {string} tenantId - Your workspace/tenant ID
  * @pathParam {string} id - The ID of the activity
  * @bodyContent {ActivityUpsertInput} application/json
  * @response 200 - Ok

backend/src/api/activity/index.ts

@@ -1,17 +1,11 @@
 import { safeWrap } from '../../middlewares/errorMiddleware'
 
 export default (app) => {
-  app.post(`/tenant/:tenantId/activity`, safeWrap(require('./activityCreate').default))
-  app.post(`/tenant/:tenantId/activity/query`, safeWrap(require('./activityQuery').default))
-  app.put(`/tenant/:tenantId/activity/:id`, safeWrap(require('./activityUpdate').default))
-  app.post(`/tenant/:tenantId/activity/import`, safeWrap(require('./activityImport').default))
-  app.delete(`/tenant/:tenantId/activity`, safeWrap(require('./activityDestroy').default))
-  app.get(`/tenant/:tenantId/activity/type`, safeWrap(require('./activityTypes').default))
-  app.get(`/tenant/:tenantId/activity/channel`, safeWrap(require('./activityChannels').default))
-  // app.get(`/tenant/:tenantId/activity/:id`, safeWrap(require('./activityFind').default))
-  app.post(
-    '/tenant/:tenantId/activity/with-member',
-    // Call the addActivityWithMember file in this dir
-    safeWrap(require('./activityAddWithMember').default),
-  )
+  app.post(`/activity`, safeWrap(require('./activityCreate').default))
+  app.post(`/activity/query`, safeWrap(require('./activityQuery').default))
+  app.put(`/activity/:id`, safeWrap(require('./activityUpdate').default))
+  app.delete(`/activity`, safeWrap(require('./activityDestroy').default))
+  app.get(`/activity/type`, safeWrap(require('./activityTypes').default))
+  app.get(`/activity/channel`, safeWrap(require('./activityChannels').default))
+  app.post('/activity/with-member', safeWrap(require('./activityAddWithMember').default))
 }

backend/src/api/auditLog/index.ts

@@ -1,7 +1,7 @@
 import { safeWrap } from '../../middlewares/errorMiddleware'
 
 export default (app) => {
-  app.get(`/tenant/:tenantId/audit-log`, safeWrap(require('./auditLogList').default))
+  app.get(`/audit-log`, safeWrap(require('./auditLogList').default))
 
-  app.post(`/tenant/:tenantId/audit-logs/query`, safeWrap(require('./auditLogsQuery').default))
+  app.post(`/audit-logs/query`, safeWrap(require('./auditLogsQuery').default))
 }

backend/src/api/auth/authSignIn.ts

@@ -1,11 +1,13 @@
+import { getDefaultTenantId } from '@crowd/common'
+
 import AuthService from '../../services/auth/authService'
 
 export default async (req, res) => {
   const payload = await AuthService.signin(
     req.body.email,
     req.body.password,
     req.body.invitationToken,
-    req.body.tenantId,
+    getDefaultTenantId(),
     req,
   )
 

backend/src/api/auth/authSignUp.ts

@@ -1,3 +1,5 @@
+import { getDefaultTenantId } from '@crowd/common'
+
 import AuthService from '../../services/auth/authService'
 
 export default async (req, res) => {
@@ -8,7 +10,7 @@ export default async (req, res) => {
     req.body.email,
     req.body.password,
     req.body.invitationToken,
-    req.body.tenantId,
+    getDefaultTenantId(),
     req.body.firstName,
     req.body.lastName,
     req.body.acceptedTermsAndPrivacy,

backend/src/api/auth/authSocial.ts

@@ -1,5 +1,6 @@
 import passport from 'passport'
 
+import { getDefaultTenantId } from '@crowd/common'
 import { getServiceChildLogger } from '@crowd/logging'
 
 import { API_CONFIG, GITHUB_CONFIG, GOOGLE_CONFIG } from '../../conf'
@@ -21,7 +22,7 @@ export default (app, routes) => {
   routes.post('/auth/social/onboard', async (req, res) => {
     const payload = await AuthService.handleOnboard(
       req.currentUser,
-      { invitationToken: req.body.invitationToken, tenantId: req.body.tenantId },
+      { invitationToken: req.body.invitationToken, tenantId: getDefaultTenantId() },
       req,
     )
 

backend/src/api/auth/ssoCallback.ts

@@ -1,7 +1,7 @@
 import jwt from 'jsonwebtoken'
 import jwksClient from 'jwks-rsa'
 
-import { Error401 } from '@crowd/common'
+import { Error401, getDefaultTenantId } from '@crowd/common'
 
 import { AUTH0_CONFIG } from '../../conf'
 import AuthService from '../../services/auth/authService'
@@ -21,7 +21,8 @@ async function getKey(header, callback) {
 }
 
 export default async (req, res) => {
-  const { idToken, invitationToken, tenantId } = req.body
+  const { idToken, invitationToken } = req.body
+  const tenantId = getDefaultTenantId()
 
   try {
     const verifyToken = new Promise((resolve, reject) => {