@semapps/auth 1.2.7 → 1.3.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.
- package/dist/mixins/auth.js +0 -4
- package/dist/mixins/auth.js.map +1 -1
- package/dist/services/account.js +0 -5
- package/dist/services/account.js.map +1 -1
- package/dist/services/auth.local.js +0 -6
- package/dist/services/auth.local.js.map +1 -1
- package/dist/services/mail.js +0 -1
- package/dist/services/mail.js.map +1 -1
- package/mixins/auth.ts +0 -4
- package/package.json +6 -6
- package/services/account.ts +0 -5
- package/services/auth.local.ts +0 -6
- package/services/mail.ts +0 -1
package/dist/mixins/auth.js
CHANGED
|
@@ -113,14 +113,12 @@ const AuthMixin = {
|
|
|
113
113
|
const [method, token] = req.headers.authorization?.split(' ') || [];
|
|
114
114
|
if (!token) {
|
|
115
115
|
// No token
|
|
116
|
-
// @ts-expect-error TS(2339): Property 'webId' does not exist on type '{}'.
|
|
117
116
|
ctx.meta.webId = 'anon';
|
|
118
117
|
return Promise.resolve(null);
|
|
119
118
|
}
|
|
120
119
|
if (method === 'Bearer') {
|
|
121
120
|
const payload = await ctx.call('auth.jwt.verifyServerSignedToken', { token });
|
|
122
121
|
if (payload) {
|
|
123
|
-
// @ts-expect-error TS(2339): Property 'tokenPayload' does not exist on type '{}... Remove this comment to see the full error message
|
|
124
122
|
ctx.meta.tokenPayload = payload;
|
|
125
123
|
// @ts-expect-error TS(2339): Property 'webId' does not exist on type '{}'.
|
|
126
124
|
ctx.meta.webId = payload.webId;
|
|
@@ -135,7 +133,6 @@ const AuthMixin = {
|
|
|
135
133
|
return Promise.reject(new E.UnAuthorizedError(E.ERR_INVALID_TOKEN));
|
|
136
134
|
}
|
|
137
135
|
// No valid auth method given.
|
|
138
|
-
// @ts-expect-error TS(2339): Property 'webId' does not exist on type '{}'.
|
|
139
136
|
ctx.meta.webId = 'anon';
|
|
140
137
|
return Promise.resolve(null);
|
|
141
138
|
}
|
|
@@ -156,7 +153,6 @@ const AuthMixin = {
|
|
|
156
153
|
// Validate if the token was signed by server (registered user).
|
|
157
154
|
const serverSignedPayload = await ctx.call('auth.jwt.verifyServerSignedToken', { token });
|
|
158
155
|
if (serverSignedPayload) {
|
|
159
|
-
// @ts-expect-error TS(2339): Property 'tokenPayload' does not exist on type '{}... Remove this comment to see the full error message
|
|
160
156
|
ctx.meta.tokenPayload = serverSignedPayload;
|
|
161
157
|
// @ts-expect-error TS(2339): Property 'webId' does not exist on type '{}'.
|
|
162
158
|
ctx.meta.webId = serverSignedPayload.webId;
|
package/dist/mixins/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../mixins/auth.ts"],"names":[],"mappings":"AAAA,qIAAqI;AACrI,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,MAAM,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,kBAAkB,MAAM,wBAAwB,CAAC;AACxD,OAAO,cAAc,MAAM,oBAAoB,CAAC;AAEhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDG;AACH,MAAM,SAAS,GAAG;IAChB,QAAQ,EAAE;QACR,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,IAAI;QACb,gBAAgB,EAAE,SAAS;QAC3B,mBAAmB,EAAE,IAAI;QACzB,iBAAiB,EAAE,EAAE;QACrB,iBAAiB,EAAE,CAAC;QACpB,iBAAiB,EAAE,CAAC;QACpB,cAAc,EAAE,EAAE;QAClB,gBAAgB,EAAE,EAAE;QACpB,eAAe,EAAE,UAAU;QAC3B,WAAW,EAAE,KAAK;KACnB;IACD,YAAY,EAAE,CAAC,KAAK,CAAC;IACrB,KAAK,CAAC,OAAO;QACX,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,eAAe,EAAE,WAAW,EAAE,GACtG,IAAI,CAAC,QAAQ,CAAC;QAEhB,qIAAqI;QACrI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YACxB,MAAM,EAAE,CAAC,cAAc,CAAC;YACxB,QAAQ,EAAE,EAAE,OAAO,EAAE;SACtB,CAAC,CAAC;QAEH,qIAAqI;QACrI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YACxB,MAAM,EAAE,CAAC,kBAAkB,CAAC;YAC5B,QAAQ,EAAE,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE;YACrE,OAAO,EAAE,IAAI,kBAAkB,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;SACnF,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAE9F,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,IAAS,EAAE,IAAS,EAAE,EAAE;YACnD,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,IAAS,EAAE,IAAS,EAAE,EAAE;YACrD,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAEzC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAElD,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE9D,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IACD,OAAO,EAAE;QACP,YAAY,EAAE;YACZ,6EAA6E;YAC7E,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBACvC,sDAAsD;gBACtD,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBAEpE,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,WAAW;oBACX,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../mixins/auth.ts"],"names":[],"mappings":"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"}
|
package/dist/services/account.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
// @ts-expect-error TS(7016): Could not find a declaration file for module 'bcry... Remove this comment to see the full error message
|
|
2
2
|
import bcrypt from 'bcrypt';
|
|
3
|
-
// @ts-expect-error TS(7016): Could not find a declaration file for module 'spea... Remove this comment to see the full error message
|
|
4
3
|
import createSlug from 'speakingurl';
|
|
5
4
|
import DbService from 'moleculer-db';
|
|
6
5
|
import { TripleStoreAdapter } from '@semapps/triplestore';
|
|
@@ -42,7 +41,6 @@ const AuthAccountSchema = {
|
|
|
42
41
|
}
|
|
43
42
|
// FORMAT AND VERIFY USERNAME
|
|
44
43
|
if (username) {
|
|
45
|
-
// @ts-expect-error TS(2339): Property 'isSystemCall' does not exist on type '{}... Remove this comment to see the full error message
|
|
46
44
|
if (!ctx.meta.isSystemCall) {
|
|
47
45
|
const { isValid, error } = await this.isValidUsername(ctx, username);
|
|
48
46
|
if (!isValid)
|
|
@@ -189,7 +187,6 @@ const AuthAccountSchema = {
|
|
|
189
187
|
},
|
|
190
188
|
findDatasetByWebId: {
|
|
191
189
|
async handler(ctx) {
|
|
192
|
-
// @ts-expect-error TS(2339): Property 'webId' does not exist on type '{}'.
|
|
193
190
|
const webId = ctx.params.webId || ctx.meta.webId;
|
|
194
191
|
const account = await ctx.call('auth.account.findByWebId', { webId });
|
|
195
192
|
return account?.username;
|
|
@@ -197,7 +194,6 @@ const AuthAccountSchema = {
|
|
|
197
194
|
},
|
|
198
195
|
findSettingsByWebId: {
|
|
199
196
|
async handler(ctx) {
|
|
200
|
-
// @ts-expect-error TS(2339): Property 'webId' does not exist on type '{}'.
|
|
201
197
|
const { webId } = ctx.meta;
|
|
202
198
|
const account = await ctx.call('auth.account.findByWebId', { webId });
|
|
203
199
|
return {
|
|
@@ -209,7 +205,6 @@ const AuthAccountSchema = {
|
|
|
209
205
|
updateAccountSettings: {
|
|
210
206
|
async handler(ctx) {
|
|
211
207
|
const { currentPassword, email, newPassword } = ctx.params;
|
|
212
|
-
// @ts-expect-error TS(2339): Property 'webId' does not exist on type '{}'.
|
|
213
208
|
const { webId } = ctx.meta;
|
|
214
209
|
const account = await ctx.call('auth.account.findByWebId', { webId });
|
|
215
210
|
const passwordMatch = await this.comparePassword(currentPassword, account.hashedPassword);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.js","sourceRoot":"","sources":["../../services/account.ts"],"names":[],"mappings":"AAAA,qIAAqI;AACrI,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,qIAAqI;AACrI,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,MAAM,MAAM,QAAQ,CAAC;AAG5B,yDAAyD;AACzD,MAAM,WAAW,GAAG,4BAA4B,CAAC;AAEjD,MAAM,iBAAiB,GAAG;IACxB,IAAI,EAAE,cAAuB;IAC7B,MAAM,EAAE,CAAC,SAAS,CAAC;IACnB,OAAO,EAAE,IAAI,kBAAkB,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;IAC7E,QAAQ,EAAE;QACR,OAAO,EAAE,KAAK;QACd,iBAAiB,EAAE,CAAC,OAAO,CAAC;QAC5B,iBAAiB,EAAE,CAAC;QACpB,iBAAiB,EAAE,CAAC;KACrB;IACD,YAAY,EAAE,CAAC,aAAa,CAAC;IAC7B,OAAO,EAAE;QACP,MAAM,EAAE;YACN,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBAErE,6BAA6B;gBAE7B,IAAI,QAAQ,EAAE,CAAC;oBACb,IAAI,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;wBACtD,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;oBACxC,CAAC;oBAED,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBAC/C,CAAC;gBAED,0BAA0B;gBAE1B,IAAI,KAAK,EAAE,CAAC;oBACV,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;oBAE5B,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;oBAC1E,IAAI,WAAW,EAAE,CAAC;wBAChB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;oBAC1C,CAAC;oBAED,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;wBAC7B,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;oBACnC,CAAC;gBACH,CAAC;gBAED,6BAA6B;gBAE7B,IAAI,QAAQ,EAAE,CAAC;oBACb,qIAAqI;oBACrI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;wBAC3B,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;wBACrE,IAAI,CAAC,OAAO;4BAAE,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;oBACvC,CAAC;gBACH,CAAC;qBAAM,IAAI,KAAK,EAAE,CAAC;oBACjB,sFAAsF;oBACtF,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;oBAEzD,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;oBAEnE,IAAI,CAAC,OAAO,EAAE,CAAC;wBACb,IAAI,KAAK,KAAK,kBAAkB,IAAI,KAAK,KAAK,oBAAoB,EAAE,CAAC;4BACnE,kEAAkE;4BAClE,QAAQ,GAAG,MAAM,CAAC;wBACpB,CAAC;wBAED,gDAAgD;wBAChD,IAAI,CAAC,GAAG,CAAC,CAAC;wBACV,GAAG,CAAC;4BACF,QAAQ,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC;4BAC7C,CAAC,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;wBAC5D,CAAC,QAAQ,CAAC,OAAO,EAAE;oBACrB,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;gBAC9E,CAAC;gBAED,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;oBAC7B,GAAG,IAAI;oBACP,IAAI;oBACJ,QAAQ;oBACR,KAAK;oBACL,cAAc,EAAE,QAAQ;oBACxB,KAAK;iBACN,CAAC,CAAC;YACL,CAAC;SACF;QAED,WAAW,EAAE;YACX,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBAEzC,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;oBAC7B,KAAK,EAAE,UAAU;oBACjB,KAAK;iBACN,CAAC,CAAC;YACL,CAAC;SACF;QAED,MAAM,EAAE;YACN,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBAE1C,sDAAsD;gBACtD,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;gBAE1E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBAElD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACxB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC;oBACvF,IAAI,aAAa,EAAE,CAAC;wBAClB,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;oBACrB,CAAC;oBACD,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;gBACvC,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;gBACvC,CAAC;YACH,CAAC;SACF;QAED,cAAc,EAAE;YACd,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBAChC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;gBAChE,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;YAC7B,CAAC;SACF;QAED,WAAW,EAAE;YACX,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBAC7B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC7D,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;YAC7B,CAAC;SACF;QAED,IAAI,EAAE;YACJ,gEAAgE;YAChE,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,uBAAuB;gBACvB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;gBACnD,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAC/D,CAAC;SACF;QAED,cAAc,EAAE;YACd,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBAChC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;gBAChE,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAClD,CAAC;SACF;QAED,WAAW,EAAE;YACX,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBAC7B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC7D,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAClD,CAAC;SACF;QAED,WAAW,EAAE;YACX,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBAC7B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC7D,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAClD,CAAC;SACF;QAED,WAAW,EAAE;YACX,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBACvC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBACzD,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBAEtE,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;oBAC7B,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC;oBACrB,cAAc;iBACf,CAAC,CAAC;YACL,CAAC;SACF;QAED,cAAc,EAAE;YACd,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBAC9C,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBACzD,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBAEtE,IAAI,OAAO,CAAC,kBAAkB,KAAK,KAAK,EAAE,CAAC;oBACzC,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;gBACvD,CAAC;gBAED,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;oBAC7B,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC;oBACrB,cAAc;oBACd,kBAAkB,EAAE,SAAS;iBAC9B,CAAC,CAAC;YACL,CAAC;SACF;QAED,0BAA0B,EAAE;YAC1B,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBAC7B,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;gBACnE,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBAEtE,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;oBACtB,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC;oBACrB,kBAAkB;iBACnB,CAAC,CAAC;gBAEH,OAAO,kBAAkB,CAAC;YAC5B,CAAC;SACF;QAED,kBAAkB,EAAE;YAClB,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,2EAA2E;gBAC3E,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;gBACjD,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBACtE,OAAO,OAAO,EAAE,QAAQ,CAAC;YAC3B,CAAC;SACF;QAED,mBAAmB,EAAE;YACnB,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,2EAA2E;gBAC3E,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;gBAE3B,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBAEtE,OAAO;oBACL,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,eAAe,EAAE,OAAO,CAAC,eAAe;iBACzC,CAAC;YACJ,CAAC;SACF;QAED,qBAAqB,EAAE;YACrB,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBAC3D,2EAA2E;gBAC3E,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;gBAC3B,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBACtE,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;gBAC1F,IAAI,MAAM,GAAG,EAAE,CAAC;gBAEhB,IAAI,CAAC,aAAa,EAAE,CAAC;oBACnB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;gBACnD,CAAC;gBAED,IAAI,WAAW,EAAE,CAAC;oBAChB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;oBAC5D,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,cAAc,EAAE,CAAC;gBACzC,CAAC;gBAED,IAAI,KAAK,KAAK,OAAO,CAAC,KAAK,EAAE,CAAC;oBAC5B,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;oBACvE,IAAI,QAAQ,EAAE,CAAC;wBACb,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;oBAC1C,CAAC;oBAED,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,CAAC;gBAChC,CAAC;gBAED,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;oBAC7B,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC;oBACrB,GAAG,MAAM;iBACV,CAAC,CAAC;YACL,CAAC;SACF;QAED,aAAa,EAAE;YACb,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBAC7B,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBAEtE,IAAI,OAAO,EAAE,CAAC;oBACZ,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oBAChD,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,OAAO,KAAK,CAAC;YACf,CAAC;SACF;QAED,YAAY,EAAE;YACZ,sEAAsE;YACtE,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBAC7B,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBAEtE,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;oBAC7B,iCAAiC;oBACjC,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;oBACnE,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC;oBACrB,gBAAgB;oBAChB,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,4BAA4B;oBAC5B,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBACpC,CAAC,CAAC;YACL,CAAC;SACF;KACF;IACD,OAAO,EAAE;QACP,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,QAAQ;YACjC,IAAI,KAAK,CAAC;YAEV,yDAAyD;YACzD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACvC,KAAK,GAAG,kBAAkB,CAAC;YAC7B,CAAC;YAED,IAAI,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;gBACtD,KAAK,GAAG,oBAAoB,CAAC;YAC/B,CAAC;YAED,wCAAwC;YACxC,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACvD,KAAK,GAAG,mBAAmB,CAAC;YAC9B,CAAC;YAED,wCAAwC;YACxC,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,6BAA6B,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;YACnF,IAAI,cAAc,EAAE,CAAC;gBACnB,KAAK,GAAG,yBAAyB,CAAC;YACpC,CAAC;YAED,OAAO,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC;QACpC,CAAC;QACD,KAAK,CAAC,YAAY,CAAC,QAAQ;YACzB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,GAAQ,EAAE,IAAS,EAAE,EAAE;oBAChD,IAAI,GAAG,EAAE,CAAC;wBACR,MAAM,CAAC,GAAG,CAAC,CAAC;oBACd,CAAC;yBAAM,CAAC;wBACN,OAAO,CAAC,IAAI,CAAC,CAAC;oBAChB,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI;YAClC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC3B,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,GAAQ,EAAE,GAAQ,EAAE,EAAE;oBACpD,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;wBACjB,OAAO,CAAC,IAAI,CAAC,CAAC;oBAChB,CAAC;yBAAM,CAAC;wBACN,OAAO,CAAC,KAAK,CAAC,CAAC;oBACjB,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,0BAA0B;YAC9B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE;oBACjC,IAAI,EAAE,EAAE,CAAC;wBACP,MAAM,CAAC,EAAE,CAAC,CAAC;oBACb,CAAC;oBACD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC/B,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;KACF;CACsB,CAAC;AAE1B,eAAe,iBAAiB,CAAC"}
|
|
1
|
+
{"version":3,"file":"account.js","sourceRoot":"","sources":["../../services/account.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,6 @@ const AuthLocalService = {
|
|
|
52
52
|
async handler(ctx) {
|
|
53
53
|
const { username, email, password, ...rest } = ctx.params;
|
|
54
54
|
// This is going to get in our way otherwise when waiting for completions.
|
|
55
|
-
// @ts-expect-error TS(2339): Property 'skipObjectsWatcher' does not exist on ty... Remove this comment to see the full error message
|
|
56
55
|
ctx.meta.skipObjectsWatcher = true;
|
|
57
56
|
let accountData = await ctx.call('auth.account.create', {
|
|
58
57
|
username,
|
|
@@ -91,11 +90,8 @@ const AuthLocalService = {
|
|
|
91
90
|
},
|
|
92
91
|
logout: {
|
|
93
92
|
async handler(ctx) {
|
|
94
|
-
// @ts-expect-error TS(2339): Property '$statusCode' does not exist on type '{}'... Remove this comment to see the full error message
|
|
95
93
|
ctx.meta.$statusCode = 302;
|
|
96
|
-
// @ts-expect-error TS(2339): Property '$location' does not exist on type '{}'.
|
|
97
94
|
ctx.meta.$location = ctx.params.redirectUrl || this.settings.formUrl;
|
|
98
|
-
// @ts-expect-error TS(2339): Property 'webId' does not exist on type '{}'.
|
|
99
95
|
ctx.emit('auth.disconnected', { webId: ctx.meta.webId });
|
|
100
96
|
}
|
|
101
97
|
},
|
|
@@ -108,9 +104,7 @@ const AuthLocalService = {
|
|
|
108
104
|
formUrl.searchParams.set(key, value);
|
|
109
105
|
}
|
|
110
106
|
}
|
|
111
|
-
// @ts-expect-error TS(2339): Property '$statusCode' does not exist on type '{}'... Remove this comment to see the full error message
|
|
112
107
|
ctx.meta.$statusCode = 302;
|
|
113
|
-
// @ts-expect-error TS(2339): Property '$location' does not exist on type '{}'.
|
|
114
108
|
ctx.meta.$location = formUrl.toString();
|
|
115
109
|
}
|
|
116
110
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.local.js","sourceRoot":"","sources":["../../services/auth.local.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,qIAAqI;AACrI,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAC1C,OAAO,SAAS,MAAM,6BAA6B,CAAC;AACpD,OAAO,eAAe,MAAM,WAAW,CAAC;AAExC,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;AAE7B,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;AAElC,gDAAgD;AAChD,MAAM,gBAAgB,GAAG;IACvB,IAAI,EAAE,MAAe;IACrB,MAAM,EAAE,CAAC,SAAS,CAAC;IACnB,QAAQ,EAAE;QACR,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,IAAI;QACb,mBAAmB,EAAE,IAAI;QACzB,iBAAiB,EAAE,EAAE;QACrB,iBAAiB,EAAE,CAAC;QACpB,iBAAiB,EAAE,CAAC;QACpB,cAAc,EAAE,EAAE;QAClB,gBAAgB,EAAE,EAAE;QACpB,OAAO,EAAE,IAAI;QACb,IAAI,EAAE;YACJ,IAAI,EAAE,IAAI;YACV,SAAS,EAAE;gBACT,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,IAAI;aACX;YACD,QAAQ,EAAE;gBACR,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE,IAAI;aACf;SACF;KACF;IACD,YAAY,EAAE,CAAC,OAAO,CAAC;IACvB,KAAK,CAAC,OAAO;QACX,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;QAE/B,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;QAE1B,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACnB,qIAAqI;YACrI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;gBACxB,MAAM,EAAE,CAAC,eAAe,CAAC;gBACzB,QAAQ,EAAE;oBACR,GAAG,IAAI;iBACR;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,EAAE;QACP,MAAM,EAAE;YACN,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBAE1D,0EAA0E;gBAC1E,
|
|
1
|
+
{"version":3,"file":"auth.local.js","sourceRoot":"","sources":["../../services/auth.local.ts"],"names":[],"mappings":"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"}
|
package/dist/services/mail.js
CHANGED
|
@@ -3,7 +3,6 @@ import urlJoin from 'url-join';
|
|
|
3
3
|
// @ts-expect-error TS(7016): Could not find a declaration file for module 'mole... Remove this comment to see the full error message
|
|
4
4
|
import MailService from 'moleculer-mail';
|
|
5
5
|
import { fileURLToPath } from 'url';
|
|
6
|
-
// @ts-expect-error TS(1470): The 'import.meta' meta-property is not allowed in ... Remove this comment to see the full error message
|
|
7
6
|
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
|
8
7
|
// The templates are at the root of the package, but this file also runs from dist/ (one level deeper)
|
|
9
8
|
const templateFolder = path.join(__dirname, __dirname.includes(`${path.sep}dist${path.sep}`) ? '../../templates' : '../templates');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mail.js","sourceRoot":"","sources":["../../services/mail.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,qIAAqI;AACrI,OAAO,WAAW,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,
|
|
1
|
+
{"version":3,"file":"mail.js","sourceRoot":"","sources":["../../services/mail.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,qIAAqI;AACrI,OAAO,WAAW,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/D,sGAAsG;AACtG,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAC9B,SAAS,EACT,SAAS,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,GAAG,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,cAAc,CACtF,CAAC;AAEF,MAAM,cAAc,GAAG;IACrB,IAAI,EAAE,WAAoB;IAC1B,MAAM,EAAE,CAAC,WAAW,CAAC;IACrB,QAAQ,EAAE;QACR,QAAQ,EAAE;YACR,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,IAAI;SACf;QACD,cAAc;QACd,IAAI,EAAE,IAAI;QACV,SAAS,EAAE,IAAI;KAChB;IACD,OAAO,EAAE;QACP,sBAAsB,EAAE;YACtB,KAAK,CAAC,OAAO,CAAC,GAAG;gBACf,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBAEtC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CACrB;oBACE,EAAE,EAAE,OAAO,CAAC,KAAK;oBACjB,QAAQ,EAAE,gBAAgB;oBAC1B,MAAM,EAAE,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;oBACxF,IAAI,EAAE;wBACJ,OAAO;wBACP,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,4BAA4B,KAAK,EAAE;qBAClG;iBACF,EACD;oBACE,SAAS,EAAE,GAAG;iBACf,CACF,CAAC;YACJ,CAAC;SACF;KACF;IACD,OAAO,EAAE;QACP,iBAAiB,CAAC,UAAU;YAC1B,QAAQ,UAAU,EAAE,CAAC;gBACnB,KAAK,IAAI;oBACP,OAAO,OAAO,CAAC;gBACjB,KAAK,IAAI;oBACP,OAAO,OAAO,CAAC;gBACjB;oBACE,OAAO,OAAO,CAAC;YACnB,CAAC;QACH,CAAC;KACF;CACsB,CAAC;AAE1B,eAAe,cAAc,CAAC"}
|
package/mixins/auth.ts
CHANGED
|
@@ -123,7 +123,6 @@ const AuthMixin = {
|
|
|
123
123
|
|
|
124
124
|
if (!token) {
|
|
125
125
|
// No token
|
|
126
|
-
// @ts-expect-error TS(2339): Property 'webId' does not exist on type '{}'.
|
|
127
126
|
ctx.meta.webId = 'anon';
|
|
128
127
|
return Promise.resolve(null);
|
|
129
128
|
}
|
|
@@ -131,7 +130,6 @@ const AuthMixin = {
|
|
|
131
130
|
if (method === 'Bearer') {
|
|
132
131
|
const payload = await ctx.call('auth.jwt.verifyServerSignedToken', { token });
|
|
133
132
|
if (payload) {
|
|
134
|
-
// @ts-expect-error TS(2339): Property 'tokenPayload' does not exist on type '{}... Remove this comment to see the full error message
|
|
135
133
|
ctx.meta.tokenPayload = payload;
|
|
136
134
|
// @ts-expect-error TS(2339): Property 'webId' does not exist on type '{}'.
|
|
137
135
|
ctx.meta.webId = payload.webId;
|
|
@@ -149,7 +147,6 @@ const AuthMixin = {
|
|
|
149
147
|
}
|
|
150
148
|
|
|
151
149
|
// No valid auth method given.
|
|
152
|
-
// @ts-expect-error TS(2339): Property 'webId' does not exist on type '{}'.
|
|
153
150
|
ctx.meta.webId = 'anon';
|
|
154
151
|
return Promise.resolve(null);
|
|
155
152
|
}
|
|
@@ -173,7 +170,6 @@ const AuthMixin = {
|
|
|
173
170
|
// Validate if the token was signed by server (registered user).
|
|
174
171
|
const serverSignedPayload = await ctx.call('auth.jwt.verifyServerSignedToken', { token });
|
|
175
172
|
if (serverSignedPayload) {
|
|
176
|
-
// @ts-expect-error TS(2339): Property 'tokenPayload' does not exist on type '{}... Remove this comment to see the full error message
|
|
177
173
|
ctx.meta.tokenPayload = serverSignedPayload;
|
|
178
174
|
// @ts-expect-error TS(2339): Property 'webId' does not exist on type '{}'.
|
|
179
175
|
ctx.meta.webId = serverSignedPayload.webId;
|
package/package.json
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@semapps/auth",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.3.0",
|
|
4
4
|
"description": "Authentification module for SemApps",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"author": "Virtual Assembly",
|
|
7
7
|
"dependencies": {
|
|
8
|
-
"@semapps/ldp": "1.
|
|
9
|
-
"@semapps/middlewares": "1.
|
|
10
|
-
"@semapps/mime-types": "1.
|
|
11
|
-
"@semapps/triplestore": "1.
|
|
8
|
+
"@semapps/ldp": "1.3.0",
|
|
9
|
+
"@semapps/middlewares": "1.3.0",
|
|
10
|
+
"@semapps/mime-types": "1.3.0",
|
|
11
|
+
"@semapps/triplestore": "1.3.0",
|
|
12
12
|
"bcrypt": "^5.0.1",
|
|
13
13
|
"express-session": "^1.17.0",
|
|
14
14
|
"jsonwebtoken": "^9.0.2",
|
|
@@ -39,6 +39,6 @@
|
|
|
39
39
|
"prepack": "node ../../scripts/switch-main-to-publish.js .",
|
|
40
40
|
"postpack": "node ../../scripts/revert-main-from-publish.js ."
|
|
41
41
|
},
|
|
42
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "4ae64a3de7e2682f8656d2609e219de4eea5fcca",
|
|
43
43
|
"xDevMain": "./index.ts"
|
|
44
44
|
}
|
package/services/account.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
// @ts-expect-error TS(7016): Could not find a declaration file for module 'bcry... Remove this comment to see the full error message
|
|
2
2
|
import bcrypt from 'bcrypt';
|
|
3
|
-
// @ts-expect-error TS(7016): Could not find a declaration file for module 'spea... Remove this comment to see the full error message
|
|
4
3
|
import createSlug from 'speakingurl';
|
|
5
4
|
import DbService from 'moleculer-db';
|
|
6
5
|
import { TripleStoreAdapter } from '@semapps/triplestore';
|
|
@@ -54,7 +53,6 @@ const AuthAccountSchema = {
|
|
|
54
53
|
// FORMAT AND VERIFY USERNAME
|
|
55
54
|
|
|
56
55
|
if (username) {
|
|
57
|
-
// @ts-expect-error TS(2339): Property 'isSystemCall' does not exist on type '{}... Remove this comment to see the full error message
|
|
58
56
|
if (!ctx.meta.isSystemCall) {
|
|
59
57
|
const { isValid, error } = await this.isValidUsername(ctx, username);
|
|
60
58
|
if (!isValid) throw new Error(error);
|
|
@@ -222,7 +220,6 @@ const AuthAccountSchema = {
|
|
|
222
220
|
|
|
223
221
|
findDatasetByWebId: {
|
|
224
222
|
async handler(ctx) {
|
|
225
|
-
// @ts-expect-error TS(2339): Property 'webId' does not exist on type '{}'.
|
|
226
223
|
const webId = ctx.params.webId || ctx.meta.webId;
|
|
227
224
|
const account = await ctx.call('auth.account.findByWebId', { webId });
|
|
228
225
|
return account?.username;
|
|
@@ -231,7 +228,6 @@ const AuthAccountSchema = {
|
|
|
231
228
|
|
|
232
229
|
findSettingsByWebId: {
|
|
233
230
|
async handler(ctx) {
|
|
234
|
-
// @ts-expect-error TS(2339): Property 'webId' does not exist on type '{}'.
|
|
235
231
|
const { webId } = ctx.meta;
|
|
236
232
|
|
|
237
233
|
const account = await ctx.call('auth.account.findByWebId', { webId });
|
|
@@ -246,7 +242,6 @@ const AuthAccountSchema = {
|
|
|
246
242
|
updateAccountSettings: {
|
|
247
243
|
async handler(ctx) {
|
|
248
244
|
const { currentPassword, email, newPassword } = ctx.params;
|
|
249
|
-
// @ts-expect-error TS(2339): Property 'webId' does not exist on type '{}'.
|
|
250
245
|
const { webId } = ctx.meta;
|
|
251
246
|
const account = await ctx.call('auth.account.findByWebId', { webId });
|
|
252
247
|
const passwordMatch = await this.comparePassword(currentPassword, account.hashedPassword);
|
package/services/auth.local.ts
CHANGED
|
@@ -59,7 +59,6 @@ const AuthLocalService = {
|
|
|
59
59
|
const { username, email, password, ...rest } = ctx.params;
|
|
60
60
|
|
|
61
61
|
// This is going to get in our way otherwise when waiting for completions.
|
|
62
|
-
// @ts-expect-error TS(2339): Property 'skipObjectsWatcher' does not exist on ty... Remove this comment to see the full error message
|
|
63
62
|
ctx.meta.skipObjectsWatcher = true;
|
|
64
63
|
|
|
65
64
|
let accountData = await ctx.call('auth.account.create', {
|
|
@@ -109,11 +108,8 @@ const AuthLocalService = {
|
|
|
109
108
|
|
|
110
109
|
logout: {
|
|
111
110
|
async handler(ctx) {
|
|
112
|
-
// @ts-expect-error TS(2339): Property '$statusCode' does not exist on type '{}'... Remove this comment to see the full error message
|
|
113
111
|
ctx.meta.$statusCode = 302;
|
|
114
|
-
// @ts-expect-error TS(2339): Property '$location' does not exist on type '{}'.
|
|
115
112
|
ctx.meta.$location = ctx.params.redirectUrl || this.settings.formUrl;
|
|
116
|
-
// @ts-expect-error TS(2339): Property 'webId' does not exist on type '{}'.
|
|
117
113
|
ctx.emit('auth.disconnected', { webId: ctx.meta.webId });
|
|
118
114
|
}
|
|
119
115
|
},
|
|
@@ -127,9 +123,7 @@ const AuthLocalService = {
|
|
|
127
123
|
formUrl.searchParams.set(key, value);
|
|
128
124
|
}
|
|
129
125
|
}
|
|
130
|
-
// @ts-expect-error TS(2339): Property '$statusCode' does not exist on type '{}'... Remove this comment to see the full error message
|
|
131
126
|
ctx.meta.$statusCode = 302;
|
|
132
|
-
// @ts-expect-error TS(2339): Property '$location' does not exist on type '{}'.
|
|
133
127
|
ctx.meta.$location = formUrl.toString();
|
|
134
128
|
} else {
|
|
135
129
|
throw new Error('No formUrl defined in auth.local settings');
|
package/services/mail.ts
CHANGED
|
@@ -5,7 +5,6 @@ import MailService from 'moleculer-mail';
|
|
|
5
5
|
import type { ServiceSchema } from 'moleculer';
|
|
6
6
|
import { fileURLToPath } from 'url';
|
|
7
7
|
|
|
8
|
-
// @ts-expect-error TS(1470): The 'import.meta' meta-property is not allowed in ... Remove this comment to see the full error message
|
|
9
8
|
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
|
10
9
|
// The templates are at the root of the package, but this file also runs from dist/ (one level deeper)
|
|
11
10
|
const templateFolder = path.join(
|