@semapps/auth 1.2.0 → 1.2.1
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.d.ts +5 -11
- package/dist/mixins/auth.js +2 -2
- package/dist/mixins/auth.js.map +1 -1
- package/dist/mixins/auth.sso.d.ts +7 -15
- package/dist/services/account.d.ts +17 -51
- package/dist/services/auth.cas.d.ts +8 -16
- package/dist/services/auth.cas.js +2 -2
- package/dist/services/auth.cas.js.map +1 -1
- package/dist/services/auth.local.d.ts +16 -33
- package/dist/services/auth.local.js +2 -1
- package/dist/services/auth.local.js.map +1 -1
- package/dist/services/auth.oidc.d.ts +8 -16
- package/dist/services/auth.oidc.js +3 -2
- package/dist/services/auth.oidc.js.map +1 -1
- package/dist/services/jwt.d.ts +6 -16
- package/dist/services/mail.d.ts +1 -3
- package/dist/services/migration.d.ts +1 -3
- package/mixins/auth.sso.ts +1 -1
- package/mixins/auth.ts +3 -3
- package/package.json +10 -6
- package/services/account.ts +1 -1
- package/services/auth.cas.ts +3 -3
- package/services/auth.local.ts +3 -2
- package/services/auth.oidc.ts +4 -3
- package/services/jwt.ts +1 -1
- package/services/mail.ts +1 -1
- package/services/migration.ts +1 -1
package/dist/mixins/auth.d.ts
CHANGED
|
@@ -66,23 +66,17 @@ declare const AuthMixin: {
|
|
|
66
66
|
podProvider: boolean;
|
|
67
67
|
};
|
|
68
68
|
dependencies: string[];
|
|
69
|
-
created(this:
|
|
70
|
-
started(this:
|
|
69
|
+
created(this: import("moleculer").Service<import("moleculer").ServiceSettingSchema>): Promise<void>;
|
|
70
|
+
started(this: import("moleculer").Service<import("moleculer").ServiceSettingSchema>): Promise<void>;
|
|
71
71
|
actions: {
|
|
72
72
|
authenticate: {
|
|
73
|
-
handler(ctx:
|
|
74
|
-
[x: string]: any;
|
|
75
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
73
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
76
74
|
};
|
|
77
75
|
authorize: {
|
|
78
|
-
handler(ctx:
|
|
79
|
-
[x: string]: any;
|
|
80
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
76
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
81
77
|
};
|
|
82
78
|
impersonate: {
|
|
83
|
-
handler(ctx:
|
|
84
|
-
[x: string]: any;
|
|
85
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
79
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<unknown>;
|
|
86
80
|
};
|
|
87
81
|
};
|
|
88
82
|
methods: {
|
package/dist/mixins/auth.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// @ts-expect-error TS(7016): Could not find a declaration file for module 'pass... Remove this comment to see the full error message
|
|
2
2
|
import passport from 'passport';
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
import moleculerWeb from 'moleculer-web';
|
|
4
|
+
const E = moleculerWeb.Errors;
|
|
5
5
|
import { TripleStoreAdapter } from '@semapps/triplestore';
|
|
6
6
|
import AuthAccountService from "../services/account.js";
|
|
7
7
|
import AuthJWTService from "../services/jwt.js";
|
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,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../mixins/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,23 +14,17 @@ declare const AuthSSOMixin: {
|
|
|
14
14
|
podProvider: boolean;
|
|
15
15
|
};
|
|
16
16
|
dependencies: string[];
|
|
17
|
-
created(this:
|
|
18
|
-
started(this:
|
|
17
|
+
created(this: import("moleculer").Service<import("moleculer").ServiceSettingSchema>): Promise<void>;
|
|
18
|
+
started(this: import("moleculer").Service<import("moleculer").ServiceSettingSchema>): Promise<void>;
|
|
19
19
|
actions: {
|
|
20
20
|
authenticate: {
|
|
21
|
-
handler(ctx:
|
|
22
|
-
[x: string]: any;
|
|
23
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
21
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
24
22
|
};
|
|
25
23
|
authorize: {
|
|
26
|
-
handler(ctx:
|
|
27
|
-
[x: string]: any;
|
|
28
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
24
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
29
25
|
};
|
|
30
26
|
impersonate: {
|
|
31
|
-
handler(ctx:
|
|
32
|
-
[x: string]: any;
|
|
33
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
27
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<unknown>;
|
|
34
28
|
};
|
|
35
29
|
};
|
|
36
30
|
methods: {
|
|
@@ -54,10 +48,8 @@ declare const AuthSSOMixin: {
|
|
|
54
48
|
};
|
|
55
49
|
actions: {
|
|
56
50
|
loginOrSignup: {
|
|
57
|
-
handler(ctx:
|
|
58
|
-
|
|
59
|
-
}>, {}, Moleculer.GenericObject>): Promise<{
|
|
60
|
-
token: any;
|
|
51
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<{
|
|
52
|
+
token: unknown;
|
|
61
53
|
newUser: boolean;
|
|
62
54
|
}>;
|
|
63
55
|
};
|
|
@@ -13,93 +13,59 @@ declare const AuthAccountSchema: {
|
|
|
13
13
|
dependencies: string[];
|
|
14
14
|
actions: {
|
|
15
15
|
create: {
|
|
16
|
-
handler(ctx:
|
|
17
|
-
[x: string]: any;
|
|
18
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
16
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
19
17
|
};
|
|
20
18
|
attachWebId: {
|
|
21
|
-
handler(ctx:
|
|
22
|
-
[x: string]: any;
|
|
23
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
19
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
24
20
|
};
|
|
25
21
|
verify: {
|
|
26
|
-
handler(ctx:
|
|
27
|
-
[x: string]: any;
|
|
28
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
22
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
29
23
|
};
|
|
30
24
|
usernameExists: {
|
|
31
|
-
handler(ctx:
|
|
32
|
-
[x: string]: any;
|
|
33
|
-
}>, {}, Moleculer.GenericObject>): Promise<boolean>;
|
|
25
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<boolean>;
|
|
34
26
|
};
|
|
35
27
|
emailExists: {
|
|
36
|
-
handler(ctx:
|
|
37
|
-
[x: string]: any;
|
|
38
|
-
}>, {}, Moleculer.GenericObject>): Promise<boolean>;
|
|
28
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<boolean>;
|
|
39
29
|
};
|
|
40
30
|
find: {
|
|
41
31
|
/** Overwrite find method, to filter accounts with tombstone. */
|
|
42
|
-
handler(ctx:
|
|
43
|
-
[x: string]: any;
|
|
44
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
32
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
45
33
|
};
|
|
46
34
|
findByUsername: {
|
|
47
|
-
handler(ctx:
|
|
48
|
-
[x: string]: any;
|
|
49
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
35
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
50
36
|
};
|
|
51
37
|
findByWebId: {
|
|
52
|
-
handler(ctx:
|
|
53
|
-
[x: string]: any;
|
|
54
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
38
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
55
39
|
};
|
|
56
40
|
findByEmail: {
|
|
57
|
-
handler(ctx:
|
|
58
|
-
[x: string]: any;
|
|
59
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
41
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
60
42
|
};
|
|
61
43
|
setPassword: {
|
|
62
|
-
handler(ctx:
|
|
63
|
-
[x: string]: any;
|
|
64
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
44
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
65
45
|
};
|
|
66
46
|
setNewPassword: {
|
|
67
|
-
handler(ctx:
|
|
68
|
-
[x: string]: any;
|
|
69
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
47
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
70
48
|
};
|
|
71
49
|
generateResetPasswordToken: {
|
|
72
|
-
handler(ctx:
|
|
73
|
-
[x: string]: any;
|
|
74
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
50
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
75
51
|
};
|
|
76
52
|
findDatasetByWebId: {
|
|
77
|
-
handler(ctx:
|
|
78
|
-
[x: string]: any;
|
|
79
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
53
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
80
54
|
};
|
|
81
55
|
findSettingsByWebId: {
|
|
82
|
-
handler(ctx:
|
|
83
|
-
[x: string]: any;
|
|
84
|
-
}>, {}, Moleculer.GenericObject>): Promise<{
|
|
56
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<{
|
|
85
57
|
email: any;
|
|
86
58
|
preferredLocale: any;
|
|
87
59
|
}>;
|
|
88
60
|
};
|
|
89
61
|
updateAccountSettings: {
|
|
90
|
-
handler(ctx:
|
|
91
|
-
[x: string]: any;
|
|
92
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
62
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
93
63
|
};
|
|
94
64
|
deleteByWebId: {
|
|
95
|
-
handler(ctx:
|
|
96
|
-
[x: string]: any;
|
|
97
|
-
}>, {}, Moleculer.GenericObject>): Promise<boolean>;
|
|
65
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<boolean>;
|
|
98
66
|
};
|
|
99
67
|
setTombstone: {
|
|
100
|
-
handler(ctx:
|
|
101
|
-
[x: string]: any;
|
|
102
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
68
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
103
69
|
};
|
|
104
70
|
};
|
|
105
71
|
methods: {
|
|
@@ -16,23 +16,17 @@ declare const AuthCASService: {
|
|
|
16
16
|
podProvider: boolean;
|
|
17
17
|
};
|
|
18
18
|
dependencies: string[];
|
|
19
|
-
created(this:
|
|
20
|
-
started(this:
|
|
19
|
+
created(this: import("moleculer").Service<import("moleculer").ServiceSettingSchema>): Promise<void>;
|
|
20
|
+
started(this: import("moleculer").Service<import("moleculer").ServiceSettingSchema>): Promise<void>;
|
|
21
21
|
actions: {
|
|
22
22
|
authenticate: {
|
|
23
|
-
handler(ctx:
|
|
24
|
-
[x: string]: any;
|
|
25
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
23
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
26
24
|
};
|
|
27
25
|
authorize: {
|
|
28
|
-
handler(ctx:
|
|
29
|
-
[x: string]: any;
|
|
30
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
26
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
31
27
|
};
|
|
32
28
|
impersonate: {
|
|
33
|
-
handler(ctx:
|
|
34
|
-
[x: string]: any;
|
|
35
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
29
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<unknown>;
|
|
36
30
|
};
|
|
37
31
|
};
|
|
38
32
|
methods: {
|
|
@@ -56,10 +50,8 @@ declare const AuthCASService: {
|
|
|
56
50
|
};
|
|
57
51
|
actions: {
|
|
58
52
|
loginOrSignup: {
|
|
59
|
-
handler(ctx:
|
|
60
|
-
|
|
61
|
-
}>, {}, Moleculer.GenericObject>): Promise<{
|
|
62
|
-
token: any;
|
|
53
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<{
|
|
54
|
+
token: unknown;
|
|
63
55
|
newUser: boolean;
|
|
64
56
|
}>;
|
|
65
57
|
};
|
|
@@ -85,7 +77,7 @@ declare const AuthCASService: {
|
|
|
85
77
|
selectSsoData: null;
|
|
86
78
|
casUrl: null;
|
|
87
79
|
};
|
|
88
|
-
created(this:
|
|
80
|
+
created(this: import("moleculer").Service<import("moleculer").ServiceSettingSchema>): Promise<void>;
|
|
89
81
|
methods: {
|
|
90
82
|
getStrategy(): any;
|
|
91
83
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// @ts-expect-error TS(7016): Could not find a declaration file for module 'pass... Remove this comment to see the full error message
|
|
2
2
|
import { Strategy } from 'passport-cas2';
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
import moleculerWeb from 'moleculer-web';
|
|
4
|
+
const E = moleculerWeb.Errors;
|
|
5
5
|
import AuthSSOMixin from "../mixins/auth.sso.js";
|
|
6
6
|
const AuthCASService = {
|
|
7
7
|
name: 'auth',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.cas.js","sourceRoot":"","sources":["../../services/auth.cas.ts"],"names":[],"mappings":"AAAA,qIAAqI;AACrI,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,
|
|
1
|
+
{"version":3,"file":"auth.cas.js","sourceRoot":"","sources":["../../services/auth.cas.ts"],"names":[],"mappings":"AAAA,qIAAqI;AACrI,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,MAAM,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC;AAE9B,OAAO,YAAY,MAAM,uBAAuB,CAAC;AAEjD,MAAM,cAAc,GAAG;IACrB,IAAI,EAAE,MAAe;IACrB,MAAM,EAAE,CAAC,YAAY,CAAC;IACtB,QAAQ,EAAE;QACR,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,IAAI;QACb,mBAAmB,EAAE,IAAI;QACzB,iBAAiB,EAAE,EAAE;QACrB,cAAc,EAAE,EAAE;QAClB,wBAAwB;QACxB,aAAa,EAAE,SAAS;QACxB,aAAa,EAAE,IAAI;QACnB,wBAAwB;QACxB,MAAM,EAAE,IAAI;KACb;IACD,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;IACD,OAAO,EAAE;QACP,WAAW;YACT,OAAO,IAAI,QAAQ,CACjB;gBACE,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;gBAC5B,iBAAiB,EAAE,IAAI;aACxB,EACD,CAAC,GAAQ,EAAE,QAAa,EAAE,OAAY,EAAE,IAAS,EAAE,EAAE;gBACnD,GAAG,CAAC,IAAI;qBACL,IAAI,CAAC,oBAAoB,EAAE,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,GAAG,OAAO,EAAE,EAAE,CAAC;qBACjE,IAAI,CAAC,CAAC,SAAc,EAAE,EAAE;oBACvB,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;gBACxB,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,CAAM,EAAE,EAAE;oBAChB,IAAI,CAAC,IAAI,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;gBAClD,CAAC,CAAC,CAAC;YACP,CAAC,CACF,CAAC;QACJ,CAAC;KACF;CACsB,CAAC;AAE1B,eAAe,cAAc,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import moleculer from 'moleculer';
|
|
1
2
|
/** @type {import('moleculer').ServiceSchema} */
|
|
2
3
|
declare const AuthLocalService: {
|
|
3
4
|
name: "auth";
|
|
@@ -16,23 +17,17 @@ declare const AuthLocalService: {
|
|
|
16
17
|
podProvider: boolean;
|
|
17
18
|
};
|
|
18
19
|
dependencies: string[];
|
|
19
|
-
created(this:
|
|
20
|
-
started(this:
|
|
20
|
+
created(this: moleculer.Service<moleculer.ServiceSettingSchema>): Promise<void>;
|
|
21
|
+
started(this: moleculer.Service<moleculer.ServiceSettingSchema>): Promise<void>;
|
|
21
22
|
actions: {
|
|
22
23
|
authenticate: {
|
|
23
|
-
handler(ctx:
|
|
24
|
-
[x: string]: any;
|
|
25
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
24
|
+
handler(ctx: moleculer.Context<any, any, moleculer.GenericObject>): Promise<any>;
|
|
26
25
|
};
|
|
27
26
|
authorize: {
|
|
28
|
-
handler(ctx:
|
|
29
|
-
[x: string]: any;
|
|
30
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
27
|
+
handler(ctx: moleculer.Context<any, any, moleculer.GenericObject>): Promise<any>;
|
|
31
28
|
};
|
|
32
29
|
impersonate: {
|
|
33
|
-
handler(ctx:
|
|
34
|
-
[x: string]: any;
|
|
35
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
30
|
+
handler(ctx: moleculer.Context<any, any, moleculer.GenericObject>): Promise<unknown>;
|
|
36
31
|
};
|
|
37
32
|
};
|
|
38
33
|
methods: {
|
|
@@ -68,45 +63,33 @@ declare const AuthLocalService: {
|
|
|
68
63
|
};
|
|
69
64
|
};
|
|
70
65
|
dependencies: string[];
|
|
71
|
-
created(this:
|
|
66
|
+
created(this: moleculer.Service<moleculer.ServiceSettingSchema>): Promise<void>;
|
|
72
67
|
actions: {
|
|
73
68
|
signup: {
|
|
74
|
-
handler(ctx:
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
token: any;
|
|
78
|
-
webId: any;
|
|
69
|
+
handler(ctx: moleculer.Context<any, any, moleculer.GenericObject>): Promise<{
|
|
70
|
+
token: unknown;
|
|
71
|
+
webId: unknown;
|
|
79
72
|
newUser: boolean;
|
|
80
73
|
}>;
|
|
81
74
|
};
|
|
82
75
|
login: {
|
|
83
|
-
handler(ctx:
|
|
84
|
-
|
|
85
|
-
}>, {}, Moleculer.GenericObject>): Promise<{
|
|
86
|
-
token: any;
|
|
76
|
+
handler(ctx: moleculer.Context<any, any, moleculer.GenericObject>): Promise<{
|
|
77
|
+
token: unknown;
|
|
87
78
|
webId: any;
|
|
88
79
|
newUser: boolean;
|
|
89
80
|
}>;
|
|
90
81
|
};
|
|
91
82
|
logout: {
|
|
92
|
-
handler(ctx:
|
|
93
|
-
[x: string]: any;
|
|
94
|
-
}>, {}, Moleculer.GenericObject>): Promise<void>;
|
|
83
|
+
handler(ctx: moleculer.Context<any, any, moleculer.GenericObject>): Promise<void>;
|
|
95
84
|
};
|
|
96
85
|
redirectToForm: {
|
|
97
|
-
handler(ctx:
|
|
98
|
-
[x: string]: any;
|
|
99
|
-
}>, {}, Moleculer.GenericObject>): Promise<void>;
|
|
86
|
+
handler(ctx: moleculer.Context<any, any, moleculer.GenericObject>): Promise<void>;
|
|
100
87
|
};
|
|
101
88
|
resetPassword: {
|
|
102
|
-
handler(ctx:
|
|
103
|
-
[x: string]: any;
|
|
104
|
-
}>, {}, Moleculer.GenericObject>): Promise<void>;
|
|
89
|
+
handler(ctx: moleculer.Context<any, any, moleculer.GenericObject>): Promise<void>;
|
|
105
90
|
};
|
|
106
91
|
setNewPassword: {
|
|
107
|
-
handler(ctx:
|
|
108
|
-
[x: string]: any;
|
|
109
|
-
}>, {}, Moleculer.GenericObject>): Promise<void>;
|
|
92
|
+
handler(ctx: moleculer.Context<any, any, moleculer.GenericObject>): Promise<void>;
|
|
110
93
|
};
|
|
111
94
|
};
|
|
112
95
|
methods: {
|
|
@@ -4,7 +4,8 @@ import { Strategy } from 'passport-local';
|
|
|
4
4
|
import AuthMixin from "../mixins/auth.js";
|
|
5
5
|
import sendToken from "../middlewares/sendToken.js";
|
|
6
6
|
import AuthMailService from "./mail.js";
|
|
7
|
-
import
|
|
7
|
+
import moleculer from 'moleculer';
|
|
8
|
+
const { Errors } = moleculer;
|
|
8
9
|
const { MoleculerError } = Errors;
|
|
9
10
|
/** @type {import('moleculer').ServiceSchema} */
|
|
10
11
|
const AuthLocalService = {
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"auth.local.js","sourceRoot":"","sources":["../../services/auth.local.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,23 +16,17 @@ declare const AuthOIDCService: {
|
|
|
16
16
|
podProvider: boolean;
|
|
17
17
|
};
|
|
18
18
|
dependencies: string[];
|
|
19
|
-
created(this:
|
|
20
|
-
started(this:
|
|
19
|
+
created(this: import("moleculer").Service<import("moleculer").ServiceSettingSchema>): Promise<void>;
|
|
20
|
+
started(this: import("moleculer").Service<import("moleculer").ServiceSettingSchema>): Promise<void>;
|
|
21
21
|
actions: {
|
|
22
22
|
authenticate: {
|
|
23
|
-
handler(ctx:
|
|
24
|
-
[x: string]: any;
|
|
25
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
23
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
26
24
|
};
|
|
27
25
|
authorize: {
|
|
28
|
-
handler(ctx:
|
|
29
|
-
[x: string]: any;
|
|
30
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
26
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
31
27
|
};
|
|
32
28
|
impersonate: {
|
|
33
|
-
handler(ctx:
|
|
34
|
-
[x: string]: any;
|
|
35
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
29
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<unknown>;
|
|
36
30
|
};
|
|
37
31
|
};
|
|
38
32
|
methods: {
|
|
@@ -56,10 +50,8 @@ declare const AuthOIDCService: {
|
|
|
56
50
|
};
|
|
57
51
|
actions: {
|
|
58
52
|
loginOrSignup: {
|
|
59
|
-
handler(ctx:
|
|
60
|
-
|
|
61
|
-
}>, {}, Moleculer.GenericObject>): Promise<{
|
|
62
|
-
token: any;
|
|
53
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<{
|
|
54
|
+
token: unknown;
|
|
63
55
|
newUser: boolean;
|
|
64
56
|
}>;
|
|
65
57
|
};
|
|
@@ -87,7 +79,7 @@ declare const AuthOIDCService: {
|
|
|
87
79
|
clientId: null;
|
|
88
80
|
clientSecret: null;
|
|
89
81
|
};
|
|
90
|
-
created(this:
|
|
82
|
+
created(this: import("moleculer").Service<import("moleculer").ServiceSettingSchema>): Promise<void>;
|
|
91
83
|
methods: {
|
|
92
84
|
getStrategy(): Promise<any>;
|
|
93
85
|
};
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import urlJoin from 'url-join';
|
|
2
|
-
// @ts-expect-error
|
|
3
|
-
import
|
|
2
|
+
// @ts-expect-error
|
|
3
|
+
import openidClient from 'openid-client';
|
|
4
|
+
const { Issuer, Strategy, custom } = openidClient;
|
|
4
5
|
import AuthSSOMixin from "../mixins/auth.sso.js";
|
|
5
6
|
custom.setHttpOptionsDefaults({
|
|
6
7
|
timeout: 10000
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.oidc.js","sourceRoot":"","sources":["../../services/auth.oidc.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,
|
|
1
|
+
{"version":3,"file":"auth.oidc.js","sourceRoot":"","sources":["../../services/auth.oidc.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,mBAAmB;AACnB,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC;AAGlD,OAAO,YAAY,MAAM,uBAAuB,CAAC;AAEjD,MAAM,CAAC,sBAAsB,CAAC;IAC5B,OAAO,EAAE,KAAK;CACf,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG;IACtB,IAAI,EAAE,MAAe;IACrB,MAAM,EAAE,CAAC,YAAY,CAAC;IACtB,QAAQ,EAAE;QACR,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,IAAI;QACb,mBAAmB,EAAE,IAAI;QACzB,iBAAiB,EAAE,EAAE;QACrB,cAAc,EAAE,EAAE;QAClB,wBAAwB;QACxB,aAAa,EAAE,SAAS;QACxB,aAAa,EAAE,IAAI;QACnB,yBAAyB;QACzB,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,IAAI;QACd,YAAY,EAAE,IAAI;KACnB;IACD,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;IAC3B,CAAC;IACD,OAAO,EAAE;QACP,KAAK,CAAC,WAAW;YACf,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAE3D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC;gBAC/B,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ;gBACjC,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY;gBACzC,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;gBACpD,0BAA0B,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;aAC5E,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG;YACb,0DAA0D;YAC1D,yCAAyC;YACzC,mDAAmD;YACnD,kEAAkE;YAClE,6BAA6B;aAC9B,CAAC;YAEF,OAAO,IAAI,QAAQ,CACjB;gBACE,MAAM;gBACN,MAAM;gBACN,iBAAiB,EAAE,IAAI;aACxB,EACD,CAAC,GAAQ,EAAE,QAAa,EAAE,QAAa,EAAE,IAAS,EAAE,EAAE;gBACpD,GAAG,CAAC,IAAI;qBACL,IAAI,CAAC,oBAAoB,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;qBACjD,IAAI,CAAC,CAAC,SAAc,EAAE,EAAE;oBACvB,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;gBACxB,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,CAAM,EAAE,EAAE;oBAChB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACjB,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;YACP,CAAC,CACF,CAAC;QACJ,CAAC;KACF;CACsB,CAAC;AAE1B,eAAe,eAAe,CAAC"}
|
package/dist/services/jwt.d.ts
CHANGED
|
@@ -10,33 +10,23 @@ declare const AuthJwtSchema: {
|
|
|
10
10
|
settings: {
|
|
11
11
|
jwtPath: null;
|
|
12
12
|
};
|
|
13
|
-
created(this:
|
|
13
|
+
created(this: import("moleculer").Service<import("moleculer").ServiceSettingSchema>): Promise<void>;
|
|
14
14
|
actions: {
|
|
15
15
|
generateKeyPair: {
|
|
16
|
-
handler(ctx:
|
|
17
|
-
[x: string]: any;
|
|
18
|
-
}>, {}, Moleculer.GenericObject>): Promise<unknown>;
|
|
16
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<unknown>;
|
|
19
17
|
};
|
|
20
18
|
generateServerSignedToken: {
|
|
21
|
-
handler(ctx:
|
|
22
|
-
[x: string]: any;
|
|
23
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
19
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
24
20
|
};
|
|
25
21
|
verifyServerSignedToken: {
|
|
26
22
|
/** Verifies that the token was signed by this server. */
|
|
27
|
-
handler(ctx:
|
|
28
|
-
[x: string]: any;
|
|
29
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
23
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
30
24
|
};
|
|
31
25
|
generateUnsignedToken: {
|
|
32
|
-
handler(ctx:
|
|
33
|
-
[x: string]: any;
|
|
34
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
26
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
35
27
|
};
|
|
36
28
|
decodeToken: {
|
|
37
|
-
handler(ctx:
|
|
38
|
-
[x: string]: any;
|
|
39
|
-
}>, {}, Moleculer.GenericObject>): Promise<any>;
|
|
29
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<any>;
|
|
40
30
|
};
|
|
41
31
|
};
|
|
42
32
|
};
|
package/dist/services/mail.d.ts
CHANGED
|
@@ -12,9 +12,7 @@ declare const AuthMailSchema: {
|
|
|
12
12
|
};
|
|
13
13
|
actions: {
|
|
14
14
|
sendResetPasswordEmail: {
|
|
15
|
-
handler(ctx:
|
|
16
|
-
[x: string]: any;
|
|
17
|
-
}>, {}, Moleculer.GenericObject>): Promise<void>;
|
|
15
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<void>;
|
|
18
16
|
};
|
|
19
17
|
};
|
|
20
18
|
methods: {
|
|
@@ -2,9 +2,7 @@ declare const AuthMigrationSchema: {
|
|
|
2
2
|
name: "auth.migration";
|
|
3
3
|
actions: {
|
|
4
4
|
migrateUsersToAccounts: {
|
|
5
|
-
handler(ctx:
|
|
6
|
-
[x: string]: any;
|
|
7
|
-
}>, {}, Moleculer.GenericObject>): Promise<void>;
|
|
5
|
+
handler(ctx: import("moleculer").Context<any, any, import("moleculer").GenericObject>): Promise<void>;
|
|
8
6
|
};
|
|
9
7
|
};
|
|
10
8
|
};
|
package/mixins/auth.sso.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
2
|
// @ts-expect-error TS(7016): Could not find a declaration file for module 'expr... Remove this comment to see the full error message
|
|
3
3
|
import session from 'express-session';
|
|
4
|
-
import { ServiceSchema } from 'moleculer';
|
|
4
|
+
import type { ServiceSchema } from 'moleculer';
|
|
5
5
|
import AuthMixin from './auth.ts';
|
|
6
6
|
import saveRedirectUrl from '../middlewares/saveRedirectUrl.ts';
|
|
7
7
|
import redirectToFront from '../middlewares/redirectToFront.ts';
|
package/mixins/auth.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
// @ts-expect-error TS(7016): Could not find a declaration file for module 'pass... Remove this comment to see the full error message
|
|
2
2
|
import passport from 'passport';
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
import moleculerWeb from 'moleculer-web';
|
|
4
|
+
const E = moleculerWeb.Errors;
|
|
5
5
|
import { TripleStoreAdapter } from '@semapps/triplestore';
|
|
6
|
-
import { ServiceSchema } from 'moleculer';
|
|
6
|
+
import type { ServiceSchema } from 'moleculer';
|
|
7
7
|
import AuthAccountService from '../services/account.ts';
|
|
8
8
|
import AuthJWTService from '../services/jwt.ts';
|
|
9
9
|
|
package/package.json
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@semapps/auth",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.1",
|
|
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.2.
|
|
9
|
-
"@semapps/middlewares": "1.2.
|
|
10
|
-
"@semapps/mime-types": "1.2.
|
|
11
|
-
"@semapps/triplestore": "1.2.
|
|
8
|
+
"@semapps/ldp": "1.2.1",
|
|
9
|
+
"@semapps/middlewares": "1.2.1",
|
|
10
|
+
"@semapps/mime-types": "1.2.1",
|
|
11
|
+
"@semapps/triplestore": "1.2.1",
|
|
12
12
|
"bcrypt": "^5.0.1",
|
|
13
13
|
"express-session": "^1.17.0",
|
|
14
14
|
"jsonwebtoken": "^9.0.2",
|
|
@@ -35,6 +35,10 @@
|
|
|
35
35
|
"peerDependencies": {
|
|
36
36
|
"moleculer": "^0.14.35"
|
|
37
37
|
},
|
|
38
|
-
"
|
|
38
|
+
"scripts": {
|
|
39
|
+
"prepack": "node ../../scripts/switch-main-to-publish.js .",
|
|
40
|
+
"postpack": "node ../../scripts/revert-main-from-publish.js ."
|
|
41
|
+
},
|
|
42
|
+
"gitHead": "4bbaa429345b47a365411baed1d163581ae03d9e",
|
|
39
43
|
"xDevMain": "./index.ts"
|
|
40
44
|
}
|
package/services/account.ts
CHANGED
|
@@ -5,7 +5,7 @@ import createSlug from 'speakingurl';
|
|
|
5
5
|
import DbService from 'moleculer-db';
|
|
6
6
|
import { TripleStoreAdapter } from '@semapps/triplestore';
|
|
7
7
|
import crypto from 'crypto';
|
|
8
|
-
import { ServiceSchema } from 'moleculer';
|
|
8
|
+
import type { ServiceSchema } from 'moleculer';
|
|
9
9
|
|
|
10
10
|
// Taken from https://stackoverflow.com/a/9204568/7900695
|
|
11
11
|
const emailRegexp = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
package/services/auth.cas.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
// @ts-expect-error TS(7016): Could not find a declaration file for module 'pass... Remove this comment to see the full error message
|
|
2
2
|
import { Strategy } from 'passport-cas2';
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
import { ServiceSchema } from 'moleculer';
|
|
3
|
+
import moleculerWeb from 'moleculer-web';
|
|
4
|
+
const E = moleculerWeb.Errors;
|
|
5
|
+
import type { ServiceSchema } from 'moleculer';
|
|
6
6
|
import AuthSSOMixin from '../mixins/auth.sso.ts';
|
|
7
7
|
|
|
8
8
|
const AuthCASService = {
|
package/services/auth.local.ts
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
2
|
// @ts-expect-error TS(7016): Could not find a declaration file for module 'pass... Remove this comment to see the full error message
|
|
3
3
|
import { Strategy } from 'passport-local';
|
|
4
|
-
import { ServiceSchema } from 'moleculer';
|
|
4
|
+
import type { ServiceSchema } from 'moleculer';
|
|
5
5
|
import AuthMixin from '../mixins/auth.ts';
|
|
6
6
|
import sendToken from '../middlewares/sendToken.ts';
|
|
7
7
|
import AuthMailService from './mail.ts';
|
|
8
8
|
|
|
9
|
-
import
|
|
9
|
+
import moleculer from 'moleculer';
|
|
10
|
+
const { Errors } = moleculer;
|
|
10
11
|
|
|
11
12
|
const { MoleculerError } = Errors;
|
|
12
13
|
|
package/services/auth.oidc.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import urlJoin from 'url-join';
|
|
2
|
-
// @ts-expect-error
|
|
3
|
-
import
|
|
2
|
+
// @ts-expect-error
|
|
3
|
+
import openidClient from 'openid-client';
|
|
4
|
+
const { Issuer, Strategy, custom } = openidClient;
|
|
4
5
|
|
|
5
|
-
import { ServiceSchema } from 'moleculer';
|
|
6
|
+
import type { ServiceSchema } from 'moleculer';
|
|
6
7
|
import AuthSSOMixin from '../mixins/auth.sso.ts';
|
|
7
8
|
|
|
8
9
|
custom.setHttpOptionsDefaults({
|
package/services/jwt.ts
CHANGED
|
@@ -3,7 +3,7 @@ import path from 'path';
|
|
|
3
3
|
// @ts-expect-error TS(7016): Could not find a declaration file for module 'json... Remove this comment to see the full error message
|
|
4
4
|
import jwt from 'jsonwebtoken';
|
|
5
5
|
import crypto from 'crypto';
|
|
6
|
-
import { ServiceSchema } from 'moleculer';
|
|
6
|
+
import type { ServiceSchema } from 'moleculer';
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
9
|
* Service that creates and validates JSON web tokens(JWT).
|
package/services/mail.ts
CHANGED
|
@@ -2,7 +2,7 @@ import path from 'path';
|
|
|
2
2
|
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
|
-
import { ServiceSchema } from 'moleculer';
|
|
5
|
+
import type { ServiceSchema } from 'moleculer';
|
|
6
6
|
import { fileURLToPath } from 'url';
|
|
7
7
|
|
|
8
8
|
// @ts-expect-error TS(1470): The 'import.meta' meta-property is not allowed in ... Remove this comment to see the full error message
|
package/services/migration.ts
CHANGED