cnpmcore 4.1.1 → 4.1.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/app/common/AbstractService.d.ts +1 -1
- package/dist/app/common/AbstractService.js +2 -2
- package/dist/app/common/ErrorUtil.js +6 -6
- package/dist/app/common/FileUtil.d.ts +1 -1
- package/dist/app/common/FileUtil.js +8 -6
- package/dist/app/common/PackageUtil.js +5 -6
- package/dist/app/common/SyncUtil.d.ts +1 -1
- package/dist/app/common/UserUtil.js +4 -4
- package/dist/app/common/adapter/BugVersionStore.d.ts +1 -1
- package/dist/app/common/adapter/NFSAdapter.d.ts +2 -2
- package/dist/app/common/adapter/NFSAdapter.js +2 -2
- package/dist/app/common/adapter/NPMRegistry.d.ts +2 -2
- package/dist/app/common/adapter/NPMRegistry.js +4 -4
- package/dist/app/common/adapter/binary/AbstractBinary.d.ts +5 -5
- package/dist/app/common/adapter/binary/AbstractBinary.js +1 -1
- package/dist/app/common/adapter/binary/ApiBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/ApiBinary.js +3 -2
- package/dist/app/common/adapter/binary/BucketBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/BucketBinary.js +1 -1
- package/dist/app/common/adapter/binary/ChromeForTestingBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/ChromeForTestingBinary.js +4 -2
- package/dist/app/common/adapter/binary/CypressBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/CypressBinary.js +5 -3
- package/dist/app/common/adapter/binary/EdgedriverBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/EdgedriverBinary.js +2 -2
- package/dist/app/common/adapter/binary/ElectronBinary.d.ts +2 -2
- package/dist/app/common/adapter/binary/ElectronBinary.js +3 -2
- package/dist/app/common/adapter/binary/GithubBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/GithubBinary.js +3 -2
- package/dist/app/common/adapter/binary/ImageminBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/ImageminBinary.js +1 -1
- package/dist/app/common/adapter/binary/NodeBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/NodeBinary.js +2 -2
- package/dist/app/common/adapter/binary/NodePreGypBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/NodePreGypBinary.js +35 -22
- package/dist/app/common/adapter/binary/NwjsBinary.d.ts +1 -1
- package/dist/app/common/adapter/binary/NwjsBinary.js +5 -3
- package/dist/app/common/adapter/binary/PlaywrightBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/PlaywrightBinary.js +94 -72
- package/dist/app/common/adapter/binary/PrismaBinary.d.ts +3 -2
- package/dist/app/common/adapter/binary/PrismaBinary.js +4 -3
- package/dist/app/common/adapter/binary/PuppeteerBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/PuppeteerBinary.js +4 -2
- package/dist/app/common/adapter/binary/SqlcipherBinary.d.ts +2 -1
- package/dist/app/common/adapter/binary/SqlcipherBinary.js +2 -2
- package/dist/app/common/adapter/changesStream/AbstractChangesStream.d.ts +4 -4
- package/dist/app/common/adapter/changesStream/AbstractChangesStream.js +2 -2
- package/dist/app/common/adapter/changesStream/CnpmcoreChangesStream.d.ts +1 -1
- package/dist/app/common/adapter/changesStream/CnpmcoreChangesStream.js +3 -3
- package/dist/app/common/adapter/changesStream/CnpmjsorgChangesStream.d.ts +1 -1
- package/dist/app/common/adapter/changesStream/CnpmjsorgChangesStream.js +3 -3
- package/dist/app/common/adapter/changesStream/NpmChangesStream.d.ts +3 -2
- package/dist/app/common/adapter/changesStream/NpmChangesStream.js +3 -3
- package/dist/app/common/aop/AsyncTimer.d.ts +1 -1
- package/dist/app/common/aop/AsyncTimer.js +1 -1
- package/dist/app/common/typing.d.ts +5 -5
- package/dist/app/core/entity/Binary.d.ts +3 -2
- package/dist/app/core/entity/Binary.js +1 -1
- package/dist/app/core/entity/Change.d.ts +3 -2
- package/dist/app/core/entity/Change.js +1 -1
- package/dist/app/core/entity/Dist.d.ts +3 -2
- package/dist/app/core/entity/Dist.js +1 -1
- package/dist/app/core/entity/Hook.d.ts +4 -3
- package/dist/app/core/entity/Hook.js +3 -2
- package/dist/app/core/entity/Package.d.ts +3 -2
- package/dist/app/core/entity/Package.js +3 -2
- package/dist/app/core/entity/PackageTag.d.ts +3 -2
- package/dist/app/core/entity/PackageTag.js +1 -1
- package/dist/app/core/entity/PackageVersion.d.ts +4 -3
- package/dist/app/core/entity/PackageVersion.js +1 -1
- package/dist/app/core/entity/PackageVersionBlock.d.ts +3 -2
- package/dist/app/core/entity/PackageVersionBlock.js +1 -1
- package/dist/app/core/entity/PackageVersionFile.d.ts +4 -3
- package/dist/app/core/entity/PackageVersionFile.js +4 -2
- package/dist/app/core/entity/PackageVersionManifest.d.ts +3 -2
- package/dist/app/core/entity/PackageVersionManifest.js +1 -1
- package/dist/app/core/entity/PaddingSemVer.js +2 -2
- package/dist/app/core/entity/ProxyCache.d.ts +4 -3
- package/dist/app/core/entity/ProxyCache.js +1 -1
- package/dist/app/core/entity/Registry.d.ts +3 -2
- package/dist/app/core/entity/Registry.js +1 -1
- package/dist/app/core/entity/Scope.d.ts +3 -2
- package/dist/app/core/entity/Scope.js +1 -1
- package/dist/app/core/entity/Task.d.ts +4 -3
- package/dist/app/core/entity/Task.js +1 -1
- package/dist/app/core/entity/Token.d.ts +3 -2
- package/dist/app/core/entity/Token.js +4 -2
- package/dist/app/core/entity/User.d.ts +3 -2
- package/dist/app/core/entity/User.js +1 -1
- package/dist/app/core/entity/WebauthnCredential.d.ts +3 -2
- package/dist/app/core/entity/WebauthnCredential.js +1 -1
- package/dist/app/core/event/BugVersionFixHandler.js +2 -3
- package/dist/app/core/event/CacheCleaner.js +2 -3
- package/dist/app/core/event/ChangesStream.d.ts +4 -4
- package/dist/app/core/event/ChangesStream.js +15 -9
- package/dist/app/core/event/StoreManifest.d.ts +1 -1
- package/dist/app/core/event/StoreManifest.js +3 -5
- package/dist/app/core/event/SyncESPackage.d.ts +2 -2
- package/dist/app/core/event/SyncESPackage.js +2 -3
- package/dist/app/core/event/SyncPackageVersionFile.d.ts +1 -1
- package/dist/app/core/event/SyncPackageVersionFile.js +6 -7
- package/dist/app/core/event/index.d.ts +1 -1
- package/dist/app/core/service/BinarySyncerService.d.ts +1 -1
- package/dist/app/core/service/BinarySyncerService.js +10 -15
- package/dist/app/core/service/BugVersionService.js +5 -9
- package/dist/app/core/service/CacheService.d.ts +1 -1
- package/dist/app/core/service/CacheService.js +27 -26
- package/dist/app/core/service/ChangesStreamService.d.ts +2 -2
- package/dist/app/core/service/ChangesStreamService.js +13 -18
- package/dist/app/core/service/CreateHookTriggerService.d.ts +1 -1
- package/dist/app/core/service/CreateHookTriggerService.js +4 -7
- package/dist/app/core/service/EventCorkerAdvice.d.ts +1 -1
- package/dist/app/core/service/EventCorkerAdvice.js +1 -1
- package/dist/app/core/service/FixNoPaddingVersionService.js +5 -4
- package/dist/app/core/service/HookManageService.d.ts +1 -1
- package/dist/app/core/service/HookManageService.js +3 -4
- package/dist/app/core/service/HookTriggerService.d.ts +3 -3
- package/dist/app/core/service/HookTriggerService.js +6 -11
- package/dist/app/core/service/PackageManagerService.d.ts +4 -4
- package/dist/app/core/service/PackageManagerService.js +54 -32
- package/dist/app/core/service/PackageSearchService.d.ts +3 -3
- package/dist/app/core/service/PackageSearchService.js +11 -13
- package/dist/app/core/service/PackageSyncerService.d.ts +4 -3
- package/dist/app/core/service/PackageSyncerService.js +76 -53
- package/dist/app/core/service/PackageVersionFileService.d.ts +2 -2
- package/dist/app/core/service/PackageVersionFileService.js +13 -17
- package/dist/app/core/service/PackageVersionService.d.ts +1 -1
- package/dist/app/core/service/PackageVersionService.js +6 -11
- package/dist/app/core/service/ProxyCacheService.d.ts +3 -2
- package/dist/app/core/service/ProxyCacheService.js +38 -25
- package/dist/app/core/service/RegistryManagerService.d.ts +1 -1
- package/dist/app/core/service/RegistryManagerService.js +19 -15
- package/dist/app/core/service/ScopeManagerService.d.ts +1 -1
- package/dist/app/core/service/ScopeManagerService.js +3 -4
- package/dist/app/core/service/TaskService.js +8 -8
- package/dist/app/core/service/TokenService.d.ts +1 -1
- package/dist/app/core/service/TokenService.js +6 -5
- package/dist/app/core/service/UserService.d.ts +4 -3
- package/dist/app/core/service/UserService.js +6 -8
- package/dist/app/core/util/EntityUtil.d.ts +1 -1
- package/dist/app/core/util/EntityUtil.js +1 -1
- package/dist/app/infra/AuthAdapter.d.ts +3 -3
- package/dist/app/infra/AuthAdapter.js +3 -4
- package/dist/app/infra/NFSClientAdapter.d.ts +2 -2
- package/dist/app/infra/NFSClientAdapter.js +3 -3
- package/dist/app/infra/QueueAdapter.d.ts +1 -1
- package/dist/app/infra/QueueAdapter.js +3 -4
- package/dist/app/infra/SearchAdapter.d.ts +2 -2
- package/dist/app/infra/SearchAdapter.js +6 -7
- package/dist/app/port/UserRoleManager.d.ts +5 -5
- package/dist/app/port/UserRoleManager.js +7 -9
- package/dist/app/port/config.d.ts +6 -6
- package/dist/app/port/config.js +1 -1
- package/dist/app/port/controller/AbstractController.d.ts +8 -8
- package/dist/app/port/controller/AbstractController.js +16 -15
- package/dist/app/port/controller/BinarySyncController.d.ts +2 -2
- package/dist/app/port/controller/BinarySyncController.js +5 -4
- package/dist/app/port/controller/ChangesStreamController.d.ts +1 -1
- package/dist/app/port/controller/ChangesStreamController.js +2 -3
- package/dist/app/port/controller/DownloadController.js +3 -4
- package/dist/app/port/controller/HomeController.d.ts +2 -2
- package/dist/app/port/controller/HomeController.js +3 -5
- package/dist/app/port/controller/HookController.d.ts +1 -1
- package/dist/app/port/controller/HookController.js +7 -10
- package/dist/app/port/controller/PackageBlockController.d.ts +2 -2
- package/dist/app/port/controller/PackageBlockController.js +3 -5
- package/dist/app/port/controller/PackageSyncController.d.ts +2 -2
- package/dist/app/port/controller/PackageSyncController.js +13 -11
- package/dist/app/port/controller/PackageTagController.d.ts +1 -1
- package/dist/app/port/controller/PackageTagController.js +2 -3
- package/dist/app/port/controller/PackageVersionFileController.d.ts +1 -1
- package/dist/app/port/controller/PackageVersionFileController.js +12 -10
- package/dist/app/port/controller/ProxyCacheController.d.ts +3 -3
- package/dist/app/port/controller/ProxyCacheController.js +5 -8
- package/dist/app/port/controller/RegistryController.d.ts +5 -4
- package/dist/app/port/controller/RegistryController.js +22 -11
- package/dist/app/port/controller/ScopeController.d.ts +2 -2
- package/dist/app/port/controller/ScopeController.js +7 -6
- package/dist/app/port/controller/TokenController.d.ts +2 -2
- package/dist/app/port/controller/TokenController.js +11 -7
- package/dist/app/port/controller/UserController.d.ts +2 -2
- package/dist/app/port/controller/UserController.js +2 -2
- package/dist/app/port/controller/admin/PaddingVersionController.d.ts +1 -1
- package/dist/app/port/controller/admin/PaddingVersionController.js +2 -3
- package/dist/app/port/controller/convertor/HookConvertor.d.ts +4 -4
- package/dist/app/port/controller/convertor/HookConvertor.js +1 -1
- package/dist/app/port/controller/package/DownloadPackageVersionTar.d.ts +2 -2
- package/dist/app/port/controller/package/DownloadPackageVersionTar.js +8 -13
- package/dist/app/port/controller/package/RemovePackageVersionController.d.ts +1 -1
- package/dist/app/port/controller/package/RemovePackageVersionController.js +5 -5
- package/dist/app/port/controller/package/SavePackageVersionController.d.ts +3 -3
- package/dist/app/port/controller/package/SavePackageVersionController.js +27 -15
- package/dist/app/port/controller/package/SearchPackageController.d.ts +3 -3
- package/dist/app/port/controller/package/SearchPackageController.js +2 -3
- package/dist/app/port/controller/package/ShowPackageController.d.ts +1 -1
- package/dist/app/port/controller/package/ShowPackageController.js +13 -11
- package/dist/app/port/controller/package/ShowPackageVersionController.d.ts +1 -1
- package/dist/app/port/controller/package/ShowPackageVersionController.js +3 -5
- package/dist/app/port/controller/package/UpdatePackageController.d.ts +2 -2
- package/dist/app/port/controller/package/UpdatePackageController.js +5 -5
- package/dist/app/port/middleware/AdminAccess.d.ts +1 -1
- package/dist/app/port/middleware/AlwaysAuth.d.ts +1 -1
- package/dist/app/port/middleware/AlwaysAuth.js +1 -1
- package/dist/app/port/middleware/ErrorHandler.d.ts +1 -1
- package/dist/app/port/middleware/ErrorHandler.js +13 -5
- package/dist/app/port/middleware/Tracing.d.ts +1 -1
- package/dist/app/port/middleware/Tracing.js +1 -1
- package/dist/app/port/schedule/ChangesStreamWorker.js +4 -4
- package/dist/app/port/schedule/CheckProxyCacheUpdateWorker.js +11 -7
- package/dist/app/port/schedule/CheckRecentlyUpdatedPackages.js +10 -7
- package/dist/app/port/schedule/CleanTempDir.js +1 -1
- package/dist/app/port/schedule/CreateSyncBinaryTask.js +2 -3
- package/dist/app/port/schedule/CreateTriggerHookWorker.js +9 -9
- package/dist/app/port/schedule/SavePackageVersionDownloadCounter.js +2 -3
- package/dist/app/port/schedule/SyncBinaryWorker.js +2 -3
- package/dist/app/port/schedule/SyncPackageWorker.js +4 -4
- package/dist/app/port/schedule/SyncProxyCacheWorker.js +4 -4
- package/dist/app/port/schedule/TaskTimeoutHandler.js +3 -5
- package/dist/app/port/schedule/TriggerHookWorker.js +7 -8
- package/dist/app/port/schedule/UpdateTotalData.js +11 -15
- package/dist/app/port/typebox.d.ts +2 -2
- package/dist/app/port/typebox.js +5 -2
- package/dist/app/port/webauth/WebauthController.d.ts +4 -4
- package/dist/app/port/webauth/WebauthController.js +52 -21
- package/dist/app/repository/AbstractRepository.d.ts +1 -1
- package/dist/app/repository/AbstractRepository.js +2 -2
- package/dist/app/repository/ChangeRepository.d.ts +1 -1
- package/dist/app/repository/ChangeRepository.js +4 -2
- package/dist/app/repository/DistRepository.d.ts +2 -2
- package/dist/app/repository/DistRepository.js +3 -5
- package/dist/app/repository/HookRepository.d.ts +1 -1
- package/dist/app/repository/HookRepository.js +1 -1
- package/dist/app/repository/PackageRepository.d.ts +2 -2
- package/dist/app/repository/PackageRepository.js +68 -27
- package/dist/app/repository/PackageVersionRepository.d.ts +2 -2
- package/dist/app/repository/PackageVersionRepository.js +12 -13
- package/dist/app/repository/ProxyCacheRepository.d.ts +2 -2
- package/dist/app/repository/ProxyCacheRepository.js +28 -10
- package/dist/app/repository/RegistryRepository.d.ts +3 -2
- package/dist/app/repository/RegistryRepository.js +1 -1
- package/dist/app/repository/ScopeRepository.d.ts +2 -2
- package/dist/app/repository/ScopeRepository.js +4 -2
- package/dist/app/repository/SearchRepository.d.ts +2 -2
- package/dist/app/repository/SearchRepository.js +1 -1
- package/dist/app/repository/TaskRepository.d.ts +3 -2
- package/dist/app/repository/TaskRepository.js +1 -1
- package/dist/app/repository/UserRepository.js +8 -5
- package/dist/app/repository/model/HistoryTask.d.ts +1 -1
- package/dist/app/repository/model/HistoryTask.js +1 -2
- package/dist/app/repository/model/Hook.d.ts +1 -1
- package/dist/app/repository/model/Hook.js +1 -2
- package/dist/app/repository/model/ProxyCache.d.ts +1 -1
- package/dist/app/repository/model/ProxyCache.js +1 -2
- package/dist/app/repository/model/Registry.d.ts +1 -1
- package/dist/app/repository/model/Registry.js +1 -2
- package/dist/app/repository/model/Task.d.ts +1 -1
- package/dist/app/repository/model/Task.js +1 -2
- package/dist/app/repository/util/EntityProperty.js +1 -1
- package/dist/app/repository/util/ModelConvertor.d.ts +2 -2
- package/dist/app/repository/util/ModelConvertor.js +7 -4
- package/dist/app/repository/util/ModelConvertorUtil.d.ts +1 -1
- package/dist/app/repository/util/ModelConvertorUtil.js +1 -1
- package/dist/app.d.ts +1 -1
- package/dist/app.js +1 -1
- package/dist/config/config.default.d.ts +3 -3
- package/dist/config/config.default.js +5 -9
- package/dist/config/config.unittest.d.ts +2 -3
- package/dist/config/config.unittest.js +3 -3
- package/dist/config/plugin.d.ts +1 -1
- package/package.json +18 -10
|
@@ -17,10 +17,7 @@ import { createHash } from 'node:crypto';
|
|
|
17
17
|
import base64url from 'base64url';
|
|
18
18
|
import { generateRegistrationOptions, verifyRegistrationResponse, generateAuthenticationOptions, verifyAuthenticationResponse, } from '@simplewebauthn/server';
|
|
19
19
|
import { LoginResultCode, WanStatusCode } from '../../common/enum/User.js';
|
|
20
|
-
import { CacheAdapter } from '../../common/adapter/CacheAdapter.js';
|
|
21
|
-
import { UserService } from '../../core/service/UserService.js';
|
|
22
20
|
import { MiddlewareController } from '../middleware/index.js';
|
|
23
|
-
import { AuthAdapter } from '../../infra/AuthAdapter.js';
|
|
24
21
|
import { genRSAKeys, decryptRSA } from '../../common/CryptoUtil.js';
|
|
25
22
|
import { getBrowserTypeForWebauthn } from '../../common/UserUtil.js';
|
|
26
23
|
const LoginRequestRule = Type.Object({
|
|
@@ -61,9 +58,12 @@ let WebauthController = class WebauthController extends MiddlewareController {
|
|
|
61
58
|
ctx.tValidate(SessionRule, { sessionId });
|
|
62
59
|
const sessionToken = await this.cacheAdapter.get(sessionId);
|
|
63
60
|
if (typeof sessionToken !== 'string') {
|
|
64
|
-
return {
|
|
61
|
+
return {
|
|
62
|
+
ok: false,
|
|
63
|
+
message: 'Session not found, please try again on your command line',
|
|
64
|
+
};
|
|
65
65
|
}
|
|
66
|
-
const { accData, wanCredentialRegiData, wanCredentialAuthData, needUnbindWan } = loginImplementRequest;
|
|
66
|
+
const { accData, wanCredentialRegiData, wanCredentialAuthData, needUnbindWan, } = loginImplementRequest;
|
|
67
67
|
const { username, password = '' } = accData;
|
|
68
68
|
const enableWebAuthn = this.config.cnpmcore.enableWebAuthn;
|
|
69
69
|
const isSupportWebAuthn = ctx.protocol === 'https' || ctx.hostname === 'localhost';
|
|
@@ -83,11 +83,17 @@ let WebauthController = class WebauthController extends MiddlewareController {
|
|
|
83
83
|
if (enableWebAuthn && isSupportWebAuthn && wanCredentialAuthData) {
|
|
84
84
|
user = await this.userService.findUserByName(username);
|
|
85
85
|
if (!user) {
|
|
86
|
-
return {
|
|
86
|
+
return {
|
|
87
|
+
ok: false,
|
|
88
|
+
message: 'Unauthorized, Please check your login name',
|
|
89
|
+
};
|
|
87
90
|
}
|
|
88
91
|
const credential = await this.userService.findWebauthnCredential(user.userId, browserType);
|
|
89
92
|
if (!credential?.credentialId || !credential?.publicKey) {
|
|
90
|
-
return {
|
|
93
|
+
return {
|
|
94
|
+
ok: false,
|
|
95
|
+
message: 'Unauthorized, Please check your login name',
|
|
96
|
+
};
|
|
91
97
|
}
|
|
92
98
|
try {
|
|
93
99
|
const verification = await verifyAuthenticationResponse({
|
|
@@ -105,12 +111,18 @@ let WebauthController = class WebauthController extends MiddlewareController {
|
|
|
105
111
|
});
|
|
106
112
|
const { verified } = verification;
|
|
107
113
|
if (!verified) {
|
|
108
|
-
return {
|
|
114
|
+
return {
|
|
115
|
+
ok: false,
|
|
116
|
+
message: 'Invalid security arguments, please try again on your browser',
|
|
117
|
+
};
|
|
109
118
|
}
|
|
110
119
|
}
|
|
111
120
|
catch (err) {
|
|
112
121
|
this.logger.error('[WebauthController.loginImplement:verify-authentication-fail] expectedChallenge: %s, expectedOrigin: %s, expectedRPID: %s, wanCredentialAuthData: %j, error: %j', expectedChallenge, expectedOrigin, expectedRPID, wanCredentialAuthData, err);
|
|
113
|
-
return {
|
|
122
|
+
return {
|
|
123
|
+
ok: false,
|
|
124
|
+
message: 'Authentication failed, please continue to sign in with your password',
|
|
125
|
+
};
|
|
114
126
|
}
|
|
115
127
|
const createToken = await this.userService.createToken(user.userId);
|
|
116
128
|
token = createToken.token;
|
|
@@ -120,7 +132,10 @@ let WebauthController = class WebauthController extends MiddlewareController {
|
|
|
120
132
|
// check privateKey valid
|
|
121
133
|
const privateKey = await this.cacheAdapter.get(`${sessionId}_privateKey`);
|
|
122
134
|
if (!privateKey) {
|
|
123
|
-
return {
|
|
135
|
+
return {
|
|
136
|
+
ok: false,
|
|
137
|
+
message: 'Invalid security arguments, please try again on your browser',
|
|
138
|
+
};
|
|
124
139
|
}
|
|
125
140
|
// check login name and password valid
|
|
126
141
|
const realPassword = decryptRSA(privateKey, password);
|
|
@@ -137,7 +152,10 @@ let WebauthController = class WebauthController extends MiddlewareController {
|
|
|
137
152
|
const result = await this.userService.login(username, realPassword);
|
|
138
153
|
// user exists and password not match
|
|
139
154
|
if (result.code === LoginResultCode.Fail) {
|
|
140
|
-
return {
|
|
155
|
+
return {
|
|
156
|
+
ok: false,
|
|
157
|
+
message: 'Please check your login name and password',
|
|
158
|
+
};
|
|
141
159
|
}
|
|
142
160
|
if (result.code === LoginResultCode.Success) {
|
|
143
161
|
// login success
|
|
@@ -195,12 +213,17 @@ let WebauthController = class WebauthController extends MiddlewareController {
|
|
|
195
213
|
ctx.tValidate(SessionRule, { sessionId });
|
|
196
214
|
const sessionToken = await this.cacheAdapter.get(sessionId);
|
|
197
215
|
if (typeof sessionToken !== 'string') {
|
|
198
|
-
return {
|
|
216
|
+
return {
|
|
217
|
+
ok: false,
|
|
218
|
+
message: 'Session not found, please try again on your command line',
|
|
219
|
+
};
|
|
199
220
|
}
|
|
200
221
|
const browserType = getBrowserTypeForWebauthn(ctx.headers['user-agent']);
|
|
201
222
|
const expectedRPID = new URL(this.config.cnpmcore.registry).hostname;
|
|
202
223
|
const user = await this.userService.findUserByName(name);
|
|
203
|
-
const result = {
|
|
224
|
+
const result = {
|
|
225
|
+
wanStatus: WanStatusCode.UserNotFound,
|
|
226
|
+
};
|
|
204
227
|
let credential;
|
|
205
228
|
if (user) {
|
|
206
229
|
credential = await this.userService.findWebauthnCredential(user.userId, browserType);
|
|
@@ -211,18 +234,22 @@ let WebauthController = class WebauthController extends MiddlewareController {
|
|
|
211
234
|
result.wanCredentialAuthOption = generateAuthenticationOptions({
|
|
212
235
|
timeout: 60000,
|
|
213
236
|
rpID: expectedRPID,
|
|
214
|
-
allowCredentials: [
|
|
237
|
+
allowCredentials: [
|
|
238
|
+
{
|
|
215
239
|
// @ts-expect-error type error
|
|
216
240
|
id: base64url.toBuffer(credential.credentialId),
|
|
217
241
|
type: 'public-key',
|
|
218
242
|
transports: ['internal'],
|
|
219
|
-
}
|
|
243
|
+
},
|
|
244
|
+
],
|
|
220
245
|
});
|
|
221
246
|
await this.cacheAdapter.set(`${sessionId}_challenge`, result.wanCredentialAuthOption.challenge);
|
|
222
247
|
}
|
|
223
248
|
else {
|
|
224
249
|
const encoder = new TextEncoder();
|
|
225
|
-
const regUserIdBuffer = createHash('sha256')
|
|
250
|
+
const regUserIdBuffer = createHash('sha256')
|
|
251
|
+
.update(encoder.encode(name))
|
|
252
|
+
.digest();
|
|
226
253
|
result.wanCredentialRegiOption = generateRegistrationOptions({
|
|
227
254
|
rpName: ctx.app.config.name,
|
|
228
255
|
rpID: expectedRPID,
|
|
@@ -253,7 +280,11 @@ let WebauthController = class WebauthController extends MiddlewareController {
|
|
|
253
280
|
throw new ForbiddenError('invalid user info');
|
|
254
281
|
}
|
|
255
282
|
const { name, email } = userRes;
|
|
256
|
-
const { token } = await this.userService.ensureTokenByUser({
|
|
283
|
+
const { token } = await this.userService.ensureTokenByUser({
|
|
284
|
+
name,
|
|
285
|
+
email,
|
|
286
|
+
ip: ctx.ip,
|
|
287
|
+
});
|
|
257
288
|
await this.cacheAdapter.set(sessionId, token.token);
|
|
258
289
|
return { success: true };
|
|
259
290
|
}
|
|
@@ -282,11 +313,11 @@ let WebauthController = class WebauthController extends MiddlewareController {
|
|
|
282
313
|
};
|
|
283
314
|
__decorate([
|
|
284
315
|
Inject(),
|
|
285
|
-
__metadata("design:type",
|
|
316
|
+
__metadata("design:type", Function)
|
|
286
317
|
], WebauthController.prototype, "cacheAdapter", void 0);
|
|
287
318
|
__decorate([
|
|
288
319
|
Inject(),
|
|
289
|
-
__metadata("design:type",
|
|
320
|
+
__metadata("design:type", Function)
|
|
290
321
|
], WebauthController.prototype, "authAdapter", void 0);
|
|
291
322
|
__decorate([
|
|
292
323
|
Inject(),
|
|
@@ -298,7 +329,7 @@ __decorate([
|
|
|
298
329
|
], WebauthController.prototype, "config", void 0);
|
|
299
330
|
__decorate([
|
|
300
331
|
Inject(),
|
|
301
|
-
__metadata("design:type",
|
|
332
|
+
__metadata("design:type", Function)
|
|
302
333
|
], WebauthController.prototype, "userService", void 0);
|
|
303
334
|
__decorate([
|
|
304
335
|
HTTPMethod({
|
|
@@ -382,4 +413,4 @@ WebauthController = __decorate([
|
|
|
382
413
|
HTTPController()
|
|
383
414
|
], WebauthController);
|
|
384
415
|
export { WebauthController };
|
|
385
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"WebauthController.js","sourceRoot":"","sources":["../../../../app/port/webauth/WebauthController.ts"],"names":[],"mappings":"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"}
|
|
416
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"WebauthController.js","sourceRoot":"","sources":["../../../../app/port/webauth/WebauthController.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,11 +7,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import { Inject
|
|
10
|
+
import { Inject } from '@eggjs/tegg';
|
|
11
11
|
export class AbstractRepository {
|
|
12
12
|
}
|
|
13
13
|
__decorate([
|
|
14
14
|
Inject(),
|
|
15
15
|
__metadata("design:type", Function)
|
|
16
16
|
], AbstractRepository.prototype, "logger", void 0);
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQWJzdHJhY3RSZXBvc2l0b3J5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYXBwL3JlcG9zaXRvcnkvQWJzdHJhY3RSZXBvc2l0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFHckMsTUFBTSxPQUFnQixrQkFBa0I7Q0FHdkM7QUFEVztJQURULE1BQU0sRUFBRTs7a0RBQ21CIn0=
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Change as ChangeModel } from './model/Change.js';
|
|
2
|
-
import { Change as ChangeEntity } from '../core/entity/Change.js';
|
|
2
|
+
import type { Change as ChangeEntity } from '../core/entity/Change.js';
|
|
3
3
|
import { AbstractRepository } from './AbstractRepository.js';
|
|
4
4
|
export declare class ChangeRepository extends AbstractRepository {
|
|
5
5
|
private readonly Change;
|
|
@@ -15,7 +15,9 @@ let ChangeRepository = class ChangeRepository extends AbstractRepository {
|
|
|
15
15
|
await ModelConvertor.convertEntityToModel(change, this.Change);
|
|
16
16
|
}
|
|
17
17
|
async query(since, limit) {
|
|
18
|
-
const models = await this.Change.find({ id: { $gte: since } })
|
|
18
|
+
const models = await this.Change.find({ id: { $gte: since } })
|
|
19
|
+
.order('id', 'asc')
|
|
20
|
+
.limit(limit);
|
|
19
21
|
return models.toObject();
|
|
20
22
|
}
|
|
21
23
|
async getLastChange() {
|
|
@@ -32,4 +34,4 @@ ChangeRepository = __decorate([
|
|
|
32
34
|
})
|
|
33
35
|
], ChangeRepository);
|
|
34
36
|
export { ChangeRepository };
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2hhbmdlUmVwb3NpdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9yZXBvc2l0b3J5L0NoYW5nZVJlcG9zaXRvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxjQUFjLEVBQUUsTUFBTSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRWxFLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUcxRCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUt0RCxJQUFNLGdCQUFnQixHQUF0QixNQUFNLGdCQUFpQixTQUFRLGtCQUFrQjtJQUl0RCxLQUFLLENBQUMsU0FBUyxDQUFDLE1BQW9CO1FBQ2xDLE1BQU0sY0FBYyxDQUFDLG9CQUFvQixDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDakUsQ0FBQztJQUVELEtBQUssQ0FBQyxLQUFLLENBQUMsS0FBYSxFQUFFLEtBQWE7UUFDdEMsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUFDO2FBQzNELEtBQUssQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDO2FBQ2xCLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNoQixPQUFPLE1BQU0sQ0FBQyxRQUFRLEVBQW9CLENBQUM7SUFDN0MsQ0FBQztJQUVELEtBQUssQ0FBQyxhQUFhO1FBQ2pCLE9BQU8sTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2xFLENBQUM7Q0FDRixDQUFBO0FBaEJrQjtJQURoQixNQUFNLEVBQUU7O2dEQUNtQztBQUZqQyxnQkFBZ0I7SUFINUIsY0FBYyxDQUFDO1FBQ2QsV0FBVyxFQUFFLFdBQVcsQ0FBQyxNQUFNO0tBQ2hDLENBQUM7R0FDVyxnQkFBZ0IsQ0FrQjVCIn0=
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { PackageJSONType } from './PackageRepository.js';
|
|
2
|
-
import { Dist } from '../core/entity/Dist.js';
|
|
1
|
+
import type { PackageJSONType } from './PackageRepository.js';
|
|
2
|
+
import type { Dist } from '../core/entity/Dist.js';
|
|
3
3
|
export declare class DistRepository {
|
|
4
4
|
private readonly packageRepository;
|
|
5
5
|
private readonly nfsAdapter;
|
|
@@ -8,8 +8,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
10
|
import { AccessLevel, SingletonProto, Inject } from '@eggjs/tegg';
|
|
11
|
-
import { NFSAdapter } from '../common/adapter/NFSAdapter.js';
|
|
12
|
-
import { PackageRepository } from './PackageRepository.js';
|
|
13
11
|
let DistRepository = class DistRepository {
|
|
14
12
|
async findPackageVersionManifest(packageId, version) {
|
|
15
13
|
const packageVersion = await this.packageRepository.findPackageVersion(packageId, version);
|
|
@@ -67,11 +65,11 @@ let DistRepository = class DistRepository {
|
|
|
67
65
|
};
|
|
68
66
|
__decorate([
|
|
69
67
|
Inject(),
|
|
70
|
-
__metadata("design:type",
|
|
68
|
+
__metadata("design:type", Function)
|
|
71
69
|
], DistRepository.prototype, "packageRepository", void 0);
|
|
72
70
|
__decorate([
|
|
73
71
|
Inject(),
|
|
74
|
-
__metadata("design:type",
|
|
72
|
+
__metadata("design:type", Function)
|
|
75
73
|
], DistRepository.prototype, "nfsAdapter", void 0);
|
|
76
74
|
DistRepository = __decorate([
|
|
77
75
|
SingletonProto({
|
|
@@ -79,4 +77,4 @@ DistRepository = __decorate([
|
|
|
79
77
|
})
|
|
80
78
|
], DistRepository);
|
|
81
79
|
export { DistRepository };
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGlzdFJlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9EaXN0UmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLGNBQWMsRUFBRSxNQUFNLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFZM0QsSUFBTSxjQUFjLEdBQXBCLE1BQU0sY0FBYztJQU96QixLQUFLLENBQUMsMEJBQTBCLENBQzlCLFNBQWlCLEVBQ2pCLE9BQWU7UUFFZixNQUFNLGNBQWMsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxrQkFBa0IsQ0FDcEUsU0FBUyxFQUNULE9BQU8sQ0FDUixDQUFDO1FBQ0YsSUFBSSxjQUFjLEVBQUUsQ0FBQztZQUNuQixNQUFNLENBQUMsa0JBQWtCLEVBQUUsTUFBTSxDQUFDLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDO2dCQUNyRCxJQUFJLENBQUMsbUJBQW1CLENBQWtCLGNBQWMsQ0FBQyxZQUFZLENBQUM7Z0JBQ3RFLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxjQUFjLENBQUMsVUFBVSxDQUFDO2FBQ3RELENBQUMsQ0FBQztZQUNILElBQUksa0JBQWtCLEVBQUUsQ0FBQztnQkFDdkIsa0JBQWtCLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztZQUNyQyxDQUFDO1lBQ0QsT0FBTyxrQkFBa0IsQ0FBQztRQUM1QixDQUFDO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyw4QkFBOEIsQ0FDbEMsU0FBaUIsRUFDakIsT0FBZTtRQUVmLE1BQU0sY0FBYyxHQUFHLE1BQU0sSUFBSSxDQUFDLGlCQUFpQixDQUFDLGtCQUFrQixDQUNwRSxTQUFTLEVBQ1QsT0FBTyxDQUNSLENBQUM7UUFDRixJQUFJLGNBQWMsRUFBRSxDQUFDO1lBQ25CLE9BQU8sTUFBTSxJQUFJLENBQUMsbUJBQW1CLENBQUMsY0FBYyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ3hFLENBQUM7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLG1CQUFtQixDQUFJLElBQVU7UUFDckMsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFJLENBQUMscUJBQXFCLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDbkQsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNSLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQU0sQ0FBQztRQUM5QixDQUFDO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxxQkFBcUIsQ0FBQyxJQUFVO1FBQ3BDLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM3QyxJQUFJLENBQUMsS0FBSztZQUFFLE9BQU8sRUFBRSxDQUFDO1FBQ3RCLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDN0MsQ0FBQztJQUVELEtBQUssQ0FBQyxhQUFhLENBQUMsSUFBVTtRQUM1QixPQUFPLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ25ELENBQUM7SUFFRCxLQUFLLENBQUMsYUFBYSxDQUFDLElBQVU7UUFDNUIsT0FBTyxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNwRCxDQUFDO0lBRUQsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFVLEVBQUUsR0FBd0I7UUFDakQsSUFBSSxPQUFPLEdBQUcsS0FBSyxRQUFRLEVBQUUsQ0FBQztZQUM1QixPQUFPLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQztRQUMxRCxDQUFDO1FBQ0QsT0FBTyxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUM7SUFDM0QsQ0FBQztJQUVELEtBQUssQ0FBQyxXQUFXLENBQUMsSUFBVTtRQUMxQixPQUFPLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2pELENBQUM7SUFFRCxLQUFLLENBQUMsWUFBWSxDQUFDLElBQVU7UUFDM0IsT0FBTyxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsc0JBQXNCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2pFLENBQUM7SUFFRCxLQUFLLENBQUMsa0JBQWtCLENBQUMsSUFBVSxFQUFFLElBQVk7UUFDL0Msa0JBQWtCO1FBQ2xCLE9BQU8sTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksRUFBRSxLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFDeEUsQ0FBQztDQUNGLENBQUE7QUE5RWtCO0lBRGhCLE1BQU0sRUFBRTs7eURBQzZDO0FBR3JDO0lBRGhCLE1BQU0sRUFBRTs7a0RBQytCO0FBTDdCLGNBQWM7SUFIMUIsY0FBYyxDQUFDO1FBQ2QsV0FBVyxFQUFFLFdBQVcsQ0FBQyxNQUFNO0tBQ2hDLENBQUM7R0FDVyxjQUFjLENBZ0YxQiJ9
|
|
@@ -67,4 +67,4 @@ HookRepository = __decorate([
|
|
|
67
67
|
})
|
|
68
68
|
], HookRepository);
|
|
69
69
|
export { HookRepository };
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSG9va1JlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9Ib29rUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLGNBQWMsRUFBRSxNQUFNLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFbEUsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQVluRCxJQUFNLGNBQWMsR0FBcEIsTUFBTSxjQUFjO0lBSXpCLEtBQUssQ0FBQyxRQUFRLENBQUMsSUFBVTtRQUN2QixJQUFJLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQztZQUNaLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxFQUFFLEVBQUUsSUFBSSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7WUFDdkQsSUFBSSxDQUFDLEtBQUs7Z0JBQUUsT0FBTztZQUNuQixNQUFNLGNBQWMsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDdEQsQ0FBQzthQUFNLENBQUM7WUFDTixNQUFNLGNBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzdELENBQUM7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLFlBQVksQ0FBQyxNQUFjO1FBQy9CLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQ2xELElBQUksQ0FBQyxLQUFLO1lBQUUsT0FBTztRQUNuQixPQUFPLGNBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDMUQsQ0FBQztJQUVELEtBQUssQ0FBQyxVQUFVLENBQUMsTUFBYztRQUM3QixNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUNyQyxDQUFDO0lBRUQ7O09BRUc7SUFDSCxLQUFLLENBQUMsVUFBVSxDQUFDLEdBQXNCO1FBQ3JDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUNkO1lBQ0UsTUFBTSxFQUFFLEdBQUcsQ0FBQyxNQUFNO1NBQ25CLEVBQ0Q7WUFDRSxRQUFRLEVBQUUsR0FBRyxDQUFDLFFBQVE7WUFDdEIsTUFBTSxFQUFFLEdBQUcsQ0FBQyxNQUFNO1NBQ25CLENBQ0YsQ0FBQztJQUNKLENBQUM7SUFFRCxLQUFLLENBQUMsa0JBQWtCLENBQUMsT0FBZTtRQUN0QyxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQztRQUNuRCxPQUFPLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxjQUFjLENBQUMsb0JBQW9CLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUM7SUFDN0UsQ0FBQztJQUVELEtBQUssQ0FBQyxzQkFBc0IsQ0FDMUIsSUFBYyxFQUNkLElBQVksRUFDWixLQUFjO1FBRWQsSUFBSSxRQUEwQixDQUFDO1FBQy9CLElBQUksT0FBTyxLQUFLLEtBQUssV0FBVyxFQUFFLENBQUM7WUFDakMsUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUN2RSxHQUFHLENBQ0osQ0FBQztRQUNKLENBQUM7YUFBTSxDQUFDO1lBQ04sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDN0QsQ0FBQztRQUNELE9BQU8sUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLGNBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUM3RSxDQUFDO0NBQ0YsQ0FBQTtBQXpEa0I7SUFEaEIsTUFBTSxFQUFFOzs0Q0FDK0I7QUFGN0IsY0FBYztJQUgxQixjQUFjLENBQUM7UUFDZCxXQUFXLEVBQUUsV0FBVyxDQUFDLE1BQU07S0FDaEMsQ0FBQztHQUNXLGNBQWMsQ0EyRDFCIn0=
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { Package as PackageEntity } from '../core/entity/Package.js';
|
|
2
2
|
import { PackageVersion as PackageVersionEntity } from '../core/entity/PackageVersion.js';
|
|
3
|
-
import { PackageVersionManifest as PackageVersionManifestEntity } from '../core/entity/PackageVersionManifest.js';
|
|
3
|
+
import type { PackageVersionManifest as PackageVersionManifestEntity } from '../core/entity/PackageVersionManifest.js';
|
|
4
4
|
import type { PackageVersionManifest as PackageVersionManifestModel } from './model/PackageVersionManifest.js';
|
|
5
5
|
import { PackageTag as PackageTagEntity } from '../core/entity/PackageTag.js';
|
|
6
6
|
import { User as UserEntity } from '../core/entity/User.js';
|
|
7
7
|
import { AbstractRepository } from './AbstractRepository.js';
|
|
8
|
-
import { BugVersionPackages } from '../core/entity/BugVersion.js';
|
|
8
|
+
import type { BugVersionPackages } from '../core/entity/BugVersion.js';
|
|
9
9
|
export type PackageManifestType = Pick<PackageJSONType, PackageJSONPickKey> & {
|
|
10
10
|
_id: string;
|
|
11
11
|
_rev: string;
|