cnpmcore 3.13.1 → 3.14.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/app/core/entity/Token.d.ts +28 -4
- package/dist/app/core/entity/Token.js +31 -5
- package/dist/app/core/service/PackageSyncerService.js +6 -1
- package/dist/app/core/service/TokenService.d.ts +9 -0
- package/dist/app/core/service/TokenService.js +76 -0
- package/dist/app/core/service/UserService.d.ts +14 -3
- package/dist/app/core/service/UserService.js +3 -4
- package/dist/app/port/UserRoleManager.d.ts +1 -0
- package/dist/app/port/UserRoleManager.js +15 -6
- package/dist/app/port/controller/TokenController.d.ts +44 -0
- package/dist/app/port/controller/TokenController.js +140 -2
- package/dist/app/repository/UserRepository.d.ts +2 -0
- package/dist/app/repository/UserRepository.js +39 -6
- package/dist/app/repository/model/Token.d.ts +5 -0
- package/dist/app/repository/model/Token.js +21 -1
- package/dist/app/repository/model/TokenPackage.d.ts +8 -0
- package/dist/app/repository/model/TokenPackage.js +44 -0
- package/package.json +1 -1
|
@@ -1,14 +1,31 @@
|
|
|
1
1
|
import { Entity, EntityData } from './Entity';
|
|
2
2
|
import { EasyData } from '../util/EntityUtil';
|
|
3
|
-
|
|
3
|
+
export declare enum TokenType {
|
|
4
|
+
granular = "granular",
|
|
5
|
+
classic = "classic"
|
|
6
|
+
}
|
|
7
|
+
interface BaseTokenData extends EntityData {
|
|
4
8
|
tokenId: string;
|
|
5
9
|
tokenMark: string;
|
|
6
10
|
tokenKey: string;
|
|
7
|
-
cidrWhitelist
|
|
11
|
+
cidrWhitelist?: string[];
|
|
8
12
|
userId: string;
|
|
9
|
-
isReadonly
|
|
10
|
-
|
|
13
|
+
isReadonly?: boolean;
|
|
14
|
+
type?: TokenType;
|
|
15
|
+
}
|
|
16
|
+
interface ClassicTokenData extends BaseTokenData {
|
|
17
|
+
isAutomation?: boolean;
|
|
18
|
+
}
|
|
19
|
+
interface GranularTokenData extends BaseTokenData {
|
|
20
|
+
name: string;
|
|
21
|
+
description?: string;
|
|
22
|
+
allowedScopes?: string[];
|
|
23
|
+
allowedPackages?: string[];
|
|
24
|
+
expires: number;
|
|
25
|
+
expiredAt: Date;
|
|
11
26
|
}
|
|
27
|
+
type TokenData = ClassicTokenData | GranularTokenData;
|
|
28
|
+
export declare function isGranularToken(data: TokenData): data is GranularTokenData;
|
|
12
29
|
export declare class Token extends Entity {
|
|
13
30
|
readonly tokenId: string;
|
|
14
31
|
readonly tokenMark: string;
|
|
@@ -17,6 +34,13 @@ export declare class Token extends Entity {
|
|
|
17
34
|
readonly userId: string;
|
|
18
35
|
readonly isReadonly: boolean;
|
|
19
36
|
readonly isAutomation: boolean;
|
|
37
|
+
readonly type?: TokenType;
|
|
38
|
+
readonly name?: string;
|
|
39
|
+
readonly description?: string;
|
|
40
|
+
readonly allowedScopes?: string[];
|
|
41
|
+
readonly expiredAt?: Date;
|
|
42
|
+
readonly expires?: number;
|
|
43
|
+
allowedPackages?: string[];
|
|
20
44
|
token?: string;
|
|
21
45
|
constructor(data: TokenData);
|
|
22
46
|
static create(data: EasyData<TokenData, 'tokenId'>): Token;
|
|
@@ -1,8 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Token = void 0;
|
|
6
|
+
exports.Token = exports.isGranularToken = exports.TokenType = void 0;
|
|
7
|
+
const dayjs_1 = __importDefault(require("dayjs"));
|
|
4
8
|
const Entity_1 = require("./Entity");
|
|
5
9
|
const EntityUtil_1 = require("../util/EntityUtil");
|
|
10
|
+
var TokenType;
|
|
11
|
+
(function (TokenType) {
|
|
12
|
+
TokenType["granular"] = "granular";
|
|
13
|
+
TokenType["classic"] = "classic";
|
|
14
|
+
})(TokenType = exports.TokenType || (exports.TokenType = {}));
|
|
15
|
+
function isGranularToken(data) {
|
|
16
|
+
return data.type === TokenType.granular;
|
|
17
|
+
}
|
|
18
|
+
exports.isGranularToken = isGranularToken;
|
|
6
19
|
class Token extends Entity_1.Entity {
|
|
7
20
|
constructor(data) {
|
|
8
21
|
super(data);
|
|
@@ -10,14 +23,27 @@ class Token extends Entity_1.Entity {
|
|
|
10
23
|
this.tokenId = data.tokenId;
|
|
11
24
|
this.tokenMark = data.tokenMark;
|
|
12
25
|
this.tokenKey = data.tokenKey;
|
|
13
|
-
this.cidrWhitelist = data.cidrWhitelist;
|
|
14
|
-
this.isReadonly = data.isReadonly;
|
|
15
|
-
this.
|
|
26
|
+
this.cidrWhitelist = data.cidrWhitelist || [];
|
|
27
|
+
this.isReadonly = data.isReadonly || false;
|
|
28
|
+
this.type = data.type || TokenType.classic;
|
|
29
|
+
if (isGranularToken(data)) {
|
|
30
|
+
this.name = data.name;
|
|
31
|
+
this.description = data.description;
|
|
32
|
+
this.allowedScopes = data.allowedScopes;
|
|
33
|
+
this.expiredAt = data.expiredAt;
|
|
34
|
+
this.allowedPackages = data.allowedPackages;
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
this.isAutomation = data.isAutomation || false;
|
|
38
|
+
}
|
|
16
39
|
}
|
|
17
40
|
static create(data) {
|
|
18
41
|
const newData = EntityUtil_1.EntityUtil.defaultData(data, 'tokenId');
|
|
42
|
+
if (isGranularToken(newData) && !newData.expiredAt) {
|
|
43
|
+
newData.expiredAt = (0, dayjs_1.default)(newData.createdAt).add(newData.expires, 'days').toDate();
|
|
44
|
+
}
|
|
19
45
|
return new Token(newData);
|
|
20
46
|
}
|
|
21
47
|
}
|
|
22
48
|
exports.Token = Token;
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVG9rZW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvY29yZS9lbnRpdHkvVG9rZW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsa0RBQTBCO0FBQzFCLHFDQUE4QztBQUM5QyxtREFBMEQ7QUFFMUQsSUFBWSxTQUdYO0FBSEQsV0FBWSxTQUFTO0lBQ25CLGtDQUFxQixDQUFBO0lBQ3JCLGdDQUFtQixDQUFBO0FBQ3JCLENBQUMsRUFIVyxTQUFTLEdBQVQsaUJBQVMsS0FBVCxpQkFBUyxRQUdwQjtBQXlCRCxTQUFnQixlQUFlLENBQUMsSUFBZTtJQUM3QyxPQUFPLElBQUksQ0FBQyxJQUFJLEtBQUssU0FBUyxDQUFDLFFBQVEsQ0FBQztBQUMxQyxDQUFDO0FBRkQsMENBRUM7QUFFRCxNQUFhLEtBQU0sU0FBUSxlQUFNO0lBaUIvQixZQUFZLElBQWU7UUFDekIsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ1osSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQzFCLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUM1QixJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUM7UUFDaEMsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBQzlCLElBQUksQ0FBQyxhQUFhLEdBQUcsSUFBSSxDQUFDLGFBQWEsSUFBSSxFQUFFLENBQUM7UUFDOUMsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsVUFBVSxJQUFJLEtBQUssQ0FBQztRQUMzQyxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLElBQUksU0FBUyxDQUFDLE9BQU8sQ0FBQztRQUUzQyxJQUFJLGVBQWUsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUN6QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUM7WUFDdEIsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDO1lBQ3BDLElBQUksQ0FBQyxhQUFhLEdBQUcsSUFBSSxDQUFDLGFBQWEsQ0FBQztZQUN4QyxJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUM7WUFDaEMsSUFBSSxDQUFDLGVBQWUsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDO1NBQzdDO2FBQU07WUFDTCxJQUFJLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQyxZQUFZLElBQUksS0FBSyxDQUFDO1NBQ2hEO0lBQ0gsQ0FBQztJQUVELE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBb0M7UUFDaEQsTUFBTSxPQUFPLEdBQUcsdUJBQVUsQ0FBQyxXQUFXLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQ3hELElBQUksZUFBZSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRTtZQUNsRCxPQUFPLENBQUMsU0FBUyxHQUFHLElBQUEsZUFBSyxFQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQztTQUNwRjtRQUNELE9BQU8sSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDNUIsQ0FBQztDQUVGO0FBOUNELHNCQThDQyJ9
|
|
@@ -667,6 +667,11 @@ let PackageSyncerService = class PackageSyncerService extends AbstractService_1.
|
|
|
667
667
|
let shouldRefreshDistTags = false;
|
|
668
668
|
for (const tag in distTags) {
|
|
669
669
|
const version = distTags[tag];
|
|
670
|
+
const utf8mb3Regex = /[\u0020-\uD7FF\uE000-\uFFFD]/;
|
|
671
|
+
if (!utf8mb3Regex.test(tag)) {
|
|
672
|
+
logs.push(`[${isoNow()}] 🚧 invalid tag(${tag}: ${version}), tag name is out of utf8mb3, skip`);
|
|
673
|
+
continue;
|
|
674
|
+
}
|
|
670
675
|
// 新 tag 指向的版本既不在存量数据里,也不在本次同步版本列表里
|
|
671
676
|
// 例如 latest 对应的 version 写入失败跳过
|
|
672
677
|
if (!existsVersionMap[version] && !updateVersions.includes(version)) {
|
|
@@ -806,4 +811,4 @@ PackageSyncerService = __decorate([
|
|
|
806
811
|
})
|
|
807
812
|
], PackageSyncerService);
|
|
808
813
|
exports.PackageSyncerService = PackageSyncerService;
|
|
809
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageSyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/PackageSyncerService.ts"],"names":[],"mappings":"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"}
|
|
814
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageSyncerService.js","sourceRoot":"","sources":["../../../../app/core/service/PackageSyncerService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { AbstractService } from '../../common/AbstractService';
|
|
2
|
+
import { Token } from '../entity/Token';
|
|
3
|
+
import { Package as PackageEntity } from '../entity/Package';
|
|
4
|
+
export declare class TokenService extends AbstractService {
|
|
5
|
+
private readonly TokenPackage;
|
|
6
|
+
private readonly Package;
|
|
7
|
+
listTokenPackages(token: Token): Promise<PackageEntity[] | null>;
|
|
8
|
+
checkGranularTokenAccess(token: Token, fullname: string): Promise<boolean>;
|
|
9
|
+
}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.TokenService = void 0;
|
|
16
|
+
const dayjs_1 = __importDefault(require("dayjs"));
|
|
17
|
+
const tegg_1 = require("@eggjs/tegg");
|
|
18
|
+
const lodash_1 = require("lodash");
|
|
19
|
+
const AbstractService_1 = require("../../common/AbstractService");
|
|
20
|
+
const Token_1 = require("../entity/Token");
|
|
21
|
+
const ModelConvertor_1 = require("../../../app/repository/util/ModelConvertor");
|
|
22
|
+
const Package_1 = require("../entity/Package");
|
|
23
|
+
const egg_errors_1 = require("egg-errors");
|
|
24
|
+
const PackageUtil_1 = require("../../../app/common/PackageUtil");
|
|
25
|
+
let TokenService = class TokenService extends AbstractService_1.AbstractService {
|
|
26
|
+
async listTokenPackages(token) {
|
|
27
|
+
if ((0, Token_1.isGranularToken)(token)) {
|
|
28
|
+
const models = await this.TokenPackage.find({ tokenId: token.tokenId });
|
|
29
|
+
const packages = await this.Package.find({ packageId: models.map(m => m.packageId) });
|
|
30
|
+
return packages.map(pkg => ModelConvertor_1.ModelConvertor.convertModelToEntity(pkg, Package_1.Package));
|
|
31
|
+
}
|
|
32
|
+
return null;
|
|
33
|
+
}
|
|
34
|
+
async checkGranularTokenAccess(token, fullname) {
|
|
35
|
+
// skip classic token
|
|
36
|
+
if (!(0, Token_1.isGranularToken)(token)) {
|
|
37
|
+
return true;
|
|
38
|
+
}
|
|
39
|
+
// check for expires
|
|
40
|
+
if ((0, dayjs_1.default)(token.expiredAt).isBefore(new Date())) {
|
|
41
|
+
throw new egg_errors_1.UnauthorizedError('Token expired');
|
|
42
|
+
}
|
|
43
|
+
// check for scope whitelist
|
|
44
|
+
const [scope, name] = (0, PackageUtil_1.getScopeAndName)(fullname);
|
|
45
|
+
// check for packages whitelist
|
|
46
|
+
const allowedPackages = await this.listTokenPackages(token);
|
|
47
|
+
// check for scope & packages access
|
|
48
|
+
if ((0, lodash_1.isEmpty)(allowedPackages) && (0, lodash_1.isEmpty)(token.allowedScopes)) {
|
|
49
|
+
return true;
|
|
50
|
+
}
|
|
51
|
+
const existPkgConfig = allowedPackages?.find(pkg => pkg.scope === scope && pkg.name === name);
|
|
52
|
+
if (existPkgConfig) {
|
|
53
|
+
return true;
|
|
54
|
+
}
|
|
55
|
+
const existScopeConfig = token.allowedScopes?.find(s => s === scope);
|
|
56
|
+
if (existScopeConfig) {
|
|
57
|
+
return true;
|
|
58
|
+
}
|
|
59
|
+
throw new egg_errors_1.ForbiddenError(`can't access package "${fullname}"`);
|
|
60
|
+
}
|
|
61
|
+
};
|
|
62
|
+
__decorate([
|
|
63
|
+
(0, tegg_1.Inject)(),
|
|
64
|
+
__metadata("design:type", Object)
|
|
65
|
+
], TokenService.prototype, "TokenPackage", void 0);
|
|
66
|
+
__decorate([
|
|
67
|
+
(0, tegg_1.Inject)(),
|
|
68
|
+
__metadata("design:type", Object)
|
|
69
|
+
], TokenService.prototype, "Package", void 0);
|
|
70
|
+
TokenService = __decorate([
|
|
71
|
+
(0, tegg_1.SingletonProto)({
|
|
72
|
+
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
73
|
+
})
|
|
74
|
+
], TokenService);
|
|
75
|
+
exports.TokenService = TokenService;
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVG9rZW5TZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL2NvcmUvc2VydmljZS9Ub2tlblNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsa0RBQTBCO0FBQzFCLHNDQUlxQjtBQUNyQixtQ0FBaUM7QUFDakMsa0VBQStEO0FBQy9ELDJDQUF5RDtBQUd6RCxnRkFBNkU7QUFDN0UsK0NBQTZEO0FBQzdELDJDQUErRDtBQUMvRCxpRUFBa0U7QUFLM0QsSUFBTSxZQUFZLEdBQWxCLE1BQU0sWUFBYSxTQUFRLGlDQUFlO0lBTXhDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxLQUFZO1FBQ3pDLElBQUksSUFBQSx1QkFBZSxFQUFDLEtBQUssQ0FBQyxFQUFFO1lBQzFCLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7WUFDeEUsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLFNBQVMsRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUN0RixPQUFPLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQywrQkFBYyxDQUFDLG9CQUFvQixDQUFDLEdBQUcsRUFBRSxpQkFBYSxDQUFDLENBQUMsQ0FBQztTQUNyRjtRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVNLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQyxLQUFZLEVBQUUsUUFBZ0I7UUFDbEUscUJBQXFCO1FBQ3JCLElBQUksQ0FBQyxJQUFBLHVCQUFlLEVBQUMsS0FBSyxDQUFDLEVBQUU7WUFDM0IsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUVELG9CQUFvQjtRQUNwQixJQUFJLElBQUEsZUFBSyxFQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQyxRQUFRLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxFQUFFO1lBQy9DLE1BQU0sSUFBSSw4QkFBaUIsQ0FBQyxlQUFlLENBQUMsQ0FBQztTQUM5QztRQUVELDRCQUE0QjtRQUM1QixNQUFNLENBQUUsS0FBSyxFQUFFLElBQUksQ0FBRSxHQUFHLElBQUEsNkJBQWUsRUFBQyxRQUFRLENBQUMsQ0FBQztRQUNsRCwrQkFBK0I7UUFDL0IsTUFBTSxlQUFlLEdBQUcsTUFBTSxJQUFJLENBQUMsaUJBQWlCLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFNUQsb0NBQW9DO1FBQ3BDLElBQUksSUFBQSxnQkFBTyxFQUFDLGVBQWUsQ0FBQyxJQUFJLElBQUEsZ0JBQU8sRUFBQyxLQUFLLENBQUMsYUFBYSxDQUFDLEVBQUU7WUFDNUQsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUVELE1BQU0sY0FBYyxHQUFHLGVBQWUsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsS0FBSyxLQUFLLEtBQUssSUFBSSxHQUFHLENBQUMsSUFBSSxLQUFLLElBQUksQ0FBQyxDQUFDO1FBQzlGLElBQUksY0FBYyxFQUFFO1lBQ2xCLE9BQU8sSUFBSSxDQUFDO1NBQ2I7UUFFRCxNQUFNLGdCQUFnQixHQUFHLEtBQUssQ0FBQyxhQUFhLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLEtBQUssQ0FBQyxDQUFDO1FBQ3JFLElBQUksZ0JBQWdCLEVBQUU7WUFDcEIsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUVELE1BQU0sSUFBSSwyQkFBYyxDQUFDLHlCQUF5QixRQUFRLEdBQUcsQ0FBQyxDQUFDO0lBRWpFLENBQUM7Q0FFRixDQUFBO0FBakRDO0lBQUMsSUFBQSxhQUFNLEdBQUU7O2tEQUMrQztBQUN4RDtJQUFDLElBQUEsYUFBTSxHQUFFOzs2Q0FDcUM7QUFKbkMsWUFBWTtJQUh4QixJQUFBLHFCQUFjLEVBQUM7UUFDZCxXQUFXLEVBQUUsa0JBQVcsQ0FBQyxNQUFNO0tBQ2hDLENBQUM7R0FDVyxZQUFZLENBa0R4QjtBQWxEWSxvQ0FBWSJ9
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { User as UserEntity } from '../entity/User';
|
|
2
|
-
import { Token as TokenEntity } from '../entity/Token';
|
|
2
|
+
import { Token as TokenEntity, TokenType } from '../entity/Token';
|
|
3
3
|
import { WebauthnCredential as WebauthnCredentialEntity } from '../entity/WebauthnCredential';
|
|
4
4
|
import { LoginResultCode } from '../../common/enum/User';
|
|
5
5
|
import { AbstractService } from '../../common/AbstractService';
|
|
@@ -15,7 +15,18 @@ type LoginResult = {
|
|
|
15
15
|
user?: UserEntity;
|
|
16
16
|
token?: TokenEntity;
|
|
17
17
|
};
|
|
18
|
-
type
|
|
18
|
+
type CreateTokenOption = CreateClassicTokenOptions | CreateGranularTokenOptions;
|
|
19
|
+
type CreateGranularTokenOptions = {
|
|
20
|
+
type: TokenType.granular;
|
|
21
|
+
name: string;
|
|
22
|
+
description?: string;
|
|
23
|
+
allowedScopes?: string[];
|
|
24
|
+
allowedPackages?: string[];
|
|
25
|
+
isReadonly?: boolean;
|
|
26
|
+
cidrWhitelist?: string[];
|
|
27
|
+
expires: number;
|
|
28
|
+
};
|
|
29
|
+
type CreateClassicTokenOptions = {
|
|
19
30
|
isReadonly?: boolean;
|
|
20
31
|
isAutomation?: boolean;
|
|
21
32
|
cidrWhitelist?: string[];
|
|
@@ -42,7 +53,7 @@ export declare class UserService extends AbstractService {
|
|
|
42
53
|
changed: boolean;
|
|
43
54
|
user: UserEntity;
|
|
44
55
|
}>;
|
|
45
|
-
createToken(userId: string, options?:
|
|
56
|
+
createToken(userId: string, options?: CreateTokenOption): Promise<TokenEntity>;
|
|
46
57
|
removeToken(userId: string, tokenKeyOrTokenValue: string): Promise<void>;
|
|
47
58
|
findWebauthnCredential(userId: string, browserType?: string): Promise<WebauthnCredentialEntity | null>;
|
|
48
59
|
createWebauthnCredential(userId: string, options: CreateWebauthnCredentialOptions): Promise<WebauthnCredentialEntity>;
|
|
@@ -101,6 +101,7 @@ let UserService = class UserService extends AbstractService_1.AbstractService {
|
|
|
101
101
|
async createToken(userId, options = {}) {
|
|
102
102
|
// https://github.blog/2021-09-23-announcing-npms-new-access-token-format/
|
|
103
103
|
// https://github.blog/2021-04-05-behind-githubs-new-authentication-token-formats/
|
|
104
|
+
// https://github.blog/changelog/2022-12-06-limit-scope-of-npm-tokens-with-the-new-granular-access-tokens/
|
|
104
105
|
const token = (0, UserUtil_1.randomToken)(this.config.cnpmcore.name);
|
|
105
106
|
const tokenKey = (0, UserUtil_1.sha512)(token);
|
|
106
107
|
const tokenMark = token.substring(0, token.indexOf('_') + 4);
|
|
@@ -108,9 +109,7 @@ let UserService = class UserService extends AbstractService_1.AbstractService {
|
|
|
108
109
|
tokenKey,
|
|
109
110
|
tokenMark,
|
|
110
111
|
userId,
|
|
111
|
-
|
|
112
|
-
isReadonly: options.isReadonly ?? false,
|
|
113
|
-
isAutomation: options.isAutomation ?? false,
|
|
112
|
+
...options,
|
|
114
113
|
});
|
|
115
114
|
await this.userRepository.saveToken(tokenEntity);
|
|
116
115
|
tokenEntity.token = token;
|
|
@@ -161,4 +160,4 @@ UserService = __decorate([
|
|
|
161
160
|
})
|
|
162
161
|
], UserService);
|
|
163
162
|
exports.UserService = UserService;
|
|
164
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
163
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlclNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvY29yZS9zZXJ2aWNlL1VzZXJTZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLG9EQUE0QjtBQUM1QixzQ0FJcUI7QUFDckIsMkNBQTJEO0FBQzNELG9FQUFpRTtBQUNqRSx5Q0FBb0Q7QUFDcEQsMkNBQWtFO0FBQ2xFLHFFQUE4RjtBQUM5RixpREFBeUQ7QUFDekQsb0RBQXVGO0FBQ3ZGLGtFQUErRDtBQTZDeEQsSUFBTSxXQUFXLEdBQWpCLE1BQU0sV0FBWSxTQUFRLGlDQUFlO0lBSTlDLGFBQWEsQ0FBQyxJQUFnQixFQUFFLFFBQWdCO1FBQzlDLE1BQU0sS0FBSyxHQUFHLEdBQUcsSUFBSSxDQUFDLFlBQVksR0FBRyxRQUFRLEVBQUUsQ0FBQztRQUNoRCxPQUFPLElBQUEseUJBQWMsRUFBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUFDdkQsQ0FBQztJQUVELEtBQUssQ0FBQyxjQUFjLENBQUMsSUFBWTtRQUMvQixPQUFPLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEQsQ0FBQztJQUVELEtBQUssQ0FBQyxLQUFLLENBQUMsSUFBWSxFQUFFLFFBQWdCO1FBQ3hDLE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDNUQsSUFBSSxDQUFDLElBQUk7WUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLHNCQUFlLENBQUMsWUFBWSxFQUFFLENBQUM7UUFDekQsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLFFBQVEsQ0FBQyxFQUFFO1lBQ3ZDLE9BQU8sRUFBRSxJQUFJLEVBQUUsc0JBQWUsQ0FBQyxJQUFJLEVBQUUsQ0FBQztTQUN2QztRQUNE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
|
|
@@ -10,6 +10,7 @@ export declare class UserRoleManager {
|
|
|
10
10
|
private readonly config;
|
|
11
11
|
protected logger: EggLogger;
|
|
12
12
|
private readonly registryManagerService;
|
|
13
|
+
private readonly tokenService;
|
|
13
14
|
private handleAuthorized;
|
|
14
15
|
private currentAuthorizedUser;
|
|
15
16
|
private currentAuthorizedToken;
|
|
@@ -17,6 +17,7 @@ const PackageRepository_1 = require("../repository/PackageRepository");
|
|
|
17
17
|
const UserUtil_1 = require("../common/UserUtil");
|
|
18
18
|
const PackageUtil_1 = require("../common/PackageUtil");
|
|
19
19
|
const RegistryManagerService_1 = require("../core/service/RegistryManagerService");
|
|
20
|
+
const TokenService_1 = require("../core/service/TokenService");
|
|
20
21
|
let UserRoleManager = class UserRoleManager {
|
|
21
22
|
constructor() {
|
|
22
23
|
this.handleAuthorized = false;
|
|
@@ -28,28 +29,32 @@ let UserRoleManager = class UserRoleManager {
|
|
|
28
29
|
// use AbstractController#ensurePublishAccess ensure pkg exists;
|
|
29
30
|
async checkPublishAccess(ctx, fullname) {
|
|
30
31
|
const user = await this.requiredAuthorizedUser(ctx, 'publish');
|
|
31
|
-
// 1. admin
|
|
32
|
+
// 1. admin has all access
|
|
32
33
|
const isAdmin = await this.isAdmin(ctx);
|
|
33
34
|
if (isAdmin) {
|
|
34
35
|
return user;
|
|
35
36
|
}
|
|
36
|
-
// 2.
|
|
37
|
+
// 2. check for checkGranularTokenAccess
|
|
38
|
+
const authorizedUserAndToken = await this.getAuthorizedUserAndToken(ctx);
|
|
39
|
+
const { token } = authorizedUserAndToken;
|
|
40
|
+
await this.tokenService.checkGranularTokenAccess(token, fullname);
|
|
41
|
+
// 3. has published in current registry
|
|
37
42
|
const [scope, name] = (0, PackageUtil_1.getScopeAndName)(fullname);
|
|
38
43
|
const pkg = await this.packageRepository.findPackage(scope, name);
|
|
39
44
|
const selfRegistry = await this.registryManagerService.ensureSelfRegistry();
|
|
40
45
|
const inSelfRegistry = pkg?.registryId === selfRegistry.registryId;
|
|
41
46
|
if (inSelfRegistry) {
|
|
42
|
-
//
|
|
47
|
+
// 3.1 check in Maintainers table
|
|
43
48
|
// Higher priority than scope check
|
|
44
49
|
await this.requiredPackageMaintainer(pkg, user);
|
|
45
50
|
return user;
|
|
46
51
|
}
|
|
47
52
|
if (pkg && !scope && !inSelfRegistry) {
|
|
48
|
-
//
|
|
53
|
+
// 3.2 public package can't publish in other registry
|
|
49
54
|
// scope package can be migrated into self registry
|
|
50
55
|
throw new egg_errors_1.ForbiddenError(`Can\'t modify npm public package "${fullname}"`);
|
|
51
56
|
}
|
|
52
|
-
//
|
|
57
|
+
// 4 check scope is allowed to publish
|
|
53
58
|
await this.requiredPackageScope(scope, user);
|
|
54
59
|
if (pkg) {
|
|
55
60
|
// published scoped package
|
|
@@ -179,6 +184,10 @@ __decorate([
|
|
|
179
184
|
(0, tegg_1.Inject)(),
|
|
180
185
|
__metadata("design:type", RegistryManagerService_1.RegistryManagerService)
|
|
181
186
|
], UserRoleManager.prototype, "registryManagerService", void 0);
|
|
187
|
+
__decorate([
|
|
188
|
+
(0, tegg_1.Inject)(),
|
|
189
|
+
__metadata("design:type", TokenService_1.TokenService)
|
|
190
|
+
], UserRoleManager.prototype, "tokenService", void 0);
|
|
182
191
|
UserRoleManager = __decorate([
|
|
183
192
|
(0, tegg_1.ContextProto)({
|
|
184
193
|
// only inject on port module
|
|
@@ -186,4 +195,4 @@ UserRoleManager = __decorate([
|
|
|
186
195
|
})
|
|
187
196
|
], UserRoleManager);
|
|
188
197
|
exports.UserRoleManager = UserRoleManager;
|
|
189
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
198
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlclJvbGVNYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYXBwL3BvcnQvVXNlclJvbGVNYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLHNDQUtxQjtBQUVyQiwyQ0FBK0Q7QUFDL0QsaUVBQThEO0FBQzlELHVFQUFvRTtBQUlwRSxpREFBNEM7QUFDNUMsdURBQXdEO0FBQ3hELG1GQUFnRjtBQUNoRiwrREFBNEQ7QUFTckQsSUFBTSxlQUFlLEdBQXJCLE1BQU0sZUFBZTtJQUFyQjtRQWNHLHFCQUFnQixHQUFHLEtBQUssQ0FBQztJQTBKbkMsQ0FBQztJQXRKQyx1QkFBdUI7SUFDdkIsMEJBQTBCO0lBQzFCLHVDQUF1QztJQUN2QyxxQ0FBcUM7SUFDckMsZ0VBQWdFO0lBQ3pELEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxHQUFlLEVBQUUsUUFBZ0I7UUFFL0QsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsc0JBQXNCLENBQUMsR0FBRyxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBRS9ELDBCQUEwQjtRQUMxQixNQUFNLE9BQU8sR0FBRyxNQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDeEMsSUFBSSxPQUFPLEVBQUU7WUFDWCxPQUFPLElBQUksQ0FBQztTQUNiO1FBRUQsd0NBQXdDO1FBQ3hDLE1BQU0sc0JBQXNCLEdBQUcsTUFBTSxJQUFJLENBQUMseUJBQXlCLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDekUsTUFBTSxFQUFFLEtBQUssRUFBRSxHQUFHLHNCQUF1QixDQUFDO1FBQzFDLE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyx3QkFBd0IsQ0FBQyxLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFFbEUsdUNBQXVDO1FBQ3ZDLE1BQU0sQ0FBRSxLQUFLLEVBQUUsSUFBSSxDQUFFLEdBQUcsSUFBQSw2QkFBZSxFQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ2xELE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLGlCQUFpQixDQUFDLFdBQVcsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDbEUsTUFBTSxZQUFZLEdBQUcsTUFBTSxJQUFJLENBQUMsc0JBQXNCLENBQUMsa0JBQWtCLEVBQUUsQ0FBQztRQUM1RSxNQUFNLGNBQWMsR0FBRyxHQUFHLEVBQUUsVUFBVSxLQUFLLFlBQVksQ0FBQyxVQUFVLENBQUM7UUFDbkUsSUFBSSxjQUFjLEVBQUU7WUFDbEIsaUNBQWlDO1lBQ2pDLG1DQUFtQztZQUNuQyxNQUFNLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUM7WUFDaEQsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUVELElBQUksR0FBRyxJQUFJLENBQUMsS0FBSyxJQUFJLENBQUMsY0FBYyxFQUFFO1lBQ3BDLHFEQUFxRDtZQUNyRCxtREFBbUQ7WUFDbkQsTUFBTSxJQUFJLDJCQUFjLENBQUMscUNBQXFDLFFBQVEsR0FBRyxDQUFDLENBQUM7U0FDNUU7UUFFRCxzQ0FBc0M7UUFDdEMsTUFBTSxJQUFJLENBQUMsb0JBQW9CLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzdDLElBQUksR0FBRyxFQUFFO1lBQ1AsMkJBQTJCO1lBQzNCLE1BQU0sSUFBSSxDQUFDLHlCQUF5QixDQUFDLEdBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztTQUNsRDtRQUVELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELElBQUk7SUFDSiwyRUFBMkU7SUFDM0UsOEJBQThCO0lBQzlCLGtFQUFrRTtJQUNsRSx3Q0FBd0M7SUFDeEMsbUJBQW1CO0lBQ25CLDZCQUE2QjtJQUM3Qix1Q0FBdUM7SUFDdkMsNEJBQTRCO0lBQzVCLDZCQUE2QjtJQUM3QixJQUFJO0lBQ0csS0FBSyxDQUFDLHlCQUF5QixDQUFDLEdBQWU7UUFDcEQsSUFBSSxJQUFJLENBQUMsZ0JBQWdCLEVBQUU7WUFDekIsSUFBSSxDQUFDLElBQUksQ0FBQyxxQkFBcUI7Z0JBQUUsT0FBTyxJQUFJLENBQUM7WUFDN0MsT0FBTztnQkFDTCxLQUFLLEVBQUUsSUFBSSxDQUFDLHNCQUFzQjtnQkFDbEMsSUFBSSxFQUFFLElBQUksQ0FBQyxxQkFBcUI7YUFDakMsQ0FBQztTQUNIO1FBRUQsSUFBSSxDQUFDLGdCQUFnQixHQUFHLElBQUksQ0FBQztRQUM3QixNQUFNLGFBQWEsR0FBRyxHQUFHLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQy9DLElBQUksQ0FBQyxhQUFhO1lBQUUsT0FBTyxJQUFJLENBQUM7UUFDaEMsTUFBTSxNQUFNLEdBQUcscUJBQXFCLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3pELElBQUksQ0FBQyxNQUFNO1lBQUUsT0FBTyxJQUFJLENBQUM7UUFDekIsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzdCLE1BQU0sUUFBUSxHQUFHLElBQUEsaUJBQU0sRUFBQyxVQUFVLENBQUMsQ0FBQztRQUNwQyxNQUFNLHNCQUFzQixHQUFHLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQywwQkFBMEIsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUM5RixJQUFJLHNCQUFzQixFQUFFO1lBQzFCLElBQUksQ0FBQyxzQkFBc0IsR0FBRyxzQkFBc0IsQ0FBQyxLQUFLLENBQUM7WUFDM0QsSUFBSSxDQUFDLHFCQUFxQixHQUFHLHNCQUFzQixDQUFDLElBQUksQ0FBQztZQUN6RCxHQUFHLENBQUMsTUFBTSxHQUFHLHNCQUFzQixDQUFDLElBQUksQ0FBQyxNQUFNLENBQUM7U0FDakQ7UUFDRCxPQUFPLHNCQUFzQixDQUFDO0lBQ2hDLENBQUM7SUFFTSxLQUFLLENBQUMsc0JBQXNCLENBQUMsR0FBZSxFQUFFLElBQWU7UUFDbEUsTUFBTSxzQkFBc0IsR0FBRyxNQUFNLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN6RSxJQUFJLENBQUMsc0JBQXNCLEVBQUU7WUFDM0IsTUFBTSxhQUFhLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQztZQUMvQyxNQUFNLE9BQU8sR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUFDO1lBQ2hFLE1BQU0sSUFBSSw4QkFBaUIsQ0FBQyxPQUFPLENBQUMsQ0FBQztTQUN0QztRQUNELE1BQU0sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLEdBQUcsc0JBQXNCLENBQUM7UUFDL0MsK0VBQStFO1FBQy9FLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsOEJBQThCLElBQUksSUFBSSxLQUFLLFNBQVMsRUFBRTtZQUM3RSxJQUFJLEtBQUssQ0FBQyxVQUFVLEVBQUU7Z0JBQ3BCLE1BQU0sSUFBSSwyQkFBYyxDQUFDLG9CQUFvQixLQUFLLENBQUMsU0FBUyxpQkFBaUIsQ0FBQyxDQUFDO2FBQ2hGO1lBQ0QsaURBQWlEO1lBQ2pELHFEQUFxRDtZQUNyRCxNQUFNLENBQUMsR0FBRyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO1lBQzNELElBQUksQ0FBQyxDQUFDLEVBQUU7Z0JBQ04sTUFBTSxJQUFJLDJCQUFjLENBQUMsaUNBQWlDLENBQUMsQ0FBQzthQUM3RDtZQUNELE1BQU0sS0FBSyxHQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM3QixJQUFJLEtBQUssR0FBRyxDQUFDLEVBQUU7Z0JBQ2IsTUFBTSxJQUFJLDJCQUFjLENBQUMseUNBQXlDLENBQUMsQ0FBQzthQUNyRTtTQUNGO1FBQ0QsSUFBSSxJQUFJLEtBQUssU0FBUyxFQUFFO1lBQ3RCLElBQUksS0FBSyxDQUFDLFVBQVUsRUFBRTtnQkFDcEIsTUFBTSxJQUFJLDJCQUFjLENBQUMsb0JBQW9CLEtBQUssQ0FBQyxTQUFTLGlCQUFpQixDQUFDLENBQUM7YUFDaEY7WUFDRCxJQUFJLEtBQUssQ0FBQyxZQUFZLEVBQUU7Z0JBQ3RCLE1BQU0sSUFBSSwyQkFBYyxDQUFDLHFCQUFxQixLQUFLLENBQUMsU0FBUyxpQkFBaUIsQ0FBQyxDQUFDO2FBQ2pGO1NBQ0Y7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFTSxLQUFLLENBQUMseUJBQXlCLENBQUMsR0FBa0IsRUFBRSxJQUFnQjtRQUV6RSxNQUFNLFdBQVcsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxzQkFBc0IsQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDdkYsTUFBTSxVQUFVLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxNQUFNLEtBQUssSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ25FLElBQUksQ0FBQyxVQUFVLEVBQUU7WUFDZixNQUFNLEtBQUssR0FBRyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUN0RCxNQUFNLElBQUksMkJBQWMsQ0FBQyxJQUFJLElBQUksQ0FBQyxJQUFJLDhCQUE4QixHQUFHLENBQUMsUUFBUSxrQ0FBa0MsS0FBSyxHQUFHLENBQUMsQ0FBQztTQUM3SDtJQUNILENBQUM7SUFFTSxLQUFLLENBQUMsb0JBQW9CLENBQUMsS0FBYSxFQUFFLElBQWdCO1FBQy9ELE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDO1FBQzVDLElBQUksY0FBYyxDQUFDLDJCQUEyQixFQUFFO1lBQzlDLE9BQU87U0FDUjtRQUNELE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxNQUFNLElBQUksY0FBYyxDQUFDLFdBQVcsQ0FBQztRQUM5RCxJQUFJLENBQUMsS0FBSyxFQUFFO1lBQ1YsTUFBTSxJQUFJLDJCQUFjLENBQUMsMENBQTBDLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQy9GO1FBQ0QsSUFBSSxDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDaEMsTUFBTSxJQUFJLDJCQUFjLENBQUMsVUFBVSxLQUFLLDhCQUE4QixXQUFXLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztTQUNsRztJQUNILENBQUM7SUFFTSxLQUFLLENBQUMsT0FBTyxDQUFDLEdBQWU7UUFDbEMsTUFBTSxzQkFBc0IsR0FBRyxNQUFNLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN6RSxJQUFJLENBQUMsc0JBQXNCO1lBQUUsT0FBTyxLQUFLLENBQUM7UUFDMUMsTUFBTSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsR0FBRyxzQkFBc0IsQ0FBQztRQUMvQyxJQUFJLEtBQUssQ0FBQyxVQUFVO1lBQUUsT0FBTyxLQUFLLENBQUM7UUFDbkMsT0FBTyxJQUFJLENBQUMsSUFBSSxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQztJQUNsRCxDQUFDO0NBQ0YsQ0FBQTtBQXZLQztJQUFDLElBQUEsYUFBTSxHQUFFOzhCQUN3QiwrQkFBYzt1REFBQztBQUNoRDtJQUFDLElBQUEsYUFBTSxHQUFFOzhCQUMyQixxQ0FBaUI7MERBQUM7QUFDdEQ7SUFBQyxJQUFBLGFBQU0sR0FBRTs7K0NBQzZCO0FBQ3RDO0lBQUMsSUFBQSxhQUFNLEdBQUU7OytDQUNtQjtBQUM1QjtJQUFDLElBQUEsYUFBTSxHQUFFOzhCQUNnQywrQ0FBc0I7K0RBQUM7QUFDaEU7SUFBQyxJQUFBLGFBQU0sR0FBRTs4QkFDc0IsMkJBQVk7cURBQUM7QUFaakMsZUFBZTtJQUozQixJQUFBLG1CQUFZLEVBQUM7UUFDWiw2QkFBNkI7UUFDN0IsV0FBVyxFQUFFLGtCQUFXLENBQUMsT0FBTztLQUNqQyxDQUFDO0dBQ1csZUFBZSxDQXdLM0I7QUF4S1ksMENBQWUifQ==
|
|
@@ -8,7 +8,20 @@ declare const TokenOptionsRule: import("@sinclair/typebox").TObject<{
|
|
|
8
8
|
cidr_whitelist: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
|
|
9
9
|
}>;
|
|
10
10
|
type TokenOptions = Static<typeof TokenOptionsRule>;
|
|
11
|
+
declare const GranularTokenOptionsRule: import("@sinclair/typebox").TObject<{
|
|
12
|
+
automation: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
|
|
13
|
+
readonly: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
|
|
14
|
+
cidr_whitelist: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
|
|
15
|
+
name: import("@sinclair/typebox").TString;
|
|
16
|
+
description: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
|
|
17
|
+
allowedScopes: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
|
|
18
|
+
allowedPackages: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
|
|
19
|
+
expires: import("@sinclair/typebox").TNumber;
|
|
20
|
+
}>;
|
|
21
|
+
type GranularTokenOptions = Static<typeof GranularTokenOptionsRule>;
|
|
11
22
|
export declare class TokenController extends AbstractController {
|
|
23
|
+
private readonly authAdapter;
|
|
24
|
+
private readonly tokenService;
|
|
12
25
|
createToken(ctx: EggContext, tokenOptions: TokenOptions): Promise<{
|
|
13
26
|
token: string | undefined;
|
|
14
27
|
key: string;
|
|
@@ -34,5 +47,36 @@ export declare class TokenController extends AbstractController {
|
|
|
34
47
|
total: number;
|
|
35
48
|
urls: {};
|
|
36
49
|
}>;
|
|
50
|
+
private ensureWebUser;
|
|
51
|
+
createGranularToken(ctx: EggContext, tokenOptions: GranularTokenOptions): Promise<{
|
|
52
|
+
name: string | undefined;
|
|
53
|
+
token: string | undefined;
|
|
54
|
+
key: string;
|
|
55
|
+
cidr_whitelist: string[];
|
|
56
|
+
readonly: boolean;
|
|
57
|
+
automation: boolean;
|
|
58
|
+
allowedPackages: string[] | undefined;
|
|
59
|
+
allowedScopes: string[] | undefined;
|
|
60
|
+
created: Date;
|
|
61
|
+
updated: Date;
|
|
62
|
+
}>;
|
|
63
|
+
listGranularTokens(): Promise<{
|
|
64
|
+
objects: {
|
|
65
|
+
name: string | undefined;
|
|
66
|
+
description: string | undefined;
|
|
67
|
+
allowedPackages: string[] | undefined;
|
|
68
|
+
allowedScopes: string[] | undefined;
|
|
69
|
+
expiredAt: Date | undefined;
|
|
70
|
+
token: string;
|
|
71
|
+
key: string;
|
|
72
|
+
cidr_whitelist: string[];
|
|
73
|
+
readonly: boolean;
|
|
74
|
+
created: Date;
|
|
75
|
+
updated: Date;
|
|
76
|
+
}[];
|
|
77
|
+
total: number;
|
|
78
|
+
urls: {};
|
|
79
|
+
}>;
|
|
80
|
+
removeGranularToken(tokenKey: string): Promise<void>;
|
|
37
81
|
}
|
|
38
82
|
export {};
|
|
@@ -14,9 +14,13 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.TokenController = void 0;
|
|
16
16
|
const egg_errors_1 = require("egg-errors");
|
|
17
|
+
const AuthAdapter_1 = require("../../infra/AuthAdapter");
|
|
17
18
|
const tegg_1 = require("@eggjs/tegg");
|
|
18
19
|
const typebox_1 = require("@sinclair/typebox");
|
|
19
20
|
const AbstractController_1 = require("./AbstractController");
|
|
21
|
+
const Token_1 = require("../../core/entity/Token");
|
|
22
|
+
const TokenService_1 = require("../../../app/core/service/TokenService");
|
|
23
|
+
const PackageUtil_1 = require("../../../app/common/PackageUtil");
|
|
20
24
|
// Creating and viewing access tokens
|
|
21
25
|
// https://docs.npmjs.com/creating-and-viewing-access-tokens#viewing-access-tokens
|
|
22
26
|
const TokenOptionsRule = typebox_1.Type.Object({
|
|
@@ -26,6 +30,16 @@ const TokenOptionsRule = typebox_1.Type.Object({
|
|
|
26
30
|
// only allow 10 ip for now
|
|
27
31
|
cidr_whitelist: typebox_1.Type.Optional(typebox_1.Type.Array(typebox_1.Type.String({ maxLength: 100 }), { maxItems: 10 })),
|
|
28
32
|
});
|
|
33
|
+
const GranularTokenOptionsRule = typebox_1.Type.Object({
|
|
34
|
+
automation: typebox_1.Type.Optional(typebox_1.Type.Boolean()),
|
|
35
|
+
readonly: typebox_1.Type.Optional(typebox_1.Type.Boolean()),
|
|
36
|
+
cidr_whitelist: typebox_1.Type.Optional(typebox_1.Type.Array(typebox_1.Type.String({ maxLength: 100 }), { maxItems: 10 })),
|
|
37
|
+
name: typebox_1.Type.String({ maxLength: 255 }),
|
|
38
|
+
description: typebox_1.Type.Optional(typebox_1.Type.String({ maxLength: 255 })),
|
|
39
|
+
allowedScopes: typebox_1.Type.Optional(typebox_1.Type.Array(typebox_1.Type.String({ maxLength: 100 }), { maxItems: 50 })),
|
|
40
|
+
allowedPackages: typebox_1.Type.Optional(typebox_1.Type.Array(typebox_1.Type.String({ maxLength: 100 }), { maxItems: 50 })),
|
|
41
|
+
expires: typebox_1.Type.Number({ minimum: 1, maximum: 365 }),
|
|
42
|
+
});
|
|
29
43
|
let TokenController = class TokenController extends AbstractController_1.AbstractController {
|
|
30
44
|
// https://github.com/npm/npm-profile/blob/main/lib/index.js#L233
|
|
31
45
|
async createToken(ctx, tokenOptions) {
|
|
@@ -83,7 +97,8 @@ let TokenController = class TokenController extends AbstractController_1.Abstrac
|
|
|
83
97
|
// "total": 2,
|
|
84
98
|
// "urls": {}
|
|
85
99
|
// }
|
|
86
|
-
const objects = tokens.
|
|
100
|
+
const objects = tokens.filter(token => !(0, Token_1.isGranularToken)(token))
|
|
101
|
+
.map(token => {
|
|
87
102
|
return {
|
|
88
103
|
token: token.tokenMark,
|
|
89
104
|
key: token.tokenKey,
|
|
@@ -97,7 +112,93 @@ let TokenController = class TokenController extends AbstractController_1.Abstrac
|
|
|
97
112
|
// TODO: paging, urls: { next: string }
|
|
98
113
|
return { objects, total: objects.length, urls: {} };
|
|
99
114
|
}
|
|
115
|
+
async ensureWebUser() {
|
|
116
|
+
const userRes = await this.authAdapter.ensureCurrentUser();
|
|
117
|
+
if (!userRes?.name || !userRes?.email) {
|
|
118
|
+
throw new egg_errors_1.ForbiddenError('need login first');
|
|
119
|
+
}
|
|
120
|
+
const user = await this.userService.findUserByName(userRes.name);
|
|
121
|
+
if (!user?.userId) {
|
|
122
|
+
throw new egg_errors_1.ForbiddenError('invalid user info');
|
|
123
|
+
}
|
|
124
|
+
return user;
|
|
125
|
+
}
|
|
126
|
+
// Create granular access token through HTTP interface
|
|
127
|
+
// https://docs.npmjs.com/about-access-tokens#about-granular-access-tokens
|
|
128
|
+
// Mainly has the following limitations:
|
|
129
|
+
// 1. Need to submit token name and expires
|
|
130
|
+
// 2. Optional to submit description, allowScopes, allowPackages information
|
|
131
|
+
// 3. Need to implement ensureCurrentUser method in AuthAdapter, or pass in this.user
|
|
132
|
+
async createGranularToken(ctx, tokenOptions) {
|
|
133
|
+
ctx.tValidate(GranularTokenOptionsRule, tokenOptions);
|
|
134
|
+
const user = await this.ensureWebUser();
|
|
135
|
+
// 生成 Token
|
|
136
|
+
const { name, description, allowedPackages, allowedScopes, cidr_whitelist, automation, readonly, expires } = tokenOptions;
|
|
137
|
+
const token = await this.userService.createToken(user.userId, {
|
|
138
|
+
name,
|
|
139
|
+
type: Token_1.TokenType.granular,
|
|
140
|
+
description,
|
|
141
|
+
allowedPackages,
|
|
142
|
+
allowedScopes,
|
|
143
|
+
isAutomation: automation,
|
|
144
|
+
isReadonly: readonly,
|
|
145
|
+
cidrWhitelist: cidr_whitelist,
|
|
146
|
+
expires,
|
|
147
|
+
});
|
|
148
|
+
return {
|
|
149
|
+
name: token.name,
|
|
150
|
+
token: token.token,
|
|
151
|
+
key: token.tokenKey,
|
|
152
|
+
cidr_whitelist: token.cidrWhitelist,
|
|
153
|
+
readonly: token.isReadonly,
|
|
154
|
+
automation: token.isAutomation,
|
|
155
|
+
allowedPackages: token.allowedPackages,
|
|
156
|
+
allowedScopes: token.allowedScopes,
|
|
157
|
+
created: token.createdAt,
|
|
158
|
+
updated: token.updatedAt,
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
async listGranularTokens() {
|
|
162
|
+
const user = await this.ensureWebUser();
|
|
163
|
+
const tokens = await this.userRepository.listTokens(user.userId);
|
|
164
|
+
const granularTokens = tokens.filter(token => (0, Token_1.isGranularToken)(token));
|
|
165
|
+
for (const token of granularTokens) {
|
|
166
|
+
const packages = await this.tokenService.listTokenPackages(token);
|
|
167
|
+
if (Array.isArray(packages)) {
|
|
168
|
+
token.allowedPackages = packages.map(p => (0, PackageUtil_1.getFullname)(p.scope, p.name));
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
const objects = granularTokens.map(token => {
|
|
172
|
+
const { name, description, expiredAt, allowedPackages, allowedScopes } = token;
|
|
173
|
+
return {
|
|
174
|
+
name,
|
|
175
|
+
description,
|
|
176
|
+
allowedPackages,
|
|
177
|
+
allowedScopes,
|
|
178
|
+
expiredAt,
|
|
179
|
+
token: token.tokenMark,
|
|
180
|
+
key: token.tokenKey,
|
|
181
|
+
cidr_whitelist: token.cidrWhitelist,
|
|
182
|
+
readonly: token.isReadonly,
|
|
183
|
+
created: token.createdAt,
|
|
184
|
+
updated: token.updatedAt,
|
|
185
|
+
};
|
|
186
|
+
});
|
|
187
|
+
return { objects, total: granularTokens.length, urls: {} };
|
|
188
|
+
}
|
|
189
|
+
async removeGranularToken(tokenKey) {
|
|
190
|
+
const user = await this.ensureWebUser();
|
|
191
|
+
await this.userService.removeToken(user.userId, tokenKey);
|
|
192
|
+
}
|
|
100
193
|
};
|
|
194
|
+
__decorate([
|
|
195
|
+
(0, tegg_1.Inject)(),
|
|
196
|
+
__metadata("design:type", AuthAdapter_1.AuthAdapter)
|
|
197
|
+
], TokenController.prototype, "authAdapter", void 0);
|
|
198
|
+
__decorate([
|
|
199
|
+
(0, tegg_1.Inject)(),
|
|
200
|
+
__metadata("design:type", TokenService_1.TokenService)
|
|
201
|
+
], TokenController.prototype, "tokenService", void 0);
|
|
101
202
|
__decorate([
|
|
102
203
|
(0, tegg_1.HTTPMethod)({
|
|
103
204
|
path: '/-/npm/v1/tokens',
|
|
@@ -130,8 +231,45 @@ __decorate([
|
|
|
130
231
|
__metadata("design:paramtypes", [Object]),
|
|
131
232
|
__metadata("design:returntype", Promise)
|
|
132
233
|
], TokenController.prototype, "listTokens", null);
|
|
234
|
+
__decorate([
|
|
235
|
+
(0, tegg_1.HTTPMethod)({
|
|
236
|
+
path: '/-/npm/v1/tokens/gat',
|
|
237
|
+
method: tegg_1.HTTPMethodEnum.POST,
|
|
238
|
+
})
|
|
239
|
+
// Create granular access token through HTTP interface
|
|
240
|
+
// https://docs.npmjs.com/about-access-tokens#about-granular-access-tokens
|
|
241
|
+
// Mainly has the following limitations:
|
|
242
|
+
// 1. Need to submit token name and expires
|
|
243
|
+
// 2. Optional to submit description, allowScopes, allowPackages information
|
|
244
|
+
// 3. Need to implement ensureCurrentUser method in AuthAdapter, or pass in this.user
|
|
245
|
+
,
|
|
246
|
+
__param(0, (0, tegg_1.Context)()),
|
|
247
|
+
__param(1, (0, tegg_1.HTTPBody)()),
|
|
248
|
+
__metadata("design:type", Function),
|
|
249
|
+
__metadata("design:paramtypes", [Object, Object]),
|
|
250
|
+
__metadata("design:returntype", Promise)
|
|
251
|
+
], TokenController.prototype, "createGranularToken", null);
|
|
252
|
+
__decorate([
|
|
253
|
+
(0, tegg_1.HTTPMethod)({
|
|
254
|
+
path: '/-/npm/v1/tokens/gat',
|
|
255
|
+
method: tegg_1.HTTPMethodEnum.GET,
|
|
256
|
+
}),
|
|
257
|
+
__metadata("design:type", Function),
|
|
258
|
+
__metadata("design:paramtypes", []),
|
|
259
|
+
__metadata("design:returntype", Promise)
|
|
260
|
+
], TokenController.prototype, "listGranularTokens", null);
|
|
261
|
+
__decorate([
|
|
262
|
+
(0, tegg_1.HTTPMethod)({
|
|
263
|
+
path: '/-/npm/v1/tokens/gat/:tokenKey',
|
|
264
|
+
method: tegg_1.HTTPMethodEnum.DELETE,
|
|
265
|
+
}),
|
|
266
|
+
__param(0, (0, tegg_1.HTTPParam)()),
|
|
267
|
+
__metadata("design:type", Function),
|
|
268
|
+
__metadata("design:paramtypes", [String]),
|
|
269
|
+
__metadata("design:returntype", Promise)
|
|
270
|
+
], TokenController.prototype, "removeGranularToken", null);
|
|
133
271
|
TokenController = __decorate([
|
|
134
272
|
(0, tegg_1.HTTPController)()
|
|
135
273
|
], TokenController);
|
|
136
274
|
exports.TokenController = TokenController;
|
|
137
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
275
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TokenController.js","sourceRoot":"","sources":["../../../../app/port/controller/TokenController.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,8 @@ import { AbstractRepository } from './AbstractRepository';
|
|
|
5
5
|
export declare class UserRepository extends AbstractRepository {
|
|
6
6
|
private readonly User;
|
|
7
7
|
private readonly Token;
|
|
8
|
+
private readonly TokenPackage;
|
|
9
|
+
private readonly packageRepository;
|
|
8
10
|
private readonly WebauthnCredential;
|
|
9
11
|
saveUser(user: UserEntity): Promise<void>;
|
|
10
12
|
findUserByName(name: string): Promise<UserEntity | null>;
|
|
@@ -16,6 +16,8 @@ const User_1 = require("../core/entity/User");
|
|
|
16
16
|
const Token_1 = require("../core/entity/Token");
|
|
17
17
|
const WebauthnCredential_1 = require("../core/entity/WebauthnCredential");
|
|
18
18
|
const AbstractRepository_1 = require("./AbstractRepository");
|
|
19
|
+
const PackageUtil_1 = require("../common/PackageUtil");
|
|
20
|
+
const PackageRepository_1 = require("./PackageRepository");
|
|
19
21
|
let UserRepository = class UserRepository extends AbstractRepository_1.AbstractRepository {
|
|
20
22
|
async saveUser(user) {
|
|
21
23
|
if (user.id) {
|
|
@@ -60,20 +62,43 @@ let UserRepository = class UserRepository extends AbstractRepository_1.AbstractR
|
|
|
60
62
|
return ModelConvertor_1.ModelConvertor.convertModelToEntity(model, Token_1.Token);
|
|
61
63
|
}
|
|
62
64
|
async saveToken(token) {
|
|
65
|
+
// create
|
|
66
|
+
let model;
|
|
67
|
+
// update
|
|
63
68
|
if (token.id) {
|
|
64
|
-
const
|
|
65
|
-
if (!
|
|
69
|
+
const res = await this.Token.findOne({ id: token.id });
|
|
70
|
+
if (!res)
|
|
66
71
|
return;
|
|
72
|
+
model = res;
|
|
67
73
|
await ModelConvertor_1.ModelConvertor.saveEntityToModel(token, model);
|
|
68
74
|
}
|
|
69
75
|
else {
|
|
70
|
-
|
|
76
|
+
if ((0, Token_1.isGranularToken)(token)) {
|
|
77
|
+
await this.TokenPackage.transaction(async (transaction) => {
|
|
78
|
+
model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(token, this.Token, transaction);
|
|
79
|
+
if (Array.isArray(token.allowedPackages)) {
|
|
80
|
+
for (const packageName of token.allowedPackages) {
|
|
81
|
+
const [scope, name] = (0, PackageUtil_1.getScopeAndName)(packageName);
|
|
82
|
+
const packageId = await this.packageRepository.findPackageId(scope, name);
|
|
83
|
+
if (packageId) {
|
|
84
|
+
await this.TokenPackage.create({ packageId, tokenId: token.tokenId }, transaction);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(token, this.Token);
|
|
92
|
+
}
|
|
71
93
|
this.logger.info('[UserRepository:saveToken:new] id: %s, tokenId: %s', model.id, model.tokenId);
|
|
72
94
|
}
|
|
73
95
|
}
|
|
74
96
|
async removeToken(tokenId) {
|
|
75
|
-
|
|
76
|
-
|
|
97
|
+
await this.Token.transaction(async (transaction) => {
|
|
98
|
+
const removeCount = await this.Token.remove({ tokenId }, true, transaction);
|
|
99
|
+
await this.TokenPackage.remove({ tokenId }, true, transaction);
|
|
100
|
+
this.logger.info('[UserRepository:removeToken:remove] %d rows, tokenId: %s', removeCount, tokenId);
|
|
101
|
+
});
|
|
77
102
|
}
|
|
78
103
|
async listTokens(userId) {
|
|
79
104
|
const models = await this.Token.find({ userId });
|
|
@@ -113,6 +138,14 @@ __decorate([
|
|
|
113
138
|
(0, tegg_1.Inject)(),
|
|
114
139
|
__metadata("design:type", Object)
|
|
115
140
|
], UserRepository.prototype, "Token", void 0);
|
|
141
|
+
__decorate([
|
|
142
|
+
(0, tegg_1.Inject)(),
|
|
143
|
+
__metadata("design:type", Object)
|
|
144
|
+
], UserRepository.prototype, "TokenPackage", void 0);
|
|
145
|
+
__decorate([
|
|
146
|
+
(0, tegg_1.Inject)(),
|
|
147
|
+
__metadata("design:type", PackageRepository_1.PackageRepository)
|
|
148
|
+
], UserRepository.prototype, "packageRepository", void 0);
|
|
116
149
|
__decorate([
|
|
117
150
|
(0, tegg_1.Inject)(),
|
|
118
151
|
__metadata("design:type", Object)
|
|
@@ -123,4 +156,4 @@ UserRepository = __decorate([
|
|
|
123
156
|
})
|
|
124
157
|
], UserRepository);
|
|
125
158
|
exports.UserRepository = UserRepository;
|
|
126
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
159
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlclJlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9Vc2VyUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FBa0U7QUFDbEUsMERBQXVEO0FBSXZELDhDQUF5RDtBQUN6RCxnREFBNkU7QUFDN0UsMEVBQW1HO0FBQ25HLDZEQUEwRDtBQUUxRCx1REFBd0Q7QUFDeEQsMkRBQXdEO0FBS2pELElBQU0sY0FBYyxHQUFwQixNQUFNLGNBQWUsU0FBUSx1Q0FBa0I7SUFnQnBELEtBQUssQ0FBQyxRQUFRLENBQUMsSUFBZ0I7UUFDN0IsSUFBSSxJQUFJLENBQUMsRUFBRSxFQUFFO1lBQ1gsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUN2RCxJQUFJLENBQUMsS0FBSztnQkFBRSxPQUFPO1lBQ25CLE1BQU0sK0JBQWMsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUM7U0FDckQ7YUFBTTtZQUNMLE1BQU0sS0FBSyxHQUFHLE1BQU0sK0JBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3pFLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGtEQUFrRCxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1NBQzlGO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxjQUFjLENBQUMsSUFBWTtRQUMvQixNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUNoRCxJQUFJLENBQUMsS0FBSztZQUFFLE9BQU8sSUFBSSxD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
|
|
@@ -61,8 +61,28 @@ __decorate([
|
|
|
61
61
|
(0, orm_1.Attribute)(leoric_1.DataTypes.BOOLEAN),
|
|
62
62
|
__metadata("design:type", Boolean)
|
|
63
63
|
], Token.prototype, "isAutomation", void 0);
|
|
64
|
+
__decorate([
|
|
65
|
+
(0, orm_1.Attribute)(leoric_1.DataTypes.STRING(255)),
|
|
66
|
+
__metadata("design:type", String)
|
|
67
|
+
], Token.prototype, "type", void 0);
|
|
68
|
+
__decorate([
|
|
69
|
+
(0, orm_1.Attribute)(leoric_1.DataTypes.STRING(255)),
|
|
70
|
+
__metadata("design:type", String)
|
|
71
|
+
], Token.prototype, "name", void 0);
|
|
72
|
+
__decorate([
|
|
73
|
+
(0, orm_1.Attribute)(leoric_1.DataTypes.STRING(255)),
|
|
74
|
+
__metadata("design:type", String)
|
|
75
|
+
], Token.prototype, "description", void 0);
|
|
76
|
+
__decorate([
|
|
77
|
+
(0, orm_1.Attribute)(leoric_1.DataTypes.JSONB),
|
|
78
|
+
__metadata("design:type", Array)
|
|
79
|
+
], Token.prototype, "allowedScopes", void 0);
|
|
80
|
+
__decorate([
|
|
81
|
+
(0, orm_1.Attribute)(leoric_1.DataTypes.DATE),
|
|
82
|
+
__metadata("design:type", Date)
|
|
83
|
+
], Token.prototype, "expiredAt", void 0);
|
|
64
84
|
Token = __decorate([
|
|
65
85
|
(0, orm_1.Model)()
|
|
66
86
|
], Token);
|
|
67
87
|
exports.Token = Token;
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVG9rZW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9tb2RlbC9Ub2tlbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSx5Q0FBbUQ7QUFDbkQsbUNBQXlDO0FBR2xDLElBQU0sS0FBSyxHQUFYLE1BQU0sS0FBTSxTQUFRLGFBQUk7Q0FvRDlCLENBQUE7QUFuREM7SUFBQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLE1BQU0sRUFBRTtRQUMzQixPQUFPLEVBQUUsSUFBSTtRQUNiLGFBQWEsRUFBRSxJQUFJO0tBQ3BCLENBQUM7O2lDQUNTO0FBRVg7SUFBQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLElBQUksRUFBRSxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsQ0FBQzs4QkFDdkMsSUFBSTt3Q0FBQztBQUVoQjtJQUFDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsSUFBSSxFQUFFLEVBQUUsSUFBSSxFQUFFLGNBQWMsRUFBRSxDQUFDOzhCQUN6QyxJQUFJO3dDQUFDO0FBRWhCO0lBQUMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLEVBQUU7UUFDL0IsTUFBTSxFQUFFLElBQUk7S0FDYixDQUFDOztzQ0FDYztBQUVoQjtJQUFDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFDOzt3Q0FDZDtBQUVsQjtJQUFDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFO1FBQ2hDLE1BQU0sRUFBRSxJQUFJO0tBQ2IsQ0FBQzs7dUNBQ2U7QUFFakI7SUFBQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQzs7cUNBQ2pCO0FBRWY7SUFBQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLEtBQUssQ0FBQzs7NENBQ0g7QUFFeEI7SUFBQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLE9BQU8sQ0FBQzs7eUNBQ1Q7QUFFcEI7SUFBQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLE9BQU8sQ0FBQzs7MkNBQ1A7QUFFdEI7SUFBQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQzs7bUNBQ3BCO0FBRWI7SUFBQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQzs7bUNBQ3BCO0FBRWI7SUFBQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQzs7MENBQ2I7QUFFcEI7SUFBQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLEtBQUssQ0FBQzs7NENBQ0g7QUFFeEI7SUFBQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLElBQUksQ0FBQzs4QkFDZixJQUFJO3dDQUFDO0FBbkRMLEtBQUs7SUFEakIsSUFBQSxXQUFLLEdBQUU7R0FDSyxLQUFLLENBb0RqQjtBQXBEWSxzQkFBSyJ9
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.TokenPackage = void 0;
|
|
13
|
+
const orm_1 = require("@eggjs/tegg/orm");
|
|
14
|
+
const leoric_1 = require("leoric");
|
|
15
|
+
let TokenPackage = class TokenPackage extends leoric_1.Bone {
|
|
16
|
+
};
|
|
17
|
+
__decorate([
|
|
18
|
+
(0, orm_1.Attribute)(leoric_1.DataTypes.BIGINT, {
|
|
19
|
+
primary: true,
|
|
20
|
+
autoIncrement: true,
|
|
21
|
+
}),
|
|
22
|
+
__metadata("design:type", BigInt)
|
|
23
|
+
], TokenPackage.prototype, "id", void 0);
|
|
24
|
+
__decorate([
|
|
25
|
+
(0, orm_1.Attribute)(leoric_1.DataTypes.DATE, { name: 'gmt_create' }),
|
|
26
|
+
__metadata("design:type", Date)
|
|
27
|
+
], TokenPackage.prototype, "createdAt", void 0);
|
|
28
|
+
__decorate([
|
|
29
|
+
(0, orm_1.Attribute)(leoric_1.DataTypes.DATE, { name: 'gmt_modified' }),
|
|
30
|
+
__metadata("design:type", Date)
|
|
31
|
+
], TokenPackage.prototype, "updatedAt", void 0);
|
|
32
|
+
__decorate([
|
|
33
|
+
(0, orm_1.Attribute)(leoric_1.DataTypes.STRING(24)),
|
|
34
|
+
__metadata("design:type", String)
|
|
35
|
+
], TokenPackage.prototype, "tokenId", void 0);
|
|
36
|
+
__decorate([
|
|
37
|
+
(0, orm_1.Attribute)(leoric_1.DataTypes.STRING(24)),
|
|
38
|
+
__metadata("design:type", String)
|
|
39
|
+
], TokenPackage.prototype, "packageId", void 0);
|
|
40
|
+
TokenPackage = __decorate([
|
|
41
|
+
(0, orm_1.Model)()
|
|
42
|
+
], TokenPackage);
|
|
43
|
+
exports.TokenPackage = TokenPackage;
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVG9rZW5QYWNrYWdlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL3JlcG9zaXRvcnkvbW9kZWwvVG9rZW5QYWNrYWdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLHlDQUFtRDtBQUNuRCxtQ0FBeUM7QUFHbEMsSUFBTSxZQUFZLEdBQWxCLE1BQU0sWUFBYSxTQUFRLGFBQUk7Q0FrQnJDLENBQUE7QUFqQkM7SUFBQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLE1BQU0sRUFBRTtRQUMzQixPQUFPLEVBQUUsSUFBSTtRQUNiLGFBQWEsRUFBRSxJQUFJO0tBQ3BCLENBQUM7O3dDQUNTO0FBRVg7SUFBQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLElBQUksRUFBRSxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsQ0FBQzs4QkFDdkMsSUFBSTsrQ0FBQztBQUVoQjtJQUFDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsSUFBSSxFQUFFLEVBQUUsSUFBSSxFQUFFLGNBQWMsRUFBRSxDQUFDOzhCQUN6QyxJQUFJOytDQUFDO0FBRWhCO0lBQUMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUM7OzZDQUNoQjtBQUVoQjtJQUFDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFDOzsrQ0FDZDtBQWpCUCxZQUFZO0lBRHhCLElBQUEsV0FBSyxHQUFFO0dBQ0ssWUFBWSxDQWtCeEI7QUFsQlksb0NBQVkifQ==
|