@nymphjs/tilmeld 1.0.0-beta.138 → 1.0.0-beta.139

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 (26) hide show
  1. package/CHANGELOG.md +17 -0
  2. package/dist/Group.js +4 -4
  3. package/dist/Group.js.map +1 -1
  4. package/dist/Tilmeld.d.ts +16 -2
  5. package/dist/Tilmeld.js +22 -9
  6. package/dist/Tilmeld.js.map +1 -1
  7. package/dist/User.d.ts +2 -2
  8. package/dist/User.js +106 -31
  9. package/dist/User.js.map +1 -1
  10. package/dist/User.testArtifacts.js +9 -9
  11. package/dist/User.testArtifacts.js.map +1 -1
  12. package/dist/conf/defaults.js +11 -3
  13. package/dist/conf/defaults.js.map +1 -1
  14. package/dist/conf/index.d.ts +14 -6
  15. package/dist/conf/index.js.map +1 -1
  16. package/dist/testArtifacts.d.ts +1 -0
  17. package/dist/testArtifacts.js +32 -3
  18. package/dist/testArtifacts.js.map +1 -1
  19. package/package.json +5 -5
  20. package/src/Group.ts +4 -4
  21. package/src/Tilmeld.ts +41 -11
  22. package/src/User.testArtifacts.ts +9 -9
  23. package/src/User.ts +137 -39
  24. package/src/conf/defaults.ts +21 -3
  25. package/src/conf/index.ts +24 -7
  26. package/src/testArtifacts.ts +51 -3
package/dist/User.testArtifacts.js CHANGED
@@ -22,7 +22,7 @@ export function UserTest(nymph, tilmeld, describe, it) {
22
22
  newUser.nameFirst = 'New';
23
23
  newUser.nameLast = 'User';
24
24
  newUser.name = 'New User';
25
- newUser.$password('password');
25
+ await newUser.$password('password');
26
26
  return newUser;
27
27
  }
28
28
  it('new user passes validation', async () => {
@@ -55,7 +55,7 @@ export function UserTest(nymph, tilmeld, describe, it) {
55
55
  newUserA.nameFirst = 'New';
56
56
  newUserA.nameLast = 'User';
57
57
  newUserA.name = 'New User';
58
- newUserA.$password('password');
58
+ await newUserA.$password('password');
59
59
  await newUserA.$saveSkipAC();
60
60
  const newUserB = await NoUsernameCheckUser.factory();
61
61
  newUserB.username = 'new-user';
@@ -63,7 +63,7 @@ export function UserTest(nymph, tilmeld, describe, it) {
63
63
  newUserB.nameFirst = 'New';
64
64
  newUserB.nameLast = 'User';
65
65
  newUserB.name = 'New User';
66
- newUserB.$password('password');
66
+ await newUserB.$password('password');
67
67
  try {
68
68
  await newUserB.$saveSkipAC();
69
69
  throw new Error("Shouldn't get here because of unique constraint.");
@@ -90,7 +90,7 @@ export function UserTest(nymph, tilmeld, describe, it) {
90
90
  newUserA.nameFirst = 'New';
91
91
  newUserA.nameLast = 'User';
92
92
  newUserA.name = 'New User';
93
- newUserA.$password('password');
93
+ await newUserA.$password('password');
94
94
  await newUserA.$saveSkipAC();
95
95
  const newUserB = await NoEmailCheckUser.factory();
96
96
  newUserB.username = 'new-user-b';
@@ -98,7 +98,7 @@ export function UserTest(nymph, tilmeld, describe, it) {
98
98
  newUserB.nameFirst = 'New';
99
99
  newUserB.nameLast = 'User';
100
100
  newUserB.name = 'New User';
101
- newUserB.$password('password');
101
+ await newUserB.$password('password');
102
102
  try {
103
103
  await newUserB.$saveSkipAC();
104
104
  throw new Error("Shouldn't get here because of unique constraint.");
@@ -116,7 +116,7 @@ export function UserTest(nymph, tilmeld, describe, it) {
116
116
  domainAdmin.nameFirst = 'Admin';
117
117
  domainAdmin.nameLast = 'User';
118
118
  domainAdmin.name = 'Admin User';
119
- domainAdmin.$password('password');
119
+ await domainAdmin.$password('password');
120
120
  domainAdmin.$grant('tilmeld/domain/example.com/admin');
121
121
  await domainAdmin.$saveSkipAC();
122
122
  // Log in the domain admin.
@@ -127,7 +127,7 @@ export function UserTest(nymph, tilmeld, describe, it) {
127
127
  domainUser.nameFirst = 'New';
128
128
  domainUser.nameLast = 'User';
129
129
  domainUser.name = 'New User';
130
- domainUser.$password('password');
130
+ await domainUser.$password('password');
131
131
  await domainUser.$save();
132
132
  tilmeld.clearSession();
133
133
  for (const user of [domainAdmin, domainUser]) {
@@ -143,7 +143,7 @@ export function UserTest(nymph, tilmeld, describe, it) {
143
143
  domainAdmin.nameFirst = 'Admin';
144
144
  domainAdmin.nameLast = 'User';
145
145
  domainAdmin.name = 'Admin User';
146
- domainAdmin.$password('password');
146
+ await domainAdmin.$password('password');
147
147
  domainAdmin.$grant('tilmeld/domain/example.com/admin');
148
148
  await domainAdmin.$saveSkipAC();
149
149
  // Log in the domain admin.
@@ -155,7 +155,7 @@ export function UserTest(nymph, tilmeld, describe, it) {
155
155
  domainUser.nameFirst = 'New';
156
156
  domainUser.nameLast = 'User';
157
157
  domainUser.name = 'New User';
158
- domainUser.$password('password');
158
+ await domainUser.$password('password');
159
159
  try {
160
160
  await domainUser.$save();
161
161
  throw new Error("Shouldn't get here because of access control.");
package/dist/User.testArtifacts.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"User.testArtifacts.js","sourceRoot":"","sources":["../src/User.testArtifacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAGzE,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,UAAU,QAAQ,CACtB,KAAY,EACZ,OAAgB,EAChB,QAAgD,EAChD,EAA0C;IAE1C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAE5B,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;QACpB,SAAS,CAAC,KAAK,IAAI,EAAE;YACnB,2BAA2B;YAC3B,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;gBACnC,MAAM,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YACxC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,SAAS;YACX,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,KAAK,UAAU,WAAW;YACxB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YAErC,OAAO,CAAC,QAAQ,GAAG,UAAU,CAAC;YAC9B,OAAO,CAAC,KAAK,GAAG,mBAAmB,CAAC;YACpC,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC;YAC1B,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAC;YAC1B,OAAO,CAAC,IAAI,GAAG,UAAU,CAAC;YAC1B,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAE9B,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,EAAE,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;YAC1C,MAAM,SAAS,GAAG,MAAM,WAAW,EAAE,CAAC;YAEtC,MAAM,CAAC,GAAG,EAAE;gBACV,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAa,EAAE,SAAS,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;YAC1C,MAAM,WAAW,GAAG,MAAM,WAAW,EAAE,CAAC;YAExC,mCAAmC;YACnC,WAAW,CAAC,OAAO,GAAG,0BAA0B,CAAC;YAEjD,MAAM,CAAC,GAAG,EAAE;gBACV,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAa,EAAE,WAAW,CAAC,CAAC;YACvE,CAAC,CAAC,CAAC,OAAO,CAAC,yCAAyC,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;YACjD,OAAO,CAAC,MAAM,CAAC,eAAe,GAAG,KAAK,CAAC;YACvC,MAAM,mBAAoB,SAAQ,IAAI;gBAC7B,KAAK,CAAC,cAAc;oBACzB,OAAO;wBACL,MAAM,EAAE,IAAI;wBACZ,OAAO,EAAE,kBAAkB;qBAC5B,CAAC;gBACJ,CAAC;aACF;YAED,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,OAAO,EAAE,CAAC;YAErD,QAAQ,CAAC,QAAQ,GAAG,UAAU,CAAC;YAC/B,QAAQ,CAAC,KAAK,GAAG,oBAAoB,CAAC;YACtC,QAAQ,CAAC,SAAS,GAAG,KAAK,CAAC;YAC3B,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC;YAC3B,QAAQ,CAAC,IAAI,GAAG,UAAU,CAAC;YAC3B,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAE/B,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;YAE7B,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,OAAO,EAAE,CAAC;YAErD,QAAQ,CAAC,QAAQ,GAAG,UAAU,CAAC;YAC/B,QAAQ,CAAC,KAAK,GAAG,oBAAoB,CAAC;YACtC,QAAQ,CAAC,SAAS,GAAG,KAAK,CAAC;YAC3B,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC;YAC3B,QAAQ,CAAC,IAAI,GAAG,UAAU,CAAC;YAC3B,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAE/B,IAAI,CAAC;gBACH,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;gBAE7B,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;YACtE,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,2BAA2B,CAAC,CAAC;YACxD,CAAC;YAED,MAAM,QAAQ,CAAC,aAAa,EAAE,CAAC;YAE/B,OAAO,CAAC,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;YAC9C,OAAO,CAAC,MAAM,CAAC,eAAe,GAAG,KAAK,CAAC;YACvC,MAAM,gBAAiB,SAAQ,IAAI;gBAC1B,KAAK,CAAC,WAAW;oBACtB,OAAO;wBACL,MAAM,EAAE,IAAI;wBACZ,OAAO,EAAE,kBAAkB;qBAC5B,CAAC;gBACJ,CAAC;aACF;YAED,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAElD,QAAQ,CAAC,QAAQ,GAAG,YAAY,CAAC;YACjC,QAAQ,CAAC,KAAK,GAAG,mBAAmB,CAAC;YACrC,QAAQ,CAAC,SAAS,GAAG,KAAK,CAAC;YAC3B,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC;YAC3B,QAAQ,CAAC,IAAI,GAAG,UAAU,CAAC;YAC3B,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAE/B,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;YAE7B,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,CAAC;YAElD,QAAQ,CAAC,QAAQ,GAAG,YAAY,CAAC;YACjC,QAAQ,CAAC,KAAK,GAAG,mBAAmB,CAAC;YACrC,QAAQ,CAAC,SAAS,GAAG,KAAK,CAAC;YAC3B,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC;YAC3B,QAAQ,CAAC,IAAI,GAAG,UAAU,CAAC;YAC3B,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAE/B,IAAI,CAAC;gBACH,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;gBAE7B,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;YACtE,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,2BAA2B,CAAC,CAAC;YACxD,CAAC;YAED,MAAM,QAAQ,CAAC,aAAa,EAAE,CAAC;YAE/B,OAAO,CAAC,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;YACpC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YAEzC,WAAW,CAAC,QAAQ,GAAG,OAAO,CAAC;YAC/B,WAAW,CAAC,KAAK,GAAG,iBAAiB,CAAC;YACtC,WAAW,CAAC,SAAS,GAAG,OAAO,CAAC;YAChC,WAAW,CAAC,QAAQ,GAAG,MAAM,CAAC;YAC9B,WAAW,CAAC,IAAI,GAAG,YAAY,CAAC;YAChC,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAClC,WAAW,CAAC,MAAM,CAAC,kCAAkC,CAAC,CAAC;YAEvD,MAAM,WAAW,CAAC,WAAW,EAAE,CAAC;YAEhC,2BAA2B;YAC3B,MAAM,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YAEvC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YAExC,UAAU,CAAC,QAAQ,GAAG,sBAAsB,CAAC;YAC7C,UAAU,CAAC,KAAK,GAAG,mBAAmB,CAAC;YACvC,UAAU,CAAC,SAAS,GAAG,KAAK,CAAC;YAC7B,UAAU,CAAC,QAAQ,GAAG,MAAM,CAAC;YAC7B,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC;YAC7B,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAEjC,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;YAEzB,OAAO,CAAC,YAAY,EAAE,CAAC;YAEvB,KAAK,MAAM,IAAI,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,CAAC;gBAC7C,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;oBACtB,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC7B,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;YAChE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YAEzC,WAAW,CAAC,QAAQ,GAAG,OAAO,CAAC;YAC/B,WAAW,CAAC,KAAK,GAAG,iBAAiB,CAAC;YACtC,WAAW,CAAC,SAAS,GAAG,OAAO,CAAC;YAChC,WAAW,CAAC,QAAQ,GAAG,MAAM,CAAC;YAC9B,WAAW,CAAC,IAAI,GAAG,YAAY,CAAC;YAChC,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAClC,WAAW,CAAC,MAAM,CAAC,kCAAkC,CAAC,CAAC;YAEvD,MAAM,WAAW,CAAC,WAAW,EAAE,CAAC;YAEhC,2BAA2B;YAC3B,MAAM,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YAEvC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YAExC,yBAAyB;YACzB,UAAU,CAAC,QAAQ,GAAG,sBAAsB,CAAC;YAC7C,UAAU,CAAC,KAAK,GAAG,mBAAmB,CAAC;YACvC,UAAU,CAAC,SAAS,GAAG,KAAK,CAAC;YAC7B,UAAU,CAAC,QAAQ,GAAG,MAAM,CAAC;YAC7B,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC;YAC7B,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAEjC,IAAI,CAAC;gBACH,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;gBAEzB,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;YACnE,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;YAC/C,CAAC;YAED,OAAO,CAAC,YAAY,EAAE,CAAC;YAEvB,KAAK,MAAM,IAAI,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,CAAC;gBAC7C,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;oBACtB,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC7B,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"User.testArtifacts.js","sourceRoot":"","sources":["../src/User.testArtifacts.ts"],"names":[],"mappings":"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"}
package/dist/conf/defaults.js CHANGED
@@ -52,18 +52,26 @@ export default {
52
52
  jwtExpire: 60 * 60 * 24 * 7 * 24, // 24 weeks(ish) (6 months)
53
53
  jwtSwitchExpire: 60 * 60 * 6, // 6 hours
54
54
  jwtRenew: 60 * 60 * 24 * 7 * 12, // 12 weeks(ish) (3 months)
55
- jwtBuilder: (config, user, switchToken) => {
55
+ jwtBuilder: (config, user, switchToken, switchForUser) => {
56
56
  const secret = config.jwtSecret;
57
57
  if (secret === '') {
58
58
  throw new Error('JWT secret is not configured.');
59
59
  }
60
+ if (switchToken && (!switchForUser || switchForUser.guid == null)) {
61
+ throw new Error("Issuing a switch token requires providing the user it's for.");
62
+ }
60
63
  return jwt.sign({
61
64
  iss: config.appUrl,
65
+ sub: switchForUser ? switchForUser.guid : user.guid,
62
66
  nbf: Math.floor(Date.now() / 1000),
63
67
  exp: Math.floor(Date.now() / 1000) +
64
68
  (switchToken ? config.jwtSwitchExpire : config.jwtExpire),
69
+ // TODO: remove this guid claim in favor of sub claim
70
+ // this needs to be done long enough after Nov 1 2026, when sub added
71
+ // also don't forget to change how switchForUser guid is stored.
65
72
  guid: user.guid,
66
73
  xsrfToken: 'TILMELDXSRF-' + nanoid(),
74
+ ...(switchToken ? { switch: true } : {}),
67
75
  }, secret);
68
76
  },
69
77
  jwtExtract: (config, token, xsrfToken) => {
@@ -79,7 +87,7 @@ export default {
79
87
  if (typeof payload === 'string') {
80
88
  return null;
81
89
  }
82
- const { guid, xsrfToken: jwtXsrfToken, exp, nbf } = payload;
90
+ const { sub, guid, xsrfToken: jwtXsrfToken, switch: switchBool, exp, nbf, } = payload;
83
91
  if (xsrfToken != null && xsrfToken !== jwtXsrfToken) {
84
92
  return null;
85
93
  }
@@ -94,7 +102,7 @@ export default {
94
102
  return null;
95
103
  }
96
104
  const expire = new Date(exp * 1000);
97
- return { guid, issued, expire };
105
+ return { sub, guid, issued, expire, switch: switchBool };
98
106
  }
99
107
  catch (e) {
100
108
  return null;
package/dist/conf/defaults.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../src/conf/defaults.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../src/conf/defaults.ts"],"names":[],"mappings":"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"}
package/dist/conf/index.d.ts CHANGED
@@ -162,12 +162,18 @@ export interface Config {
162
162
  */
163
163
  pwRecoveryTimeLimit: string;
164
164
  /**
165
- * Method used to store passwords. Salt is more secure if the database is
166
- * compromised. Plain: store the password in plaintext. Digest: store the
167
- * password's digest (hash). Salt: store the password's digest using a
168
- * complex, unique salt.
165
+ * Method used to store passwords. Salt is the most secure if the database is
166
+ * compromised.
169
167
  *
170
- * Digests are SHA-256, so a salt probably isn't necessary, but who knows.
168
+ * - Plain: Store the password in plain text. A very bad idea.
169
+ * - Digest: Store the password's digest (hash) using SHA-256. The minimum
170
+ * level of security, but not enough for modern apps.
171
+ * - Salt: Store the password's digest with a complex, unique salt using
172
+ * the scrypt algorithm. Modern, secure password storage.
173
+ *
174
+ * Really the only reason to use anything other than "salt" is if you need
175
+ * logins to be so incredibly fast you can't even perceive a delay. So, not in
176
+ * a web app.
171
177
  *
172
178
  * Options are: "plain", "digest", "salt"
173
179
  */
@@ -263,7 +269,7 @@ export interface Config {
263
269
  /**
264
270
  * Function to build the JWT for user sessions.
265
271
  */
266
- jwtBuilder: (config: Config, user: User, switchToken?: boolean) => string;
272
+ jwtBuilder: (config: Config, user: User, switchToken?: boolean, switchForUser?: User) => string;
267
273
  /**
268
274
  * Function to verify that a JWT was signed with the secret key, validate its
269
275
  * data, validate the XSRF token, and extract the GUID and dates.
@@ -274,9 +280,11 @@ export interface Config {
274
280
  * and expire date otherwise.
275
281
  */
276
282
  jwtExtract: (config: Config, token: string, xsrfToken?: string) => {
283
+ sub: string;
277
284
  guid: string;
278
285
  issued: Date;
279
286
  expire: Date;
287
+ switch?: true;
280
288
  } | null;
281
289
  /**
282
290
  * The absolute path to the email template directory. Used by the default
package/dist/conf/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/conf/index.ts"],"names":[],"mappings":"AA4WA,OAAO,QAAQ,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,QAAQ,IAAI,cAAc,EAAE,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/conf/index.ts"],"names":[],"mappings":"AA6XA,OAAO,QAAQ,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,QAAQ,IAAI,cAAc,EAAE,CAAC"}
package/dist/testArtifacts.d.ts CHANGED
@@ -2,6 +2,7 @@ import { Entity, Nymph } from '@nymphjs/nymph';
2
2
  import type { AccessControlData } from './Tilmeld.types.js';
3
3
  export interface TestModelData extends AccessControlData {
4
4
  name?: string;
5
+ another?: TestModel;
5
6
  }
6
7
  export interface TestModel extends TestModelData {
7
8
  }
package/dist/testArtifacts.js CHANGED
@@ -157,7 +157,7 @@ export function TilmeldTest(nymphBase, describe, it) {
157
157
  admin.nameFirst = 'Admin';
158
158
  admin.nameLast = 'User';
159
159
  admin.name = 'Admin User';
160
- admin.$password('password');
160
+ await admin.$password('password');
161
161
  admin.$grant('system/admin');
162
162
  await admin.$saveSkipAC();
163
163
  }
@@ -173,7 +173,7 @@ export function TilmeldTest(nymphBase, describe, it) {
173
173
  bob.nameFirst = 'Bob';
174
174
  bob.nameLast = 'User';
175
175
  bob.name = 'Bob User';
176
- bob.$password('password');
176
+ await bob.$password('password');
177
177
  bob.$addGroup(abgroup);
178
178
  await bob.$saveSkipAC();
179
179
  }
@@ -183,7 +183,7 @@ export function TilmeldTest(nymphBase, describe, it) {
183
183
  alice.nameFirst = 'Alice';
184
184
  alice.nameLast = 'User';
185
185
  alice.name = 'Alice User';
186
- alice.$password('password');
186
+ await alice.$password('password');
187
187
  alice.$addGroup(abgroup);
188
188
  await alice.$saveSkipAC();
189
189
  }
@@ -835,6 +835,35 @@ export function TilmeldTest(nymphBase, describe, it) {
835
835
  const verifyEntityAlice = await nymph.getEntity({ class: TestModel }, { type: '&', guid: bobsEntity.guid || '' });
836
836
  expect(verifyEntityAlice).toBeNull();
837
837
  });
838
+ it("alice can't find an entity by qref using an entity she doesn't have permission for", async () => {
839
+ const { bob, alice } = await makeUsers();
840
+ await tilmeld.fillSession(bob);
841
+ const bobsEntity = await TestModel.factory();
842
+ bobsEntity.name = "Bob's Entity";
843
+ await bobsEntity.$save();
844
+ expect(bobsEntity.guid).not.toBeNull();
845
+ expect(bob.$is(bobsEntity.user)).toEqual(true);
846
+ const testEntityBob = await nymph.getEntity({ class: TestModel }, { type: '&', guid: bobsEntity.guid || '' });
847
+ expect(testEntityBob).not.toBeNull();
848
+ expect(testEntityBob?.guid).toEqual(bobsEntity.guid);
849
+ tilmeld.clearSession();
850
+ await tilmeld.fillSession(alice);
851
+ const alicesEntity = await TestModel.factory();
852
+ alicesEntity.name = "Alice's Entity";
853
+ await alicesEntity.$save();
854
+ expect(alicesEntity.guid).not.toBeNull();
855
+ expect(alice.$is(alicesEntity.user)).toEqual(true);
856
+ alicesEntity.another = bobsEntity;
857
+ await alicesEntity.$save();
858
+ const testEntityAlice = await nymph.getEntity({ class: TestModel }, {
859
+ type: '&',
860
+ qref: [
861
+ 'another',
862
+ [{ class: TestModel }, { type: '&', guid: bobsEntity.guid || '' }],
863
+ ],
864
+ });
865
+ expect(testEntityAlice).toBeNull();
866
+ });
838
867
  it('a clear session can delete an entity everyone has full permission for', async () => {
839
868
  const { bob } = await makeUsers();
840
869
  await tilmeld.fillSession(bob);