Skip to content

Commit 7d11892

Browse files
@jotadevelopersergiohgz
authored andcommitted
feat: add RemoteUser type
fix wrong reference for authentication handlers
1 parent e60e575 commit 7d11892

File tree

1 file changed

+59
-50
lines changed

1 file changed

+59
-50
lines changed

core/types/src/types.js

Lines changed: 59 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,6 @@ declare type verdaccio$StringValue = string | void | null;
44

55
stream$PassThrough
66

7-
declare class verdaccio$IUploadTarball extends stream$PassThrough {
8-
abort: Function;
9-
done: Function;
10-
_transform: Function;
11-
abort(): void;
12-
done(): void;
13-
}
14-
15-
declare class verdaccio$IReadTarball extends stream$PassThrough {
16-
abort: Function;
17-
abort(): void;
18-
}
19-
207
declare type verdaccio$Callback = Function;
218

229
declare type verdaccio$StorageList = Array<string>;
@@ -37,6 +24,13 @@ declare type verdaccio$Author = {
3724
email: string;
3825
}
3926

27+
declare type verdaccio$RemoteUser = {
28+
real_groups: Array<string>;
29+
groups: Array<string>;
30+
name: string | void;
31+
error?: string;
32+
}
33+
4034
declare type verdaccio$Version = {
4135
name: string,
4236
version: string,
@@ -136,11 +130,17 @@ declare type verdaccio$Package = {
136130
_rev: string;
137131
}
138132

139-
declare interface verdaccio$ILocalStorage {
140-
add(name: string): void;
141-
remove(name: string): void;
142-
get(): verdaccio$StorageList;
143-
sync(): void;
133+
declare class verdaccio$IUploadTarball extends stream$PassThrough {
134+
abort: Function;
135+
done: Function;
136+
_transform: Function;
137+
abort(): void;
138+
done(): void;
139+
}
140+
141+
declare class verdaccio$IReadTarball extends stream$PassThrough {
142+
abort: Function;
143+
abort(): void;
144144
}
145145

146146
declare type verdaccio$UpLinkTokenConf = {
@@ -180,11 +180,6 @@ declare type verdaccio$UpLinksConfList = {
180180
[key: string]: verdaccio$UpLinkConf;
181181
}
182182

183-
declare interface verdaccio$AuthHtpasswd {
184-
file: string;
185-
max_users: string;
186-
}
187-
188183
declare type verdaccio$LoggerType = 'stdout' | 'stderr' | 'file';
189184
declare type verdaccio$LoggerFormat = 'pretty' | 'pretty-timestamped' | 'file';
190185
declare type verdaccio$LoggerLevel = 'http' | 'fatal' | 'warn' | 'info' | 'debug' | 'trace';
@@ -199,28 +194,6 @@ declare type verdaccio$PublishOptions = {
199194
allow_offline: boolean;
200195
}
201196

202-
declare interface verdaccio$LoggerConf {
203-
[key: string]: verdaccio$LoggerConfItem;
204-
}
205-
206-
declare interface verdaccio$ListenAddress {
207-
[key: string]: string;
208-
}
209-
210-
declare interface verdaccio$WebConf {
211-
enable: boolean;
212-
title: string;
213-
logo: string;
214-
}
215-
216-
declare interface verdaccio$HttpsConf {
217-
key?: string;
218-
cert?: string;
219-
ca?: string;
220-
pfx?: string;
221-
passphrase?: string;
222-
}
223-
224197
declare type verdaccio$AuthConf = any | verdaccio$AuthHtpasswd;
225198

226199
declare type verdaccio$Notifications = {
@@ -252,6 +225,43 @@ declare type verdaccio$ConfigFile = {
252225
notifications: verdaccio$Notifications;
253226
}
254227

228+
declare type verdaccio$SyncReturn = Error | void;
229+
declare type verdaccio$IPackageStorage = verdaccio$ILocalPackageManager | void;
230+
231+
declare interface verdaccio$AuthHtpasswd {
232+
file: string;
233+
max_users: string;
234+
}
235+
236+
declare interface verdaccio$ILocalStorage {
237+
add(name: string): void;
238+
remove(name: string): void;
239+
get(): verdaccio$StorageList;
240+
sync(): void;
241+
}
242+
243+
declare interface verdaccio$LoggerConf {
244+
[key: string]: verdaccio$LoggerConfItem;
245+
}
246+
247+
declare interface verdaccio$ListenAddress {
248+
[key: string]: string;
249+
}
250+
251+
declare interface verdaccio$WebConf {
252+
enable: boolean;
253+
title: string;
254+
logo: string;
255+
}
256+
257+
declare interface verdaccio$HttpsConf {
258+
key?: string;
259+
cert?: string;
260+
ca?: string;
261+
pfx?: string;
262+
passphrase?: string;
263+
}
264+
255265
declare interface verdaccio$Config {
256266
user_agent: string;
257267
server_id: any;
@@ -280,8 +290,6 @@ declare interface verdaccio$Config {
280290
[key: string]: any;
281291
}
282292

283-
declare type verdaccio$SyncReturn = Error | void;
284-
declare type verdaccio$IPackageStorage = verdaccio$ILocalPackageManager | void;
285293
declare interface verdaccio$ILocalData extends verdaccio$IPlugin {
286294
logger: verdaccio$Logger;
287295
config: verdaccio$Config;
@@ -346,7 +354,7 @@ declare interface verdaccio$IBasicAuth {
346354
config: verdaccio$Config;
347355
aesEncrypt(buf: Buffer): Buffer;
348356
authenticate(user: string, password: string, cb: verdaccio$Callback): void;
349-
allow_access(packageName: string, user: string, callback: verdaccio$Callback): void;
357+
allow_access(packageName: string, user: verdaccio$RemoteUser, callback: verdaccio$Callback): void;
350358
add_user(user: string, password: string, cb: verdaccio$Callback): any;
351359
}
352360

@@ -362,8 +370,8 @@ declare type verdaccio$PluginOptions = {
362370
declare interface verdaccio$IPluginAuth extends verdaccio$IPlugin {
363371
authenticate(user: string, password: string, cb: verdaccio$Callback): void;
364372
adduser(user: string, password: string, cb: verdaccio$Callback): void;
365-
allow_access(user: string, pkg: verdaccio$PackageAccess, cb: verdaccio$Callback): void;
366-
allow_publish(user: string, pkg: verdaccio$PackageAccess, cb: verdaccio$Callback): void;
373+
allow_access(user: verdaccio$RemoteUser, pkg: verdaccio$PackageAccess, cb: verdaccio$Callback): void;
374+
allow_publish(user: verdaccio$RemoteUser, pkg: verdaccio$PackageAccess, cb: verdaccio$Callback): void;
367375
}
368376

369377
declare interface verdaccio$IPluginMiddleware extends verdaccio$IPlugin {
@@ -417,6 +425,7 @@ declare module "@verdaccio/types" {
417425
declare export type PluginOptions = verdaccio$PluginOptions;
418426
declare export type Stdout = stream$Writable | tty$WriteStream;
419427
declare export type Stdin = stream$Readable | tty$ReadStream;
428+
declare export type RemoteUser = verdaccio$RemoteUser;
420429
declare export type Package = verdaccio$Package;
421430
declare export type MergeTags = verdaccio$MergeTags;
422431
declare export type Version = verdaccio$Version;

0 commit comments

Comments
 (0)