@constructive-io/send-email-link-fn 1.1.0 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/esm/index.js +28 -23
  2. package/index.js +28 -23
  3. package/package.json +2 -2
package/esm/index.js CHANGED
@@ -12,34 +12,38 @@ const logger = createLogger('send-email-link');
12
12
  const app = createJobApp();
13
13
  const GetUser = gql `
14
14
  query GetUser($userId: UUID!) {
15
- user(id: $userId) {
16
- username
17
- displayName
18
- profilePicture
15
+ users(condition: { id: $userId }, first: 1) {
16
+ nodes {
17
+ username
18
+ displayName
19
+ profilePicture
20
+ }
19
21
  }
20
22
  }
21
23
  `;
22
24
  const GetDatabaseInfo = gql `
23
25
  query GetDatabaseInfo($databaseId: UUID!) {
24
- database(id: $databaseId) {
25
- sites {
26
- nodes {
27
- domains {
28
- nodes {
29
- subdomain
30
- domain
26
+ databases(condition: { id: $databaseId }, first: 1) {
27
+ nodes {
28
+ sites {
29
+ nodes {
30
+ domains {
31
+ nodes {
32
+ subdomain
33
+ domain
34
+ }
31
35
  }
32
- }
33
- logo
34
- title
35
- siteThemes {
36
- nodes {
37
- theme
36
+ logo
37
+ title
38
+ siteThemes {
39
+ nodes {
40
+ theme
41
+ }
38
42
  }
39
- }
40
- siteModules(condition: { name: "legal_terms_module" }) {
41
- nodes {
42
- data
43
+ siteModules(condition: { name: "legal_terms_module" }) {
44
+ nodes {
45
+ data
46
+ }
43
47
  }
44
48
  }
45
49
  }
@@ -118,7 +122,8 @@ export const sendEmailLink = async (params, context) => {
118
122
  const databaseInfo = await meta.request(GetDatabaseInfo, {
119
123
  databaseId
120
124
  });
121
- const site = databaseInfo?.database?.sites?.nodes?.[0];
125
+ const database = databaseInfo?.databases?.nodes?.[0];
126
+ const site = database?.sites?.nodes?.[0];
122
127
  if (!site) {
123
128
  throw new Error('Site not found for database');
124
129
  }
@@ -181,7 +186,7 @@ export const sendEmailLink = async (params, context) => {
181
186
  const inviter = await client.request(GetUser, {
182
187
  userId: params.sender_id
183
188
  });
184
- inviterName = inviter?.user?.displayName;
189
+ inviterName = inviter?.users?.nodes?.[0]?.displayName;
185
190
  if (inviterName) {
186
191
  subject = `${inviterName} invited you to ${nick}!`;
187
192
  subMessage = `You've been invited to ${nick}`;
package/index.js CHANGED
@@ -18,34 +18,38 @@ const logger = (0, logger_1.createLogger)('send-email-link');
18
18
  const app = (0, knative_job_fn_1.createJobApp)();
19
19
  const GetUser = (0, graphql_tag_1.default) `
20
20
  query GetUser($userId: UUID!) {
21
- user(id: $userId) {
22
- username
23
- displayName
24
- profilePicture
21
+ users(condition: { id: $userId }, first: 1) {
22
+ nodes {
23
+ username
24
+ displayName
25
+ profilePicture
26
+ }
25
27
  }
26
28
  }
27
29
  `;
28
30
  const GetDatabaseInfo = (0, graphql_tag_1.default) `
29
31
  query GetDatabaseInfo($databaseId: UUID!) {
30
- database(id: $databaseId) {
31
- sites {
32
- nodes {
33
- domains {
34
- nodes {
35
- subdomain
36
- domain
32
+ databases(condition: { id: $databaseId }, first: 1) {
33
+ nodes {
34
+ sites {
35
+ nodes {
36
+ domains {
37
+ nodes {
38
+ subdomain
39
+ domain
40
+ }
37
41
  }
38
- }
39
- logo
40
- title
41
- siteThemes {
42
- nodes {
43
- theme
42
+ logo
43
+ title
44
+ siteThemes {
45
+ nodes {
46
+ theme
47
+ }
44
48
  }
45
- }
46
- siteModules(condition: { name: "legal_terms_module" }) {
47
- nodes {
48
- data
49
+ siteModules(condition: { name: "legal_terms_module" }) {
50
+ nodes {
51
+ data
52
+ }
49
53
  }
50
54
  }
51
55
  }
@@ -124,7 +128,8 @@ const sendEmailLink = async (params, context) => {
124
128
  const databaseInfo = await meta.request(GetDatabaseInfo, {
125
129
  databaseId
126
130
  });
127
- const site = databaseInfo?.database?.sites?.nodes?.[0];
131
+ const database = databaseInfo?.databases?.nodes?.[0];
132
+ const site = database?.sites?.nodes?.[0];
128
133
  if (!site) {
129
134
  throw new Error('Site not found for database');
130
135
  }
@@ -187,7 +192,7 @@ const sendEmailLink = async (params, context) => {
187
192
  const inviter = await client.request(GetUser, {
188
193
  userId: params.sender_id
189
194
  });
190
- inviterName = inviter?.user?.displayName;
195
+ inviterName = inviter?.users?.nodes?.[0]?.displayName;
191
196
  if (inviterName) {
192
197
  subject = `${inviterName} invited you to ${nick}!`;
193
198
  subMessage = `You've been invited to ${nick}`;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@constructive-io/send-email-link-fn",
3
- "version": "1.1.0",
3
+ "version": "2.0.0",
4
4
  "description": "Knative function to send email links (invite, password reset, email verification) using Constructive jobs",
5
5
  "author": "Constructive <developers@constructive.io>",
6
6
  "homepage": "https://github.com/constructive-io/constructive",
@@ -43,5 +43,5 @@
43
43
  "graphql-tag": "^2.12.6",
44
44
  "simple-smtp-server": "^0.3.0"
45
45
  },
46
- "gitHead": "048188f6b43ffaa6146e7694b2b0d35d34cb2945"
46
+ "gitHead": "b2daeefe49cdefb3d01ea63cf778fb9b847ab5fe"
47
47
  }