@budibase/worker 2.2.12-alpha.49 → 2.2.12-alpha.50

package/coverage/lcov.info

@@ -158,11 +158,11 @@ BRH:1
 end_of_record
 TN:
 SF:src/api/index.ts
-FN:166,(anonymous_0)
-FN:121,(anonymous_2)
-FN:127,(anonymous_3)
-FN:142,(anonymous_4)
-FN:158,(anonymous_5)
+FN:170,(anonymous_0)
+FN:125,(anonymous_2)
+FN:131,(anonymous_3)
+FN:146,(anonymous_4)
+FN:162,(anonymous_5)
 FNF:5
 FNH:3
 FNDA:18,(anonymous_0)
@@ -177,40 +177,40 @@ DA:4,18
 DA:5,18
 DA:6,18
 DA:9,18
-DA:67,18
-DA:105,18
-DA:107,18
-DA:108,18
-DA:121,0
-DA:128,123
-DA:129,24
-DA:131,99
-DA:135,2
-DA:137,97
-DA:142,18
-DA:143,121
-DA:144,121
-DA:146,14
-DA:147,14
-DA:148,14
-DA:149,14
-DA:154,14
-DA:158,18
-DA:161,18
-DA:162,306
-DA:163,306
-DA:166,18
+DA:71,18
+DA:109,18
+DA:111,18
+DA:112,18
+DA:125,0
+DA:132,123
+DA:133,24
+DA:135,99
+DA:139,2
+DA:141,97
+DA:146,18
+DA:147,121
+DA:148,121
+DA:150,14
+DA:151,14
+DA:152,14
+DA:153,14
+DA:158,14
+DA:162,18
+DA:165,18
+DA:166,306
+DA:167,306
+DA:170,18
 LF:30
 LH:29
-BRDA:128,0,0,24
-BRDA:131,1,0,2
-BRDA:132,2,0,99
-BRDA:132,2,1,97
-BRDA:132,2,2,90
-BRDA:132,2,3,8
-BRDA:147,3,0,14
-BRDA:147,3,1,0
-BRDA:147,3,2,0
+BRDA:132,0,0,24
+BRDA:135,1,0,2
+BRDA:136,2,0,99
+BRDA:136,2,1,97
+BRDA:136,2,2,90
+BRDA:136,2,3,8
+BRDA:151,3,0,14
+BRDA:151,3,1,0
+BRDA:151,3,2,0
 BRF:9
 BRH:7
 end_of_record
@@ -1128,25 +1128,27 @@ FN:179,(anonymous_9)
 FN:189,(anonymous_10)
 FN:208,(anonymous_11)
 FN:213,(anonymous_12)
-FN:25,(anonymous_14)
-FN:34,(anonymous_15)
-FN:41,(anonymous_16)
-FN:50,(anonymous_17)
-FN:67,(anonymous_18)
-FN:71,(anonymous_19)
-FN:74,(anonymous_20)
-FN:128,(anonymous_21)
-FN:137,(anonymous_22)
-FN:150,(anonymous_23)
-FN:163,(anonymous_24)
-FN:175,(anonymous_25)
-FN:179,(anonymous_26)
-FN:189,(anonymous_27)
-FN:208,(anonymous_28)
-FN:213,(anonymous_29)
-FN:218,(anonymous_30)
-FNF:29
-FNH:25
+FN:226,(anonymous_13)
+FN:25,(anonymous_15)
+FN:34,(anonymous_16)
+FN:41,(anonymous_17)
+FN:50,(anonymous_18)
+FN:67,(anonymous_19)
+FN:71,(anonymous_20)
+FN:74,(anonymous_21)
+FN:128,(anonymous_22)
+FN:137,(anonymous_23)
+FN:150,(anonymous_24)
+FN:163,(anonymous_25)
+FN:175,(anonymous_26)
+FN:179,(anonymous_27)
+FN:189,(anonymous_28)
+FN:208,(anonymous_29)
+FN:213,(anonymous_30)
+FN:226,(anonymous_31)
+FN:231,(anonymous_32)
+FNF:31
+FNH:26
 FNDA:82,(anonymous_1)
 FNDA:18,(anonymous_2)
 FNDA:18,(anonymous_3)
@@ -1159,23 +1161,25 @@ FNDA:18,(anonymous_9)
 FNDA:18,(anonymous_10)
 FNDA:18,(anonymous_11)
 FNDA:18,(anonymous_12)
-FNDA:86,(anonymous_14)
-FNDA:3,(anonymous_15)
-FNDA:6,(anonymous_16)
-FNDA:9,(anonymous_17)
-FNDA:12,(anonymous_18)
-FNDA:6,(anonymous_19)
+FNDA:18,(anonymous_13)
+FNDA:86,(anonymous_15)
+FNDA:3,(anonymous_16)
+FNDA:6,(anonymous_17)
+FNDA:9,(anonymous_18)
+FNDA:12,(anonymous_19)
 FNDA:6,(anonymous_20)
-FNDA:0,(anonymous_21)
-FNDA:5,(anonymous_22)
-FNDA:0,(anonymous_23)
+FNDA:6,(anonymous_21)
+FNDA:0,(anonymous_22)
+FNDA:5,(anonymous_23)
 FNDA:0,(anonymous_24)
-FNDA:9,(anonymous_25)
-FNDA:0,(anonymous_26)
-FNDA:3,(anonymous_27)
-FNDA:2,(anonymous_28)
-FNDA:1,(anonymous_29)
-FNDA:1,(anonymous_30)
+FNDA:0,(anonymous_25)
+FNDA:9,(anonymous_26)
+FNDA:0,(anonymous_27)
+FNDA:3,(anonymous_28)
+FNDA:2,(anonymous_29)
+FNDA:0,(anonymous_30)
+FNDA:1,(anonymous_31)
+FNDA:1,(anonymous_32)
 DA:1,18
 DA:2,18
 DA:3,18
@@ -1271,20 +1275,26 @@ DA:208,18
 DA:209,2
 DA:210,2
 DA:213,18
-DA:214,1
-DA:215,1
-DA:217,1
-DA:218,1
-DA:219,1
-DA:226,1
+DA:214,0
+DA:216,0
+DA:217,0
+DA:219,0
+DA:221,0
+DA:226,18
 DA:227,1
 DA:228,1
-DA:229,1
-DA:232,0
-DA:234,0
-DA:236,0
-LF:107
-LH:79
+DA:230,1
+DA:231,1
+DA:232,1
+DA:239,1
+DA:240,1
+DA:241,1
+DA:242,1
+DA:245,0
+DA:247,0
+DA:249,0
+LF:113
+LH:80
 BRDA:30,0,0,5
 BRDA:30,0,1,5
 BRDA:35,1,0,1
@@ -1316,7 +1326,7 @@ BRDA:182,18,1,0
 BRDA:194,19,0,1
 BRDA:196,20,0,1
 BRDA:196,20,1,0
-BRDA:232,21,0,0
+BRDA:245,21,0,0
 BRF:32
 BRH:17
 end_of_record
@@ -1727,19 +1737,21 @@ BRH:0
 end_of_record
 TN:
 SF:src/api/routes/global/users.ts
-FN:116,(anonymous_0)
+FN:130,(anonymous_0)
 FN:11,buildAdminInitValidation
 FN:23,buildInviteValidation
 FN:31,buildInviteMultipleValidation
-FN:41,(anonymous_8)
-FN:49,buildInviteAcceptValidation
-FNF:6
-FNH:6
+FN:41,buildInviteLookupValidation
+FN:48,(anonymous_9)
+FN:56,buildInviteAcceptValidation
+FNF:7
+FNH:7
 FNDA:18,(anonymous_0)
 FNDA:18,buildAdminInitValidation
 FNDA:18,buildInviteValidation
 FNDA:18,buildInviteMultipleValidation
-FNDA:23,(anonymous_8)
+FNDA:18,buildInviteLookupValidation
+FNDA:23,(anonymous_9)
 FNDA:18,buildInviteAcceptValidation
 DA:1,18
 DA:2,18
@@ -1752,17 +1764,18 @@ DA:9,18
 DA:12,18
 DA:25,18
 DA:33,18
-DA:41,18
-DA:42,23
-DA:43,11
-DA:45,12
-DA:51,18
-DA:57,18
-DA:116,18
-LF:18
-LH:18
-BRDA:42,0,0,11
-BRDA:42,0,1,12
+DA:43,18
+DA:48,18
+DA:49,23
+DA:50,11
+DA:52,12
+DA:58,18
+DA:66,18
+DA:130,18
+LF:19
+LH:19
+BRDA:49,0,0,11
+BRDA:49,0,1,12
 BRF:2
 BRH:2
 end_of_record
@@ -3561,13 +3574,13 @@ FN:13,(anonymous_0)
 FN:14,(anonymous_2)
 FN:20,(anonymous_3)
 FN:45,(anonymous_4)
-FN:56,(anonymous_5)
-FN:69,(anonymous_6)
-FN:81,(anonymous_7)
-FN:94,(anonymous_8)
-FN:118,(anonymous_9)
-FN:127,(anonymous_10)
-FN:135,(anonymous_11)
+FN:57,(anonymous_5)
+FN:70,(anonymous_6)
+FN:82,(anonymous_7)
+FN:95,(anonymous_8)
+FN:119,(anonymous_9)
+FN:128,(anonymous_10)
+FN:136,(anonymous_11)
 FNF:11
 FNH:11
 FNDA:18,(anonymous_0)
@@ -3598,50 +3611,50 @@ DA:41,2
 DA:42,2
 DA:45,18
 DA:46,1
-DA:56,18
-DA:57,2
+DA:57,18
 DA:58,2
 DA:59,2
-DA:69,18
-DA:70,6
+DA:60,2
+DA:70,18
 DA:71,6
-DA:78,6
-DA:81,18
-DA:82,3
+DA:72,6
+DA:79,6
+DA:82,18
 DA:83,3
-DA:89,3
-DA:94,18
-DA:98,6
+DA:84,3
+DA:90,3
+DA:95,18
 DA:99,6
-DA:105,6
-DA:112,6
-DA:118,18
-DA:119,23
-DA:127,18
-DA:128,5
-DA:135,18
-DA:136,9
+DA:100,6
+DA:106,6
+DA:113,6
+DA:119,18
+DA:120,23
+DA:128,18
+DA:129,5
+DA:136,18
+DA:137,9
 LF:40
 LH:40
 BRDA:20,0,0,2
 BRDA:32,1,0,1
-BRDA:56,2,0,2
-BRDA:69,3,0,6
-BRDA:88,4,0,1
-BRDA:88,4,1,2
-BRDA:98,5,0,6
-BRDA:110,6,0,0
-BRDA:110,6,1,6
-BRDA:122,7,0,23
-BRDA:122,7,1,21
-BRDA:124,8,0,7
-BRDA:124,8,1,16
-BRDA:132,9,0,2
-BRDA:132,9,1,3
-BRDA:138,10,0,6
-BRDA:138,10,1,3
-BRDA:140,11,0,0
-BRDA:140,11,1,9
+BRDA:57,2,0,2
+BRDA:70,3,0,6
+BRDA:89,4,0,1
+BRDA:89,4,1,2
+BRDA:99,5,0,6
+BRDA:111,6,0,0
+BRDA:111,6,1,6
+BRDA:123,7,0,23
+BRDA:123,7,1,21
+BRDA:125,8,0,7
+BRDA:125,8,1,16
+BRDA:133,9,0,2
+BRDA:133,9,1,3
+BRDA:139,10,0,6
+BRDA:139,10,1,3
+BRDA:141,11,0,0
+BRDA:141,11,1,9
 BRF:19
 BRH:17
 end_of_record

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.2.12-alpha.49",
+  "version": "2.2.12-alpha.50",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.2.12-alpha.49",
-    "@budibase/pro": "2.2.12-alpha.48",
-    "@budibase/string-templates": "2.2.12-alpha.49",
-    "@budibase/types": "2.2.12-alpha.49",
+    "@budibase/backend-core": "2.2.12-alpha.50",
+    "@budibase/pro": "2.2.12-alpha.49",
+    "@budibase/string-templates": "2.2.12-alpha.50",
+    "@budibase/types": "2.2.12-alpha.50",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -97,5 +97,5 @@
     "typescript": "4.7.3",
     "update-dotenv": "1.1.1"
   },
-  "gitHead": "df1d853fe0990446eec4a4e08128257d35cc438f"
+  "gitHead": "b6ca342ed964e28404648db0dc2ff63b82347a2a"
 }

package/src/api/controllers/global/users.ts

@@ -210,6 +210,19 @@ export const inviteMultiple = async (ctx: any) => {
   ctx.body = await sdk.users.invite(request)
 }
 
+export const checkInvite = async (ctx: any) => {
+  const { code } = ctx.params
+  let invite
+  try {
+    invite = await checkInviteCode(code, false)
+  } catch (e) {
+    ctx.throw(400, "There was a problem with the invite")
+  }
+  ctx.body = {
+    email: invite.email,
+  }
+}
+
 export const inviteAccept = async (ctx: any) => {
   const { inviteCode, password, firstName, lastName } = ctx.request.body
   try {

package/src/api/index.ts

@@ -62,6 +62,10 @@ const PUBLIC_ENDPOINTS = [
     route: "/api/system/restored",
     method: "POST",
   },
+  {
+    route: "/api/global/users/invite",
+    method: "GET",
+  },
 ]
 
 const NO_TENANCY_ENDPOINTS = [

package/src/api/routes/global/users.ts

@@ -38,6 +38,13 @@ function buildInviteMultipleValidation() {
   ))
 }
 
+function buildInviteLookupValidation() {
+  // prettier-ignore
+  return auth.joiValidator.params(Joi.object({
+    code: Joi.string().required()
+  }).unknown(true))
+}
+
 const createUserAdminOnly = (ctx: any, next: any) => {
   if (!ctx.request.body._id) {
     return auth.adminOnly(ctx, next)
@@ -51,6 +58,8 @@ function buildInviteAcceptValidation() {
   return auth.joiValidator.body(Joi.object({
     inviteCode: Joi.string().required(),
     password: Joi.string().required(),
+    firstName: Joi.string().required(),
+    lastName: Joi.string().optional(),
   }).required().unknown(true))
 }
 
@@ -91,6 +100,11 @@ router
   )
 
   // non-global endpoints
+  .get(
+    "/api/global/users/invite/:code",
+    buildInviteLookupValidation(),
+    controller.checkInvite
+  )
   .post(
     "/api/global/users/invite/accept",
     buildInviteAcceptValidation(),

package/src/tests/api/users.ts

@@ -48,6 +48,7 @@ export class UserAPI extends TestAPI {
       .send({
         password: "newpassword",
         inviteCode: code,
+        firstName: "Ted",
       })
       .expect("Content-Type", /json/)
       .expect(200)