cnpmcore 3.4.3 → 3.6.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/README.md +4 -0
- package/dist/app/common/adapter/CacheAdapter.d.ts +1 -1
- package/dist/app/common/adapter/CacheAdapter.js +2 -2
- package/dist/app/common/adapter/binary/PlaywrightBinary.js +2 -1
- package/dist/app/common/typing.d.ts +13 -0
- package/dist/app/core/service/CacheService.d.ts +1 -1
- package/dist/app/core/service/PackageManagerService.js +5 -1
- package/dist/app/core/service/UserService.d.ts +3 -1
- package/dist/app/core/service/UserService.js +17 -1
- package/dist/app/infra/AuthAdapter.d.ts +17 -0
- package/dist/app/infra/AuthAdapter.js +53 -0
- package/dist/app/infra/QueueAdapter.js +3 -2
- package/dist/app/port/webauth/WebauthController.d.ts +31 -0
- package/dist/app/port/webauth/WebauthController.js +231 -0
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
export declare class CacheAdapter {
|
|
3
3
|
private readonly redis;
|
|
4
4
|
setBytes(key: string, bytes: Buffer): Promise<void>;
|
|
5
|
-
getBytes(key: string): Promise<Buffer>;
|
|
5
|
+
getBytes(key: string): Promise<Buffer | null>;
|
|
6
6
|
set(key: string, text: string): Promise<void>;
|
|
7
7
|
get(key: string): Promise<string | null>;
|
|
8
8
|
delete(key: string): Promise<void>;
|
|
@@ -71,7 +71,7 @@ let CacheAdapter = class CacheAdapter {
|
|
|
71
71
|
};
|
|
72
72
|
__decorate([
|
|
73
73
|
(0, tegg_1.Inject)(),
|
|
74
|
-
__metadata("design:type",
|
|
74
|
+
__metadata("design:type", Function)
|
|
75
75
|
], CacheAdapter.prototype, "redis", void 0);
|
|
76
76
|
CacheAdapter = __decorate([
|
|
77
77
|
(0, tegg_1.SingletonProto)({
|
|
@@ -79,4 +79,4 @@ CacheAdapter = __decorate([
|
|
|
79
79
|
})
|
|
80
80
|
], CacheAdapter);
|
|
81
81
|
exports.CacheAdapter = CacheAdapter;
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2FjaGVBZGFwdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL2NvbW1vbi9hZGFwdGVyL0NhY2hlQWRhcHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FJcUI7QUFLckIsTUFBTSxPQUFPLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQztBQUtuQixJQUFNLFlBQVksR0FBbEIsTUFBTSxZQUFZO0lBSXZCLEtBQUssQ0FBQyxRQUFRLENBQUMsR0FBVyxFQUFFLEtBQWE7UUFDdkMsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQzlDLENBQUM7SUFFRCxLQUFLLENBQUMsUUFBUSxDQUFDLEdBQVc7UUFDeEIsT0FBTyxNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3pDLENBQUM7SUFFRCxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQVcsRUFBRSxJQUFZO1FBQ2pDLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBRUQsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFXO1FBQ25CLE9BQU8sTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNuQyxDQUFDO0lBRUQsS0FBSyxDQUFDLE1BQU0sQ0FBQyxHQUFXO1FBQ3RCLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDNUIsQ0FBQztJQUVELEtBQUssQ0FBQyxJQUFJLENBQUMsR0FBVyxFQUFFLE9BQWU7UUFDckMsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN2QyxNQUFNLGVBQWUsR0FBRyxNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ3ZELElBQUksZUFBZSxFQUFFO1lBQ25CLElBQUksSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLFFBQVEsQ0FBQyxlQUFlLENBQUMsR0FBRyxPQUFPLEdBQUcsSUFBSSxFQUFFO2dCQUMzRCxPQUFPLElBQUksQ0FBQzthQUNiO1lBQ0QsMEJBQTBCO1lBQzFCLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7U0FDaEM7UUFDRCxNQUFNLFNBQVMsR0FBRyxHQUFHLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxPQUFPLEdBQUcsSUFBSSxFQUFFLENBQUM7UUFDbkQsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxRQUFRLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDekQsd0JBQXdCO1FBQ3hCLElBQUksSUFBSSxLQUFLLENBQUM7WUFBRSxPQUFPLElBQUksQ0FBQztRQUM1QixTQUFTO1FBQ1QsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDM0MsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUVELEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBVyxFQUFFLGFBQXFCO1FBQzdDLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDdkMsTUFBTSxlQUFlLEdBQUcsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUN2RCxJQUFJLENBQUMsZUFBZSxJQUFJLGFBQWEsS0FBSyxlQUFlO1lBQUUsT0FBTztRQUNsRSxNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFFRCxLQUFLLENBQUMsU0FBUyxDQUFDLEdBQVcsRUFBRSxPQUFlLEVBQUUsSUFBeUI7UUFDckUsTUFBTSxhQUFhLEdBQUcsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUNwRCxJQUFJLENBQUMsYUFBYTtZQUFFLE9BQU87UUFDM0IsSUFBSTtZQUNGLE1BQU0sSUFBSSxFQUFFLENBQUM7U0FDZDtnQkFBUztZQUNSLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsYUFBYSxDQUFDLENBQUM7U0FDdkM7SUFDSCxDQUFDO0lBRU8sV0FBVyxDQUFDLEdBQVc7UUFDN0IsT0FBTyxjQUFjLEdBQUcsRUFBRSxDQUFDO0lBQzdCLENBQUM7Q0FDRixDQUFBO0FBOURDO0lBQUMsSUFBQSxhQUFNLEdBQUU7OzJDQUNxQjtBQUZuQixZQUFZO0lBSHhCLElBQUEscUJBQWMsRUFBQztRQUNkLFdBQVcsRUFBRSxrQkFBVyxDQUFDLE1BQU07S0FDaEMsQ0FBQztHQUNXLFlBQVksQ0ErRHhCO0FBL0RZLG9DQUFZIn0=
|
|
@@ -187,6 +187,7 @@ let PlaywrightBinary = class PlaywrightBinary extends AbstractBinary_1.AbstractB
|
|
|
187
187
|
browsers.push(...data.browsers);
|
|
188
188
|
})
|
|
189
189
|
.catch(err => {
|
|
190
|
+
/* c8 ignore next 2 */
|
|
190
191
|
this.logger.warn('[PlaywrightBinary.fetch:error] Playwright version %s browser data request failed: %s', version, err);
|
|
191
192
|
})));
|
|
192
193
|
for (const browser of browsers) {
|
|
@@ -225,4 +226,4 @@ PlaywrightBinary = __decorate([
|
|
|
225
226
|
(0, AbstractBinary_1.BinaryAdapter)(Binary_1.BinaryType.Playwright)
|
|
226
227
|
], PlaywrightBinary);
|
|
227
228
|
exports.PlaywrightBinary = PlaywrightBinary;
|
|
228
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
229
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PlaywrightBinary.js","sourceRoot":"","sources":["../../../../../app/common/adapter/binary/PlaywrightBinary.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
import { Readable } from 'stream';
|
|
4
4
|
import { IncomingHttpHeaders } from 'http';
|
|
5
|
+
import { EggContext } from '@eggjs/tegg';
|
|
5
6
|
export interface UploadResult {
|
|
6
7
|
key: string;
|
|
7
8
|
}
|
|
@@ -31,3 +32,15 @@ export interface QueueAdapter {
|
|
|
31
32
|
pop<T>(key: string): Promise<T | null>;
|
|
32
33
|
length(key: string): Promise<number>;
|
|
33
34
|
}
|
|
35
|
+
export interface AuthUrlResult {
|
|
36
|
+
loginUrl: string;
|
|
37
|
+
doneUrl: string;
|
|
38
|
+
}
|
|
39
|
+
export interface userResult {
|
|
40
|
+
name: string;
|
|
41
|
+
email: string;
|
|
42
|
+
}
|
|
43
|
+
export interface AuthClient {
|
|
44
|
+
getAuthUrl(ctx: EggContext): Promise<AuthUrlResult>;
|
|
45
|
+
ensureCurrentUser(): Promise<userResult | null>;
|
|
46
|
+
}
|
|
@@ -31,7 +31,7 @@ export type TotalData = {
|
|
|
31
31
|
export declare class CacheService extends AbstractService {
|
|
32
32
|
private cacheAdapter;
|
|
33
33
|
getPackageEtag(fullname: string, isFullManifests: boolean): Promise<string | null>;
|
|
34
|
-
getPackageManifests(fullname: string, isFullManifests: boolean): Promise<Buffer>;
|
|
34
|
+
getPackageManifests(fullname: string, isFullManifests: boolean): Promise<Buffer | null>;
|
|
35
35
|
savePackageEtagAndManifests(fullname: string, isFullManifests: boolean, etag: string, manifests: Buffer): Promise<void>;
|
|
36
36
|
getTotalData(): Promise<TotalData>;
|
|
37
37
|
saveTotalData(totalData: TotalData): Promise<void>;
|
|
@@ -55,6 +55,7 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
55
55
|
if (pkg.description !== cmd.description) {
|
|
56
56
|
pkg.description = cmd.description;
|
|
57
57
|
}
|
|
58
|
+
/* c8 ignore next 3 */
|
|
58
59
|
if (!pkg.registryId && cmd.registryId) {
|
|
59
60
|
pkg.registryId = cmd.registryId;
|
|
60
61
|
}
|
|
@@ -525,6 +526,7 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
525
526
|
const pkg = await this.packageRepository.findPackage('', constants_1.BUG_VERSIONS);
|
|
526
527
|
if (!pkg)
|
|
527
528
|
return;
|
|
529
|
+
/* c8 ignore next 10 */
|
|
528
530
|
const tag = await this.packageRepository.findPackageTag(pkg.packageId, constants_1.LATEST_TAG);
|
|
529
531
|
if (!tag)
|
|
530
532
|
return;
|
|
@@ -691,6 +693,7 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
691
693
|
}
|
|
692
694
|
await this._updatePackageManifestsToDists(pkg, fullManifests, abbreviatedManifests);
|
|
693
695
|
const manifests = (fullManifests || abbreviatedManifests);
|
|
696
|
+
/* c8 ignore next 5 */
|
|
694
697
|
if (bugVersion) {
|
|
695
698
|
await this.bugVersionService.fixPackageBugVersions(bugVersion, fullname, manifests.versions);
|
|
696
699
|
const distBytes = Buffer.from(JSON.stringify(manifests));
|
|
@@ -765,6 +768,7 @@ let PackageManagerService = PackageManagerService_1 = class PackageManagerServic
|
|
|
765
768
|
const manifest = await this.distRepository.readDistBytesToJSON(packageVersion.manifestDist);
|
|
766
769
|
if (!manifest)
|
|
767
770
|
continue;
|
|
771
|
+
/* c8 ignore next 3 */
|
|
768
772
|
if ('readme' in manifest) {
|
|
769
773
|
delete manifest.readme;
|
|
770
774
|
}
|
|
@@ -839,4 +843,4 @@ PackageManagerService = PackageManagerService_1 = __decorate([
|
|
|
839
843
|
})
|
|
840
844
|
], PackageManagerService);
|
|
841
845
|
exports.PackageManagerService = PackageManagerService;
|
|
842
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageManagerService.js","sourceRoot":"","sources":["../../../../app/core/service/PackageManagerService.ts"],"names":[],"mappings":"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"}
|
|
846
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageManagerService.js","sourceRoot":"","sources":["../../../../app/core/service/PackageManagerService.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,11 @@ import { User as UserEntity } from '../entity/User';
|
|
|
2
2
|
import { Token as TokenEntity } from '../entity/Token';
|
|
3
3
|
import { LoginResultCode } from '../../common/enum/User';
|
|
4
4
|
import { AbstractService } from '../../common/AbstractService';
|
|
5
|
+
type Optional<T, K extends keyof T> = Omit<T, K> & Partial<T>;
|
|
5
6
|
type CreateUser = {
|
|
6
7
|
name: string;
|
|
7
|
-
password: string;
|
|
8
8
|
email: string;
|
|
9
|
+
password: string;
|
|
9
10
|
ip: string;
|
|
10
11
|
};
|
|
11
12
|
type LoginResult = {
|
|
@@ -22,6 +23,7 @@ export declare class UserService extends AbstractService {
|
|
|
22
23
|
private readonly userRepository;
|
|
23
24
|
checkPassword(user: UserEntity, password: string): boolean;
|
|
24
25
|
login(name: string, password: string): Promise<LoginResult>;
|
|
26
|
+
ensureTokenByUser({ name, email, password, ip }: Optional<CreateUser, 'password'>): Promise<TokenEntity>;
|
|
25
27
|
create(createUser: CreateUser): Promise<{
|
|
26
28
|
user: UserEntity;
|
|
27
29
|
token: TokenEntity;
|
|
@@ -37,6 +37,22 @@ let UserService = class UserService extends AbstractService_1.AbstractService {
|
|
|
37
37
|
const token = await this.createToken(user.userId);
|
|
38
38
|
return { code: User_2.LoginResultCode.Success, user, token };
|
|
39
39
|
}
|
|
40
|
+
async ensureTokenByUser({ name, email, password = crypto_1.default.randomUUID(), ip }) {
|
|
41
|
+
let user = await this.userRepository.findUserByName(name);
|
|
42
|
+
if (!user) {
|
|
43
|
+
const createRes = await this.create({
|
|
44
|
+
name,
|
|
45
|
+
email,
|
|
46
|
+
// Authentication via sso
|
|
47
|
+
// should use token instead of password
|
|
48
|
+
password,
|
|
49
|
+
ip,
|
|
50
|
+
});
|
|
51
|
+
user = createRes.user;
|
|
52
|
+
}
|
|
53
|
+
const token = await this.createToken(user.userId);
|
|
54
|
+
return token;
|
|
55
|
+
}
|
|
40
56
|
async create(createUser) {
|
|
41
57
|
const passwordSalt = crypto_1.default.randomBytes(30).toString('hex');
|
|
42
58
|
const plain = `${passwordSalt}${createUser.password}`;
|
|
@@ -121,4 +137,4 @@ UserService = __decorate([
|
|
|
121
137
|
})
|
|
122
138
|
], UserService);
|
|
123
139
|
exports.UserService = UserService;
|
|
124
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
140
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlclNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvY29yZS9zZXJ2aWNlL1VzZXJTZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLG9EQUE0QjtBQUM1QixzQ0FJcUI7QUFDckIsMkNBQTJEO0FBQzNELG9FQUFpRTtBQUNqRSx5Q0FBb0Q7QUFDcEQsMkNBQXVEO0FBQ3ZELGlEQUF5RDtBQUN6RCxvREFBdUY7QUFDdkYsa0VBQStEO0FBMEJ4RCxJQUFNLFdBQVcsR0FBakIsTUFBTSxXQUFZLFNBQVEsaUNBQWU7SUFJOUMsYUFBYSxDQUFDLElBQWdCLEVBQUUsUUFBZ0I7UUFDOUMsTUFBTSxLQUFLLEdBQUcsR0FBRyxJQUFJLENBQUMsWUFBWSxHQUFHLFFBQVEsRUFBRSxDQUFDO1FBQ2hELE9BQU8sSUFBQSx5QkFBYyxFQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUN2RCxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUFZLEVBQUUsUUFBZ0I7UUFDeEMsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM1RCxJQUFJLENBQUMsSUFBSTtZQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsc0JBQWUsQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUN6RCxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLEVBQUU7WUFDdkMsT0FBTyxFQUFFLElBQUksRUFBRSxzQkFBZSxDQUFDLElBQUksRUFBRSxDQUFDO1NBQ3ZDO1FBQ0QsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNsRCxPQUFPLEVBQUUsSUFBSSxFQUFFLHNCQUFlLENBQUMsT0FBTyxFQUFFLElB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
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { EggContext } from '@eggjs/tegg';
|
|
2
|
+
import { Redis } from 'ioredis';
|
|
3
|
+
import { AuthClient, AuthUrlResult, userResult } from '../common/typing';
|
|
4
|
+
type SSO_USER = {
|
|
5
|
+
name: string;
|
|
6
|
+
email: string;
|
|
7
|
+
};
|
|
8
|
+
/**
|
|
9
|
+
* Use sort set to keep queue in order and keep same value only insert once
|
|
10
|
+
*/
|
|
11
|
+
export declare class AuthAdapter implements AuthClient {
|
|
12
|
+
readonly redis: Redis;
|
|
13
|
+
readonly user: SSO_USER;
|
|
14
|
+
getAuthUrl(ctx: EggContext): Promise<AuthUrlResult>;
|
|
15
|
+
ensureCurrentUser(): Promise<userResult | null>;
|
|
16
|
+
}
|
|
17
|
+
export {};
|
|
@@ -0,0 +1,53 @@
|
|
|
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.AuthAdapter = void 0;
|
|
13
|
+
const tegg_1 = require("@eggjs/tegg");
|
|
14
|
+
const ioredis_1 = require("ioredis");
|
|
15
|
+
const crypto_1 = require("crypto");
|
|
16
|
+
const ONE_DAY = 3600 * 24;
|
|
17
|
+
/**
|
|
18
|
+
* Use sort set to keep queue in order and keep same value only insert once
|
|
19
|
+
*/
|
|
20
|
+
let AuthAdapter = class AuthAdapter {
|
|
21
|
+
async getAuthUrl(ctx) {
|
|
22
|
+
const sessionId = (0, crypto_1.randomUUID)();
|
|
23
|
+
await this.redis.setex(sessionId, ONE_DAY, '');
|
|
24
|
+
return {
|
|
25
|
+
loginUrl: `${ctx.href}/request/session/${sessionId}`,
|
|
26
|
+
doneUrl: `${ctx.href}/done/session/${sessionId}`,
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
// should implements in infra
|
|
30
|
+
async ensureCurrentUser() {
|
|
31
|
+
if (this.user) {
|
|
32
|
+
const { name, email } = this.user;
|
|
33
|
+
return { name, email };
|
|
34
|
+
}
|
|
35
|
+
return null;
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
__decorate([
|
|
39
|
+
(0, tegg_1.Inject)(),
|
|
40
|
+
__metadata("design:type", ioredis_1.Redis)
|
|
41
|
+
], AuthAdapter.prototype, "redis", void 0);
|
|
42
|
+
__decorate([
|
|
43
|
+
(0, tegg_1.Inject)(),
|
|
44
|
+
__metadata("design:type", Object)
|
|
45
|
+
], AuthAdapter.prototype, "user", void 0);
|
|
46
|
+
AuthAdapter = __decorate([
|
|
47
|
+
(0, tegg_1.SingletonProto)({
|
|
48
|
+
accessLevel: tegg_1.AccessLevel.PUBLIC,
|
|
49
|
+
name: 'authAdapter',
|
|
50
|
+
})
|
|
51
|
+
], AuthAdapter);
|
|
52
|
+
exports.AuthAdapter = AuthAdapter;
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXV0aEFkYXB0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvaW5mcmEvQXV0aEFkYXB0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsc0NBS3FCO0FBQ3JCLHFDQUFnQztBQUNoQyxtQ0FBb0M7QUFHcEMsTUFBTSxPQUFPLEdBQUcsSUFBSSxHQUFHLEVBQUUsQ0FBQztBQU8xQjs7R0FFRztBQUtJLElBQU0sV0FBVyxHQUFqQixNQUFNLFdBQVc7SUFPdEIsS0FBSyxDQUFDLFVBQVUsQ0FBQyxHQUFlO1FBQzlCLE1BQU0sU0FBUyxHQUFHLElBQUEsbUJBQVUsR0FBRSxDQUFDO1FBQy9CLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUFFLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FBQztRQUMvQyxPQUFPO1lBQ0wsUUFBUSxFQUFFLEdBQUcsR0FBRyxDQUFDLElBQUksb0JBQW9CLFNBQVMsRUFBRTtZQUNwRCxPQUFPLEVBQUUsR0FBRyxHQUFHLENBQUMsSUFBSSxpQkFBaUIsU0FBUyxFQUFFO1NBQ2pELENBQUM7SUFDSixDQUFDO0lBRUQsNkJBQTZCO0lBQzdCLEtBQUssQ0FBQyxpQkFBaUI7UUFDckIsSUFBSSxJQUFJLENBQUMsSUFBSSxFQUFFO1lBQ2IsTUFBTSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDO1lBQ2xDLE9BQU8sRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFnQixDQUFDO1NBQ3RDO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0NBRUYsQ0FBQTtBQXhCQztJQUFDLElBQUEsYUFBTSxHQUFFOzhCQUNPLGVBQUs7MENBQUM7QUFFdEI7SUFBQyxJQUFBLGFBQU0sR0FBRTs7eUNBQ2U7QUFMYixXQUFXO0lBSnZCLElBQUEscUJBQWMsRUFBQztRQUNkLFdBQVcsRUFBRSxrQkFBVyxDQUFDLE1BQU07UUFDL0IsSUFBSSxFQUFFLGFBQWE7S0FDcEIsQ0FBQztHQUNXLFdBQVcsQ0F5QnZCO0FBekJZLGtDQUFXIn0=
|
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.RedisQueueAdapter = void 0;
|
|
13
13
|
const tegg_1 = require("@eggjs/tegg");
|
|
14
|
+
const ioredis_1 = require("ioredis");
|
|
14
15
|
/**
|
|
15
16
|
* Use sort set to keep queue in order and keep same value only insert once
|
|
16
17
|
*/
|
|
@@ -42,7 +43,7 @@ let RedisQueueAdapter = class RedisQueueAdapter {
|
|
|
42
43
|
};
|
|
43
44
|
__decorate([
|
|
44
45
|
(0, tegg_1.Inject)(),
|
|
45
|
-
__metadata("design:type",
|
|
46
|
+
__metadata("design:type", ioredis_1.Redis)
|
|
46
47
|
], RedisQueueAdapter.prototype, "redis", void 0);
|
|
47
48
|
RedisQueueAdapter = __decorate([
|
|
48
49
|
(0, tegg_1.SingletonProto)({
|
|
@@ -51,4 +52,4 @@ RedisQueueAdapter = __decorate([
|
|
|
51
52
|
})
|
|
52
53
|
], RedisQueueAdapter);
|
|
53
54
|
exports.RedisQueueAdapter = RedisQueueAdapter;
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUXVldWVBZGFwdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYXBwL2luZnJhL1F1ZXVlQWRhcHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FJcUI7QUFDckIscUNBQWdDO0FBR2hDOztHQUVHO0FBS0ksSUFBTSxpQkFBaUIsR0FBdkIsTUFBTSxpQkFBaUI7SUFJcEIsWUFBWSxDQUFDLEdBQVc7UUFDOUIsT0FBTyxpQkFBaUIsR0FBRyxFQUFFLENBQUM7SUFDaEMsQ0FBQztJQUVPLGlCQUFpQixDQUFDLEdBQVc7UUFDbkMsT0FBTyxtQkFBbUIsR0FBRyxFQUFFLENBQUM7SUFDbEMsQ0FBQztJQUVEOzs7T0FHRztJQUNILEtBQUssQ0FBQyxJQUFJLENBQUksR0FBVyxFQUFFLElBQU87UUFDaEMsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNqRSxNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUN2RixPQUFPLEdBQUcsS0FBSyxDQUFDLENBQUM7SUFDbkIsQ0FBQztJQUVELEtBQUssQ0FBQyxHQUFHLENBQUksR0FBVztRQUN0QixNQUFNLENBQUUsSUFBSSxDQUFFLEdBQUcsTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDbEUsSUFBSSxDQUFDLElBQUk7WUFBRSxPQUFPLElBQUksQ0FBQztRQUN2QixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFNLENBQUM7SUFDL0IsQ0FBQztJQUVELEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBVztRQUN0QixPQUFPLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDekUsQ0FBQztDQUNGLENBQUE7QUE5QkM7SUFBQyxJQUFBLGFBQU0sR0FBRTs4QkFDZSxlQUFLO2dEQUFDO0FBRm5CLGlCQUFpQjtJQUo3QixJQUFBLHFCQUFjLEVBQUM7UUFDZCxXQUFXLEVBQUUsa0JBQVcsQ0FBQyxNQUFNO1FBQy9CLElBQUksRUFBRSxjQUFjO0tBQ3JCLENBQUM7R0FDVyxpQkFBaUIsQ0ErQjdCO0FBL0JZLDhDQUFpQiJ9
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { EggContext } from '@eggjs/tegg';
|
|
2
|
+
import { EggLogger, EggAppConfig } from 'egg';
|
|
3
|
+
import { Static } from '@sinclair/typebox';
|
|
4
|
+
import { UserService } from '../../core/service/UserService';
|
|
5
|
+
import { MiddlewareController } from '../middleware';
|
|
6
|
+
declare const LoginRequestRule: import("@sinclair/typebox").TObject<{
|
|
7
|
+
hostname: import("@sinclair/typebox").TString;
|
|
8
|
+
}>;
|
|
9
|
+
type LoginRequest = Static<typeof LoginRequestRule>;
|
|
10
|
+
export declare class WebauthController extends MiddlewareController {
|
|
11
|
+
private cacheAdapter;
|
|
12
|
+
private authAdapter;
|
|
13
|
+
protected logger: EggLogger;
|
|
14
|
+
protected config: EggAppConfig;
|
|
15
|
+
protected userService: UserService;
|
|
16
|
+
login(ctx: EggContext, loginRequest: LoginRequest): Promise<import("../../common/typing").AuthUrlResult>;
|
|
17
|
+
private setBasicAuth;
|
|
18
|
+
loginRequest(ctx: EggContext, sessionId: string): Promise<string | undefined>;
|
|
19
|
+
ssoRequest(ctx: EggContext, sessionId: string): Promise<{
|
|
20
|
+
success: boolean;
|
|
21
|
+
}>;
|
|
22
|
+
loginRequestSuccess(ctx: EggContext): Promise<string>;
|
|
23
|
+
loginDone(ctx: EggContext, sessionId: string): Promise<{
|
|
24
|
+
message: string;
|
|
25
|
+
token?: undefined;
|
|
26
|
+
} | {
|
|
27
|
+
token: string;
|
|
28
|
+
message?: undefined;
|
|
29
|
+
}>;
|
|
30
|
+
}
|
|
31
|
+
export {};
|
|
@@ -0,0 +1,231 @@
|
|
|
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 __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.WebauthController = void 0;
|
|
16
|
+
const tegg_1 = require("@eggjs/tegg");
|
|
17
|
+
const typebox_1 = require("@sinclair/typebox");
|
|
18
|
+
const egg_errors_1 = require("egg-errors");
|
|
19
|
+
const User_1 = require("../../common/enum/User");
|
|
20
|
+
const CacheAdapter_1 = require("../../common/adapter/CacheAdapter");
|
|
21
|
+
const UserService_1 = require("../../core/service/UserService");
|
|
22
|
+
const middleware_1 = require("../middleware");
|
|
23
|
+
const AuthAdapter_1 = require("../../infra/AuthAdapter");
|
|
24
|
+
const LoginRequestRule = typebox_1.Type.Object({
|
|
25
|
+
// cli 所在机器的 hostname
|
|
26
|
+
hostname: typebox_1.Type.String({ minLength: 1, maxLength: 100 }),
|
|
27
|
+
});
|
|
28
|
+
const UserRule = typebox_1.Type.Object({
|
|
29
|
+
name: typebox_1.Type.String({ minLength: 1, maxLength: 100 }),
|
|
30
|
+
password: typebox_1.Type.String({ minLength: 8, maxLength: 100 }),
|
|
31
|
+
});
|
|
32
|
+
const SessionRule = typebox_1.Type.Object({
|
|
33
|
+
// uuid
|
|
34
|
+
sessionId: typebox_1.Type.String({ minLength: 36, maxLength: 36 }),
|
|
35
|
+
});
|
|
36
|
+
let WebauthController = class WebauthController extends middleware_1.MiddlewareController {
|
|
37
|
+
// https://github.com/cnpm/cnpmcore/issues/348
|
|
38
|
+
async login(ctx, loginRequest) {
|
|
39
|
+
ctx.tValidate(LoginRequestRule, loginRequest);
|
|
40
|
+
return this.authAdapter.getAuthUrl(ctx);
|
|
41
|
+
}
|
|
42
|
+
setBasicAuth(ctx) {
|
|
43
|
+
ctx.status = 401;
|
|
44
|
+
ctx.set('WWW-Authenticate', 'Basic realm="Login to cnpmcore"');
|
|
45
|
+
}
|
|
46
|
+
async loginRequest(ctx, sessionId) {
|
|
47
|
+
ctx.tValidate(SessionRule, { sessionId });
|
|
48
|
+
ctx.type = 'html';
|
|
49
|
+
const sessionToken = await this.cacheAdapter.get(sessionId);
|
|
50
|
+
if (typeof sessionToken !== 'string') {
|
|
51
|
+
ctx.status = 404;
|
|
52
|
+
return '<h1>😭😭😭 Session not found, please try again on your command line 😭😭😭</h1>';
|
|
53
|
+
}
|
|
54
|
+
// Basic auth
|
|
55
|
+
const authorization = ctx.get('authorization');
|
|
56
|
+
if (!authorization) {
|
|
57
|
+
this.setBasicAuth(ctx);
|
|
58
|
+
return 'Unauthorized';
|
|
59
|
+
}
|
|
60
|
+
// 'Basic xxxx=='
|
|
61
|
+
if (!authorization.startsWith('Basic ')) {
|
|
62
|
+
this.setBasicAuth(ctx);
|
|
63
|
+
return 'Unauthorized, invalid authorization, only support "Basic" authorization';
|
|
64
|
+
}
|
|
65
|
+
const base64String = authorization.replace('Basic ', '');
|
|
66
|
+
// {user}:{pass}
|
|
67
|
+
const userAuth = Buffer.from(base64String, 'base64').toString();
|
|
68
|
+
const sepIndex = userAuth.indexOf(':');
|
|
69
|
+
const username = userAuth.substring(0, sepIndex);
|
|
70
|
+
const password = userAuth.substring(sepIndex + 1);
|
|
71
|
+
const user = {
|
|
72
|
+
name: username,
|
|
73
|
+
password,
|
|
74
|
+
};
|
|
75
|
+
try {
|
|
76
|
+
ctx.tValidate(UserRule, user);
|
|
77
|
+
}
|
|
78
|
+
catch (err) {
|
|
79
|
+
const message = err.message;
|
|
80
|
+
this.setBasicAuth(ctx);
|
|
81
|
+
return `Unauthorized, ${message}`;
|
|
82
|
+
}
|
|
83
|
+
if (this.config.cnpmcore.allowPublicRegistration === false) {
|
|
84
|
+
if (!this.config.cnpmcore.admins[user.name]) {
|
|
85
|
+
ctx.status = 403;
|
|
86
|
+
return '<h1>😭😭😭 Public registration is not allowed 😭😭😭</h1>';
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
const result = await this.userService.login(user.name, user.password);
|
|
90
|
+
// user exists and password not match
|
|
91
|
+
if (result.code === User_1.LoginResultCode.Fail) {
|
|
92
|
+
this.setBasicAuth(ctx);
|
|
93
|
+
return '<h1>😭😭😭 Please check your login name and password 😭😭😭</h1>';
|
|
94
|
+
}
|
|
95
|
+
let token = '';
|
|
96
|
+
if (result.code === User_1.LoginResultCode.Success) {
|
|
97
|
+
// login success
|
|
98
|
+
token = result.token.token;
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
// others: LoginResultCode.UserNotFound
|
|
102
|
+
// create user request
|
|
103
|
+
const createRes = await this.userService.ensureTokenByUser({
|
|
104
|
+
name: user.name,
|
|
105
|
+
password: user.password,
|
|
106
|
+
// FIXME: email verify
|
|
107
|
+
email: `${user.name}@webauth.cnpmjs.org`,
|
|
108
|
+
ip: ctx.ip,
|
|
109
|
+
});
|
|
110
|
+
token = createRes.token;
|
|
111
|
+
}
|
|
112
|
+
await this.cacheAdapter.set(sessionId, token);
|
|
113
|
+
ctx.redirect('/-/v1/login/request/success');
|
|
114
|
+
}
|
|
115
|
+
async ssoRequest(ctx, sessionId) {
|
|
116
|
+
ctx.tValidate(SessionRule, { sessionId });
|
|
117
|
+
const sessionData = await this.cacheAdapter.get(sessionId);
|
|
118
|
+
if (sessionData !== '') {
|
|
119
|
+
throw new egg_errors_1.ForbiddenError('invalid sessionId');
|
|
120
|
+
}
|
|
121
|
+
// get current userInfo from infra
|
|
122
|
+
// @see https://github.com/eggjs/egg-userservice
|
|
123
|
+
const userRes = await this.authAdapter.ensureCurrentUser();
|
|
124
|
+
if (!userRes?.name || !userRes?.email) {
|
|
125
|
+
throw new egg_errors_1.ForbiddenError('invalid user info');
|
|
126
|
+
}
|
|
127
|
+
const { name, email } = userRes;
|
|
128
|
+
const { token } = await this.userService.ensureTokenByUser({ name, email, ip: ctx.ip });
|
|
129
|
+
await this.cacheAdapter.set(sessionId, token);
|
|
130
|
+
return { success: true };
|
|
131
|
+
}
|
|
132
|
+
async loginRequestSuccess(ctx) {
|
|
133
|
+
ctx.type = 'html';
|
|
134
|
+
return `<h1>😁😁😁 Authorization Successful 😁😁😁</h1>
|
|
135
|
+
<p>You can close this tab and return to your command line.</p>`;
|
|
136
|
+
}
|
|
137
|
+
async loginDone(ctx, sessionId) {
|
|
138
|
+
ctx.tValidate(SessionRule, { sessionId });
|
|
139
|
+
const token = await this.cacheAdapter.get(sessionId);
|
|
140
|
+
if (typeof token !== 'string') {
|
|
141
|
+
throw new egg_errors_1.NotFoundError('session not found');
|
|
142
|
+
}
|
|
143
|
+
if (token === '') {
|
|
144
|
+
ctx.status = 202;
|
|
145
|
+
ctx.set('retry-after', '1');
|
|
146
|
+
return { message: 'processing' };
|
|
147
|
+
}
|
|
148
|
+
// only get once
|
|
149
|
+
await this.cacheAdapter.delete(sessionId);
|
|
150
|
+
return { token };
|
|
151
|
+
}
|
|
152
|
+
};
|
|
153
|
+
__decorate([
|
|
154
|
+
(0, tegg_1.Inject)(),
|
|
155
|
+
__metadata("design:type", CacheAdapter_1.CacheAdapter)
|
|
156
|
+
], WebauthController.prototype, "cacheAdapter", void 0);
|
|
157
|
+
__decorate([
|
|
158
|
+
(0, tegg_1.Inject)(),
|
|
159
|
+
__metadata("design:type", AuthAdapter_1.AuthAdapter)
|
|
160
|
+
], WebauthController.prototype, "authAdapter", void 0);
|
|
161
|
+
__decorate([
|
|
162
|
+
(0, tegg_1.Inject)(),
|
|
163
|
+
__metadata("design:type", Object)
|
|
164
|
+
], WebauthController.prototype, "logger", void 0);
|
|
165
|
+
__decorate([
|
|
166
|
+
(0, tegg_1.Inject)(),
|
|
167
|
+
__metadata("design:type", Object)
|
|
168
|
+
], WebauthController.prototype, "config", void 0);
|
|
169
|
+
__decorate([
|
|
170
|
+
(0, tegg_1.Inject)(),
|
|
171
|
+
__metadata("design:type", UserService_1.UserService)
|
|
172
|
+
], WebauthController.prototype, "userService", void 0);
|
|
173
|
+
__decorate([
|
|
174
|
+
(0, tegg_1.HTTPMethod)({
|
|
175
|
+
path: '/-/v1/login',
|
|
176
|
+
method: tegg_1.HTTPMethodEnum.POST,
|
|
177
|
+
}),
|
|
178
|
+
__param(0, (0, tegg_1.Context)()),
|
|
179
|
+
__param(1, (0, tegg_1.HTTPBody)()),
|
|
180
|
+
__metadata("design:type", Function),
|
|
181
|
+
__metadata("design:paramtypes", [Object, Object]),
|
|
182
|
+
__metadata("design:returntype", Promise)
|
|
183
|
+
], WebauthController.prototype, "login", null);
|
|
184
|
+
__decorate([
|
|
185
|
+
(0, tegg_1.HTTPMethod)({
|
|
186
|
+
path: '/-/v1/login/request/session/:sessionId',
|
|
187
|
+
method: tegg_1.HTTPMethodEnum.GET,
|
|
188
|
+
}),
|
|
189
|
+
__param(0, (0, tegg_1.Context)()),
|
|
190
|
+
__param(1, (0, tegg_1.HTTPParam)()),
|
|
191
|
+
__metadata("design:type", Function),
|
|
192
|
+
__metadata("design:paramtypes", [Object, String]),
|
|
193
|
+
__metadata("design:returntype", Promise)
|
|
194
|
+
], WebauthController.prototype, "loginRequest", null);
|
|
195
|
+
__decorate([
|
|
196
|
+
(0, tegg_1.HTTPMethod)({
|
|
197
|
+
path: '/-/v1/login/sso/:sessionId',
|
|
198
|
+
method: tegg_1.HTTPMethodEnum.POST,
|
|
199
|
+
}),
|
|
200
|
+
__param(0, (0, tegg_1.Context)()),
|
|
201
|
+
__param(1, (0, tegg_1.HTTPParam)()),
|
|
202
|
+
__metadata("design:type", Function),
|
|
203
|
+
__metadata("design:paramtypes", [Object, String]),
|
|
204
|
+
__metadata("design:returntype", Promise)
|
|
205
|
+
], WebauthController.prototype, "ssoRequest", null);
|
|
206
|
+
__decorate([
|
|
207
|
+
(0, tegg_1.HTTPMethod)({
|
|
208
|
+
path: '/-/v1/login/request/success',
|
|
209
|
+
method: tegg_1.HTTPMethodEnum.GET,
|
|
210
|
+
}),
|
|
211
|
+
__param(0, (0, tegg_1.Context)()),
|
|
212
|
+
__metadata("design:type", Function),
|
|
213
|
+
__metadata("design:paramtypes", [Object]),
|
|
214
|
+
__metadata("design:returntype", Promise)
|
|
215
|
+
], WebauthController.prototype, "loginRequestSuccess", null);
|
|
216
|
+
__decorate([
|
|
217
|
+
(0, tegg_1.HTTPMethod)({
|
|
218
|
+
path: '/-/v1/login/done/session/:sessionId',
|
|
219
|
+
method: tegg_1.HTTPMethodEnum.GET,
|
|
220
|
+
}),
|
|
221
|
+
__param(0, (0, tegg_1.Context)()),
|
|
222
|
+
__param(1, (0, tegg_1.HTTPParam)()),
|
|
223
|
+
__metadata("design:type", Function),
|
|
224
|
+
__metadata("design:paramtypes", [Object, String]),
|
|
225
|
+
__metadata("design:returntype", Promise)
|
|
226
|
+
], WebauthController.prototype, "loginDone", null);
|
|
227
|
+
WebauthController = __decorate([
|
|
228
|
+
(0, tegg_1.HTTPController)()
|
|
229
|
+
], WebauthController);
|
|
230
|
+
exports.WebauthController = WebauthController;
|
|
231
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV2ViYXV0aENvbnRyb2xsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcG9ydC93ZWJhdXRoL1dlYmF1dGhDb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQVNxQjtBQUtyQiwrQ0FBaUQ7QUFDakQsMkNBQTJEO0FBQzNELGlEQUF5RDtBQUN6RCxvRUFBaUU7QUFDakUsZ0VBQTZEO0FBQzdELDhDQUFxRDtBQUNyRCx5REFBc0Q7QUFFdEQsTUFBTSxnQkFBZ0IsR0FBRyxjQUFJLENBQUMsTUFBTSxDQUFDO0lBQ25DLHFCQUFxQjtJQUNyQixRQUFRLEVBQUUsY0FBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLFNBQVMsRUFBRSxDQUFDLEVBQUUsU0FBUyxFQUFFLEdBQUcsRUFBRSxDQUFDO0NBQ3hELENBQUMsQ0FBQztBQUdILE1BQU0sUUFBUSxHQUFHLGNBQUksQ0FBQyxNQUFNLENBQUM7SUFDM0IsSUFBSSxFQUFFLGNBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxTQUFTLEVBQUUsQ0FBQyxFQUFFLFNBQVMsRUFBRSxHQUFHLEVBQUUsQ0FBQztJQUNuRCxRQUFRLEVBQUUsY0FBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLFNBQVMsRUFBRSxDQUFDLEVBQUUsU0FBUyxFQUFFLEdBQUcsRUFBRSxDQUFDO0NBQ3hELENBQUMsQ0FBQztBQUdILE1BQU0sV0FBVyxHQUFHLGNBQUksQ0FBQyxNQUFNLENBQUM7SUFDOUIsT0FBTztJQUNQLFNBQVMsRUFBRSxjQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsU0FBUyxFQUFFLEVBQUUsRUFBRSxTQUFTLEVBQUUsRUFBRSxFQUFFLENBQUM7Q0FDekQsQ0FBQyxDQUFDO0FBR0ksSUFBTSxpQkFBaUIsR0FBdkIsTUFBTSxpQkFBa0IsU0FBUSxpQ0FBb0I7SUFZekQsOENBQThDO0lBS3hDLEFBQU4sS0FBSyxDQUFDLEtBQUssQ0FBWSxHQUFlLEVB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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cnpmcore",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.6.0",
|
|
4
4
|
"description": "npm core",
|
|
5
5
|
"files": [
|
|
6
6
|
"dist/**/*"
|
|
@@ -87,7 +87,7 @@
|
|
|
87
87
|
"egg-tracer": "^1.1.0",
|
|
88
88
|
"egg-typebox-validate": "^2.0.0",
|
|
89
89
|
"fs-cnpm": "^2.4.0",
|
|
90
|
-
"ioredis": "^
|
|
90
|
+
"ioredis": "^5.3.1",
|
|
91
91
|
"leoric": "^2.6.2",
|
|
92
92
|
"lodash": "^4.17.21",
|
|
93
93
|
"mysql": "^2.18.1",
|