nicot-simple-user 1.0.1 → 1.0.2
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/simple-user/module-builder.js +3 -4
- package/dist/simple-user/module-builder.js.map +1 -1
- package/dist/simple-user/resolver.js +2 -4
- package/dist/simple-user/resolver.js.map +1 -1
- package/dist/simple-user/simple-user.module.js +5 -0
- package/dist/simple-user/simple-user.module.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/test/app-e2e.spec.ts +158 -25
- package/Dockerfile.puppeteer +0 -45
- package/dist/app.module.d.ts +0 -2
- package/dist/app.module.js +0 -53
- package/dist/app.module.js.map +0 -1
- package/dist/main.d.ts +0 -1
- package/dist/main.js +0 -26
- package/install-npm-typeorm.sh +0 -3
|
@@ -11,12 +11,10 @@ _a = new common_1.ConfigurableModuleBuilder()
|
|
|
11
11
|
userClass: simple_user_entity_1.SimpleUser,
|
|
12
12
|
isGlobal: false,
|
|
13
13
|
}, (definition, extras) => {
|
|
14
|
+
const typeormFeatModule = typeorm_1.TypeOrmModule.forFeature([extras.userClass], extras.userConnectionName);
|
|
14
15
|
return {
|
|
15
16
|
...definition,
|
|
16
|
-
imports: [
|
|
17
|
-
...(definition.imports || []),
|
|
18
|
-
typeorm_1.TypeOrmModule.forFeature([extras.userClass], extras.userConnectionName),
|
|
19
|
-
],
|
|
17
|
+
imports: [...(definition.imports || []), typeormFeatModule],
|
|
20
18
|
providers: [
|
|
21
19
|
...(definition.providers || []),
|
|
22
20
|
{
|
|
@@ -28,6 +26,7 @@ _a = new common_1.ConfigurableModuleBuilder()
|
|
|
28
26
|
useExisting: (0, typeorm_1.getRepositoryToken)(extras.userClass, extras.userConnectionName || undefined),
|
|
29
27
|
},
|
|
30
28
|
],
|
|
29
|
+
exports: [...(definition.exports || []), typeormFeatModule],
|
|
31
30
|
};
|
|
32
31
|
})
|
|
33
32
|
.build(), exports.ConfigurableModuleClass = _a.ConfigurableModuleClass, exports.MODULE_OPTIONS_TOKEN = _a.MODULE_OPTIONS_TOKEN;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-builder.js","sourceRoot":"","sources":["../../src/simple-user/module-builder.ts"],"names":[],"mappings":";;;;AAAA,2CAA2D;AAE3D,6DAAkD;AAClD,qCAAyD;AACzD,6CAAoE;AAEvD,KACX,IAAI,kCAAyB,EAAqB;KAC/C,SAAS,CACR;IACE,SAAS,EAAE,+BAAU;IACrB,QAAQ,EAAE,KAAK;CAChB,EACD,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE;IACrB,
|
|
1
|
+
{"version":3,"file":"module-builder.js","sourceRoot":"","sources":["../../src/simple-user/module-builder.ts"],"names":[],"mappings":";;;;AAAA,2CAA2D;AAE3D,6DAAkD;AAClD,qCAAyD;AACzD,6CAAoE;AAEvD,KACX,IAAI,kCAAyB,EAAqB;KAC/C,SAAS,CACR;IACE,SAAS,EAAE,+BAAU;IACrB,QAAQ,EAAE,KAAK;CAChB,EACD,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE;IACrB,MAAM,iBAAiB,GAAG,uBAAa,CAAC,UAAU,CAChD,CAAC,MAAM,CAAC,SAAS,CAAC,EAClB,MAAM,CAAC,kBAAkB,CAC1B,CAAC;IACF,OAAO;QACL,GAAG,UAAU;QACb,OAAO,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,iBAAiB,CAAC;QAC3D,SAAS,EAAE;YACT,GAAG,CAAC,UAAU,CAAC,SAAS,IAAI,EAAE,CAAC;YAC/B;gBACE,OAAO,EAAE,uBAAc;gBACvB,QAAQ,EAAE,MAAM;aACjB;YACD;gBACE,OAAO,EAAE,sBAAa;gBACtB,WAAW,EAAE,IAAA,4BAAkB,EAC7B,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,kBAAkB,IAAI,SAAS,CACvC;aACF;SACF;QACD,OAAO,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,iBAAiB,CAAC;KAC5D,CAAC;AACJ,CAAC,CACF;KACA,KAAK,EAAE,EAjCG,+BAAuB,+BAAE,4BAAoB,2BAiC/C"}
|
|
@@ -32,8 +32,7 @@ exports.userResolver = new nicot_1.TransformParamResolver(exports.userContextRes
|
|
|
32
32
|
return await userService.findOrCreateUser(ctx);
|
|
33
33
|
}).addExtraDecorator(() => (0, nicot_1.ApiError)(401, 'Invalid user token'), '__simple_user_401__');
|
|
34
34
|
exports.userResolverProvider = exports.userResolver.toRequestScopedProvider();
|
|
35
|
-
|
|
36
|
-
exports.InjectCurrentUser = InjectCurrentUser;
|
|
35
|
+
exports.InjectCurrentUser = exports.userResolverProvider.inject;
|
|
37
36
|
exports.PutCurrentUser = exports.userResolver.toParamDecorator();
|
|
38
37
|
exports.ApiCurrentUser = exports.userResolver.toApiPropertyDecorator();
|
|
39
38
|
exports.userRiskControlResolver = new nicot_1.CombinedParamResolver({
|
|
@@ -41,8 +40,7 @@ exports.userRiskControlResolver = new nicot_1.CombinedParamResolver({
|
|
|
41
40
|
ssaid: exports.userSsaidResolver,
|
|
42
41
|
});
|
|
43
42
|
exports.userRiskControlResolverProvider = exports.userRiskControlResolver.toRequestScopedProvider();
|
|
44
|
-
|
|
45
|
-
exports.InjectRiskControlContext = InjectRiskControlContext;
|
|
43
|
+
exports.InjectRiskControlContext = exports.userRiskControlResolverProvider.inject;
|
|
46
44
|
exports.PutRiskControlContext = exports.userRiskControlResolver.toParamDecorator();
|
|
47
45
|
exports.ApiRiskControlContext = exports.userRiskControlResolver.toApiPropertyDecorator();
|
|
48
46
|
//# sourceMappingURL=resolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/simple-user/resolver.ts"],"names":[],"mappings":";;;AAAA,iCAOe;AACf,2EAAsE;AACtE,uCAAgD;AAEnC,QAAA,iBAAiB,GAAG,IAAI,qBAAa,CAAC;IACjD,SAAS,EAAE,QAAQ;IACnB,SAAS,EAAE,gBAAgB;IAC3B,WAAW,EAAE,2DAA2D;CACzE,CAAC,CAAC;AAEU,QAAA,iBAAiB,GAAG,IAAI,qBAAa,CAAC;IACjD,SAAS,EAAE,QAAQ;IACnB,SAAS,EAAE,gBAAgB;IAC3B,WAAW,EACT,uEAAuE;IACzE,QAAQ,EAAE,IAAI;CACf,CAAC,CAAC;AAEU,QAAA,UAAU,GAAG,IAAI,qBAAa,CAAC,CAAC,GAAG,EAAE,EAAE;IAClD,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;IAClB,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC,CAAC;AAEU,QAAA,mBAAmB,GAAG,IAAI,6BAAqB,CAAC;IAC3D,KAAK,EAAE,yBAAiB;IACxB,KAAK,EAAE,yBAAiB;IACxB,EAAE,EAAE,kBAAU;CACf,CAAC,CAAC;AAMU,QAAA,YAAY,GAAG,IAAI,8BAAsB,CACpD,2BAAmB,EACnB,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACtB,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,OAAO,CACnC,uCAAiB,EACjB,uBAAgB,CAAC,YAAY,CAAC,GAAG,CAAC,EAClC,EAAE,MAAM,EAAE,KAAK,EAAE,CAClB,CAAC;IACF,OAAO,MAAM,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;AACjD,CAAC,CACF,CAAC,iBAAiB,CACjB,GAAG,EAAE,CAAC,IAAA,gBAAQ,EAAC,GAAG,EAAE,oBAAoB,CAAC,EACzC,qBAAqB,CACtB,CAAC;AAEW,QAAA,oBAAoB,GAAG,oBAAY,CAAC,uBAAuB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/simple-user/resolver.ts"],"names":[],"mappings":";;;AAAA,iCAOe;AACf,2EAAsE;AACtE,uCAAgD;AAEnC,QAAA,iBAAiB,GAAG,IAAI,qBAAa,CAAC;IACjD,SAAS,EAAE,QAAQ;IACnB,SAAS,EAAE,gBAAgB;IAC3B,WAAW,EAAE,2DAA2D;CACzE,CAAC,CAAC;AAEU,QAAA,iBAAiB,GAAG,IAAI,qBAAa,CAAC;IACjD,SAAS,EAAE,QAAQ;IACnB,SAAS,EAAE,gBAAgB;IAC3B,WAAW,EACT,uEAAuE;IACzE,QAAQ,EAAE,IAAI;CACf,CAAC,CAAC;AAEU,QAAA,UAAU,GAAG,IAAI,qBAAa,CAAC,CAAC,GAAG,EAAE,EAAE;IAClD,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;IAClB,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC,CAAC;AAEU,QAAA,mBAAmB,GAAG,IAAI,6BAAqB,CAAC;IAC3D,KAAK,EAAE,yBAAiB;IACxB,KAAK,EAAE,yBAAiB;IACxB,EAAE,EAAE,kBAAU;CACf,CAAC,CAAC;AAMU,QAAA,YAAY,GAAG,IAAI,8BAAsB,CACpD,2BAAmB,EACnB,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACtB,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,OAAO,CACnC,uCAAiB,EACjB,uBAAgB,CAAC,YAAY,CAAC,GAAG,CAAC,EAClC,EAAE,MAAM,EAAE,KAAK,EAAE,CAClB,CAAC;IACF,OAAO,MAAM,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;AACjD,CAAC,CACF,CAAC,iBAAiB,CACjB,GAAG,EAAE,CAAC,IAAA,gBAAQ,EAAC,GAAG,EAAE,oBAAoB,CAAC,EACzC,qBAAqB,CACtB,CAAC;AAEW,QAAA,oBAAoB,GAAG,oBAAY,CAAC,uBAAuB,EAAE,CAAC;AAC9D,QAAA,iBAAiB,GAAG,4BAAoB,CAAC,MAAM,CAAC;AAChD,QAAA,cAAc,GAAG,oBAAY,CAAC,gBAAgB,EAAE,CAAC;AACjD,QAAA,cAAc,GAAG,oBAAY,CAAC,sBAAsB,EAAE,CAAC;AAEvD,QAAA,uBAAuB,GAAG,IAAI,6BAAqB,CAAC;IAC/D,EAAE,EAAE,kBAAU;IACd,KAAK,EAAE,yBAAiB;CACzB,CAAC,CAAC;AAKU,QAAA,+BAA+B,GAC1C,+BAAuB,CAAC,uBAAuB,EAAE,CAAC;AACvC,QAAA,wBAAwB,GAAG,uCAA+B,CAAC,MAAM,CAAC;AAClE,QAAA,qBAAqB,GAAG,+BAAuB,CAAC,gBAAgB,EAAE,CAAC;AACnE,QAAA,qBAAqB,GAChC,+BAAuB,CAAC,sBAAsB,EAAE,CAAC"}
|
|
@@ -18,6 +18,7 @@ const user_center_controller_1 = require("./user-center/user-center.controller")
|
|
|
18
18
|
const resolver_1 = require("./resolver");
|
|
19
19
|
const tokens_1 = require("./tokens");
|
|
20
20
|
const patch_me_1 = require("./user-center/patch-me");
|
|
21
|
+
const nicot_1 = require("nicot");
|
|
21
22
|
const patchUserCenterControllerMeWithDynamicModule = (module) => {
|
|
22
23
|
const userExProvider = module.providers?.find((p) => p.provide === tokens_1.OptionsExToken);
|
|
23
24
|
if (userExProvider?.useValue) {
|
|
@@ -33,6 +34,10 @@ let SimpleUserModule = class SimpleUserModule extends module_builder_1.Configura
|
|
|
33
34
|
static registerAsync(options) {
|
|
34
35
|
const base = super.registerAsync(options);
|
|
35
36
|
patchUserCenterControllerMeWithDynamicModule(base);
|
|
37
|
+
if (options.inject) {
|
|
38
|
+
const normalizedInject = options.inject.map((t) => (t?.token || t));
|
|
39
|
+
(0, nicot_1.addInjectionTokenMapping)(module_builder_1.MODULE_OPTIONS_TOKEN, normalizedInject);
|
|
40
|
+
}
|
|
36
41
|
return (0, aragami_init_1.attachAragamiWithBridge)(base);
|
|
37
42
|
}
|
|
38
43
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simple-user.module.js","sourceRoot":"","sources":["../../src/simple-user/simple-user.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"simple-user.module.js","sourceRoot":"","sources":["../../src/simple-user/simple-user.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAKwB;AACxB,qDAG0B;AAC1B,iDAAyD;AACzD,2EAAsE;AACtE,qEAAgE;AAChE,2EAAsE;AACtE,+DAA2D;AAC3D,iFAA4E;AAC5E,yCAGoB;AACpB,qCAA0C;AAE1C,qDAAqE;AACrE,iCAAiD;AAUjD,MAAM,4CAA4C,GAAG,CACnD,MAAqB,EACrB,EAAE;IACF,MAAM,cAAc,GAAG,MAAM,CAAC,SAAS,EAAE,IAAI,CAC3C,CAAC,CAAgB,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,uBAAc,CAClC,CAAC;IACnB,IAAI,cAAc,EAAE,QAAQ,EAAE,CAAC;QAC7B,IAAA,sCAA2B,EAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IACvD,CAAC;AACH,CAAC,CAAC;AAgBK,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,wCAAuB;IAC3D,MAAM,CAAC,QAAQ,CAAC,OAAkC;QAChD,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACrC,4CAA4C,CAAC,IAAI,CAAC,CAAC;QACnD,OAAO,IAAA,sCAAuB,EAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,OAAuC;QAC1D,MAAM,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC1C,4CAA4C,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,CAA+B,EAAE,KAAK,IAAI,CAAC,CAAmB,CACxE,CAAC;YACF,IAAA,gCAAwB,EAAC,qCAAoB,EAAE,gBAAgB,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,IAAA,sCAAuB,EAAC,IAAI,CAAC,CAAC;IACvC,CAAC;CACF,CAAA;AAlBY,4CAAgB;2BAAhB,gBAAgB;IAd5B,IAAA,eAAM,EAAC;QACN,SAAS,EAAE;YACT,uCAAiB;YACjB,mCAAe;YACf,+BAAoB,CAAC,QAAQ;YAC7B,0CAA+B,CAAC,QAAQ;SACzC;QACD,OAAO,EAAE;YACP,uCAAiB;YACjB,+BAAoB,CAAC,QAAQ;YAC7B,0CAA+B,CAAC,QAAQ;SACzC;QACD,WAAW,EAAE,CAAC,yCAAkB,EAAE,kCAAe,EAAE,6CAAoB,CAAC;KACzE,CAAC;GACW,gBAAgB,CAkB5B"}
|