@brightchain/brightchain-api-lib 0.23.18 → 0.23.20
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/package.json +1 -1
- package/src/lib/controllers/api/energy.d.ts.map +1 -1
- package/src/lib/controllers/api/energy.js +8 -2
- package/src/lib/controllers/api/energy.js.map +1 -1
- package/src/lib/controllers/api/user.d.ts +19 -1
- package/src/lib/controllers/api/user.d.ts.map +1 -1
- package/src/lib/controllers/api/user.js +200 -0
- package/src/lib/controllers/api/user.js.map +1 -1
- package/src/lib/routers/app.d.ts +19 -2
- package/src/lib/routers/app.d.ts.map +1 -1
- package/src/lib/routers/app.js +88 -8
- package/src/lib/routers/app.js.map +1 -1
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"energy.d.ts","sourceRoot":"","sources":["../../../../../../brightchain-api-lib/src/lib/controllers/api/energy.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EAEnB,aAAa,EAEd,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,UAAU,eAAgB,SAAQ,aAAa;IAC7C,UAAU,EAAE,iBAAiB,CAAC,mBAAmB,GAAG,gBAAgB,CAAC,CAAC;IACtE,eAAe,EAAE,iBAAiB,CAAC,mBAAmB,GAAG,gBAAgB,CAAC,CAAC;CAC5E;AAED,qBAAa,gBAAgB,CAC3B,GAAG,SAAS,UAAU,GAAG,oBAAoB,CAC7C,SAAQ,cAAc,CACtB,GAAG,EACH,mBAAmB,GAAG,gBAAgB,EACtC,eAAe,EACf,gBAAgB,CACjB;gBACa,WAAW,EAAE,uBAAuB,CAAC,GAAG,CAAC;IAIrD,SAAS,CAAC,oBAAoB,IAAI,IAAI;YAoBxB,gBAAgB;
|
|
1
|
+
{"version":3,"file":"energy.d.ts","sourceRoot":"","sources":["../../../../../../brightchain-api-lib/src/lib/controllers/api/energy.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EAEnB,aAAa,EAEd,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,UAAU,eAAgB,SAAQ,aAAa;IAC7C,UAAU,EAAE,iBAAiB,CAAC,mBAAmB,GAAG,gBAAgB,CAAC,CAAC;IACtE,eAAe,EAAE,iBAAiB,CAAC,mBAAmB,GAAG,gBAAgB,CAAC,CAAC;CAC5E;AAED,qBAAa,gBAAgB,CAC3B,GAAG,SAAS,UAAU,GAAG,oBAAoB,CAC7C,SAAQ,cAAc,CACtB,GAAG,EACH,mBAAmB,GAAG,gBAAgB,EACtC,eAAe,EACf,gBAAgB,CACjB;gBACa,WAAW,EAAE,uBAAuB,CAAC,GAAG,CAAC;IAIrD,SAAS,CAAC,oBAAoB,IAAI,IAAI;YAoBxB,gBAAgB;YA2DhB,qBAAqB;CA+DpC"}
|
|
@@ -38,8 +38,11 @@ class EnergyController extends base_1.BaseController {
|
|
|
38
38
|
};
|
|
39
39
|
}
|
|
40
40
|
try {
|
|
41
|
+
const sp = brightchain_lib_1.ServiceProvider.getInstance();
|
|
42
|
+
const typedId = sp.idProvider.idFromString(user.memberId);
|
|
43
|
+
const idRawBytes = sp.idProvider.toBytes(typedId);
|
|
44
|
+
const memberChecksum = sp.checksumService.calculateChecksum(idRawBytes);
|
|
41
45
|
const energyStore = this.application.services.get('energyStore');
|
|
42
|
-
const memberChecksum = brightchain_lib_1.Checksum.fromHex(user.memberId);
|
|
43
46
|
const account = energyStore.get(memberChecksum);
|
|
44
47
|
if (!account) {
|
|
45
48
|
return {
|
|
@@ -84,8 +87,11 @@ class EnergyController extends base_1.BaseController {
|
|
|
84
87
|
};
|
|
85
88
|
}
|
|
86
89
|
try {
|
|
90
|
+
const sp = brightchain_lib_1.ServiceProvider.getInstance();
|
|
91
|
+
const typedId = sp.idProvider.idFromString(user.memberId);
|
|
92
|
+
const idRawBytes = sp.idProvider.toBytes(typedId);
|
|
93
|
+
const memberChecksum = sp.checksumService.calculateChecksum(idRawBytes);
|
|
87
94
|
const energyLedger = this.application.services.get('energyLedger');
|
|
88
|
-
const memberChecksum = brightchain_lib_1.Checksum.fromHex(user.memberId);
|
|
89
95
|
const transactions = energyLedger.getByMember(memberChecksum);
|
|
90
96
|
// Map transactions to API response format
|
|
91
97
|
const transactionList = transactions.map((tx) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"energy.js","sourceRoot":"","sources":["../../../../../../brightchain-api-lib/src/lib/controllers/api/energy.ts"],"names":[],"mappings":";;;AAAA,kEAIsC;AAGtC,4EAO6C;AAG7C,kCAAyC;AAOzC,MAAa,gBAEX,SAAQ,qBAKT;IACC,YAAY,WAAyC;QACnD,KAAK,CAAC,WAAW,CAAC,CAAC;IACrB,CAAC;IAES,oBAAoB;QAC5B,IAAI,CAAC,gBAAgB,GAAG;YACtB,IAAA,gCAAW,EAAC,KAAK,EAAE,UAAU,EAAE;gBAC7B,UAAU,EAAE,YAAY;gBACxB,iBAAiB,EAAE,IAAI;gBACvB,uBAAuB,EAAE,KAAK;aAC/B,CAAC;YACF,IAAA,gCAAW,EAAC,KAAK,EAAE,eAAe,EAAE;gBAClC,UAAU,EAAE,iBAAiB;gBAC7B,iBAAiB,EAAE,IAAI;gBACvB,uBAAuB,EAAE,KAAK;aAC/B,CAAC;SACH,CAAC;QAEF,IAAI,CAAC,QAAQ,GAAG;YACd,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC;YAC5C,eAAe,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC;SACvD,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,GAEI;QAEJ,MAAM,IAAI,GAAI,GAAuC,CAAC,IAAI,CAAC;QAE3D,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;gBACL,UAAU,EAAE,GAAG;gBACf,QAAQ,EAAE;oBACR,OAAO,EAAE,mBAAmB;oBAC5B,KAAK,EAAE,mBAAmB;iBAC3B;aACF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,
|
|
1
|
+
{"version":3,"file":"energy.js","sourceRoot":"","sources":["../../../../../../brightchain-api-lib/src/lib/controllers/api/energy.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { PlatformID } from '@digitaldefiance/node-ecies-lib';
|
|
|
3
3
|
import { ApiErrorResponse, DecoratorBaseController, IApiChallengeResponse, IApiMessageResponse, IStatusCodeResponse } from '@digitaldefiance/node-express-suite';
|
|
4
4
|
import type { NextFunction, Request, Response } from 'express';
|
|
5
5
|
import { IBrightChainApplication } from '../../interfaces/application';
|
|
6
|
-
import { IApiLoginResponse } from '../../interfaces/responses';
|
|
6
|
+
import { IApiLoginResponse, IApiRequestUserResponse } from '../../interfaces/responses';
|
|
7
7
|
import { DefaultBackendIdType } from '../../shared-types';
|
|
8
8
|
export declare class UserController<TID extends PlatformID = DefaultBackendIdType> extends DecoratorBaseController<CoreLanguageCode, TID, IBrightChainApplication<TID>> {
|
|
9
9
|
constructor(application: IBrightChainApplication<TID>);
|
|
@@ -18,5 +18,23 @@ export declare class UserController<TID extends PlatformID = DefaultBackendIdTyp
|
|
|
18
18
|
logout(req: Request, _res: Response, _next: NextFunction): Promise<IStatusCodeResponse<IApiMessageResponse | ApiErrorResponse>>;
|
|
19
19
|
requestDirectLogin(_req: Request, _res: Response, _next: NextFunction): Promise<IStatusCodeResponse<IApiChallengeResponse | ApiErrorResponse>>;
|
|
20
20
|
directChallenge(req: Request, _res: Response, _next: NextFunction): Promise<IStatusCodeResponse<IApiLoginResponse | ApiErrorResponse>>;
|
|
21
|
+
/**
|
|
22
|
+
* GET /verify — returns the authenticated user's DTO.
|
|
23
|
+
* The auth middleware already populates req.user with a full IRequestUserDTO
|
|
24
|
+
* via buildRequestUserDTO, so we just return it.
|
|
25
|
+
*/
|
|
26
|
+
verify(req: Request, _res: Response, _next: NextFunction): Promise<IStatusCodeResponse<IApiRequestUserResponse | ApiErrorResponse>>;
|
|
27
|
+
/**
|
|
28
|
+
* GET /settings — returns the authenticated user's settings.
|
|
29
|
+
*/
|
|
30
|
+
getSettings(req: Request, _res: Response, _next: NextFunction): Promise<IStatusCodeResponse<IApiMessageResponse | ApiErrorResponse>>;
|
|
31
|
+
/**
|
|
32
|
+
* POST /settings — updates the authenticated user's settings.
|
|
33
|
+
*/
|
|
34
|
+
updateSettings(req: Request, _res: Response, _next: NextFunction): Promise<IStatusCodeResponse<IApiRequestUserResponse | ApiErrorResponse>>;
|
|
35
|
+
/**
|
|
36
|
+
* GET /refresh-token — re-signs the JWT and returns a new token + user DTO.
|
|
37
|
+
*/
|
|
38
|
+
refreshToken(req: Request, _res: Response, _next: NextFunction): Promise<IStatusCodeResponse<IApiLoginResponse | ApiErrorResponse>>;
|
|
21
39
|
}
|
|
22
40
|
//# sourceMappingURL=user.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../../../../brightchain-api-lib/src/lib/controllers/api/user.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,gBAAgB,EAAmB,MAAM,2BAA2B,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EACL,gBAAgB,EAEhB,uBAAuB,EAEvB,qBAAqB,EACrB,mBAAmB,EACnB,mBAAmB,EAIpB,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../../../../brightchain-api-lib/src/lib/controllers/api/user.ts"],"names":[],"mappings":"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"}
|
|
@@ -542,6 +542,182 @@ let UserController = class UserController extends node_express_suite_1.Decorator
|
|
|
542
542
|
};
|
|
543
543
|
}
|
|
544
544
|
}
|
|
545
|
+
/**
|
|
546
|
+
* GET /verify — returns the authenticated user's DTO.
|
|
547
|
+
* The auth middleware already populates req.user with a full IRequestUserDTO
|
|
548
|
+
* via buildRequestUserDTO, so we just return it.
|
|
549
|
+
*/
|
|
550
|
+
async verify(req, _res, _next) {
|
|
551
|
+
if (!req.user) {
|
|
552
|
+
throw new i18n_lib_1.HandleableError(new Error((0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Common_NoUserOnRequest)), { statusCode: 401 });
|
|
553
|
+
}
|
|
554
|
+
const user = req.user;
|
|
555
|
+
return {
|
|
556
|
+
statusCode: 200,
|
|
557
|
+
response: {
|
|
558
|
+
message: (0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Validation_TokenValid),
|
|
559
|
+
user: {
|
|
560
|
+
id: user.id,
|
|
561
|
+
email: user.email,
|
|
562
|
+
username: user.username,
|
|
563
|
+
roles: user.roles || [],
|
|
564
|
+
rolePrivileges: user.rolePrivileges,
|
|
565
|
+
timezone: user.timezone,
|
|
566
|
+
currency: user.currency,
|
|
567
|
+
emailVerified: user.emailVerified,
|
|
568
|
+
darkMode: user.darkMode,
|
|
569
|
+
siteLanguage: user.siteLanguage,
|
|
570
|
+
directChallenge: user.directChallenge,
|
|
571
|
+
...(user.lastLogin && { lastLogin: user.lastLogin }),
|
|
572
|
+
},
|
|
573
|
+
},
|
|
574
|
+
};
|
|
575
|
+
}
|
|
576
|
+
/**
|
|
577
|
+
* GET /settings — returns the authenticated user's settings.
|
|
578
|
+
*/
|
|
579
|
+
async getSettings(req, _res, _next) {
|
|
580
|
+
if (!req.user) {
|
|
581
|
+
throw new i18n_lib_1.HandleableError(new Error((0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Common_NoUserOnRequest)), { statusCode: 401 });
|
|
582
|
+
}
|
|
583
|
+
const user = req.user;
|
|
584
|
+
return {
|
|
585
|
+
statusCode: 200,
|
|
586
|
+
response: {
|
|
587
|
+
message: (0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Settings_RetrievedSuccess),
|
|
588
|
+
settings: {
|
|
589
|
+
email: user.email || '',
|
|
590
|
+
timezone: user.timezone || '',
|
|
591
|
+
currency: user.currency || '',
|
|
592
|
+
siteLanguage: user.siteLanguage || '',
|
|
593
|
+
darkMode: user.darkMode || false,
|
|
594
|
+
directChallenge: user.directChallenge || false,
|
|
595
|
+
},
|
|
596
|
+
},
|
|
597
|
+
};
|
|
598
|
+
}
|
|
599
|
+
/**
|
|
600
|
+
* POST /settings — updates the authenticated user's settings.
|
|
601
|
+
*/
|
|
602
|
+
async updateSettings(req, _res, _next) {
|
|
603
|
+
if (!req.user) {
|
|
604
|
+
throw new i18n_lib_1.HandleableError(new Error((0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Common_NoUserOnRequest)), { statusCode: 401 });
|
|
605
|
+
}
|
|
606
|
+
try {
|
|
607
|
+
const user = req.user;
|
|
608
|
+
const memberId = user.id;
|
|
609
|
+
const { email, timezone, siteLanguage, currency, darkMode, directChallenge } = req.body;
|
|
610
|
+
const sp = brightchain_lib_1.ServiceProvider.getInstance();
|
|
611
|
+
const typedId = sp.idProvider.idFromString(memberId);
|
|
612
|
+
const idHex = sp.idProvider.toString(typedId, 'hex');
|
|
613
|
+
// Update user-facing settings (timezone, darkMode, etc.) in the DB
|
|
614
|
+
// users collection. These are NOT part of the member store's
|
|
615
|
+
// IPrivateMemberData.settings (which tracks replication/storage config).
|
|
616
|
+
try {
|
|
617
|
+
const db = this.application.services.get('db');
|
|
618
|
+
if (db) {
|
|
619
|
+
const usersCol = db.collection('users');
|
|
620
|
+
const updateFields = {};
|
|
621
|
+
if (email !== undefined)
|
|
622
|
+
updateFields['email'] = email;
|
|
623
|
+
if (timezone !== undefined)
|
|
624
|
+
updateFields['timezone'] = timezone;
|
|
625
|
+
if (siteLanguage !== undefined)
|
|
626
|
+
updateFields['siteLanguage'] = siteLanguage;
|
|
627
|
+
if (currency !== undefined)
|
|
628
|
+
updateFields['currency'] = currency;
|
|
629
|
+
if (darkMode !== undefined)
|
|
630
|
+
updateFields['darkMode'] = darkMode;
|
|
631
|
+
if (directChallenge !== undefined)
|
|
632
|
+
updateFields['directChallenge'] = directChallenge;
|
|
633
|
+
if (Object.keys(updateFields).length > 0) {
|
|
634
|
+
await usersCol.updateOne({ _id: idHex }, { $set: updateFields });
|
|
635
|
+
}
|
|
636
|
+
}
|
|
637
|
+
}
|
|
638
|
+
catch {
|
|
639
|
+
// DB update is best-effort
|
|
640
|
+
}
|
|
641
|
+
// Build updated user DTO
|
|
642
|
+
const updatedUser = {
|
|
643
|
+
...user,
|
|
644
|
+
...(email !== undefined && { email }),
|
|
645
|
+
...(timezone !== undefined && { timezone }),
|
|
646
|
+
...(siteLanguage !== undefined && { siteLanguage }),
|
|
647
|
+
...(currency !== undefined && { currency }),
|
|
648
|
+
...(darkMode !== undefined && { darkMode }),
|
|
649
|
+
...(directChallenge !== undefined && { directChallenge }),
|
|
650
|
+
};
|
|
651
|
+
return {
|
|
652
|
+
statusCode: 200,
|
|
653
|
+
response: {
|
|
654
|
+
message: (0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Settings_SaveSuccess),
|
|
655
|
+
user: updatedUser,
|
|
656
|
+
},
|
|
657
|
+
};
|
|
658
|
+
}
|
|
659
|
+
catch {
|
|
660
|
+
return {
|
|
661
|
+
statusCode: 500,
|
|
662
|
+
response: {
|
|
663
|
+
message: (0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Common_UnexpectedError),
|
|
664
|
+
error: (0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Common_UnexpectedError),
|
|
665
|
+
},
|
|
666
|
+
};
|
|
667
|
+
}
|
|
668
|
+
}
|
|
669
|
+
/**
|
|
670
|
+
* GET /refresh-token — re-signs the JWT and returns a new token + user DTO.
|
|
671
|
+
*/
|
|
672
|
+
async refreshToken(req, _res, _next) {
|
|
673
|
+
if (!req.user) {
|
|
674
|
+
throw new i18n_lib_1.HandleableError(new Error((0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Common_NoUserOnRequest)), { statusCode: 401 });
|
|
675
|
+
}
|
|
676
|
+
try {
|
|
677
|
+
const user = req.user;
|
|
678
|
+
const authService = this.application.services.get('auth');
|
|
679
|
+
// Verify the current token is still valid
|
|
680
|
+
const authHeader = String(req.headers
|
|
681
|
+
?.authorization ?? '');
|
|
682
|
+
if (!authHeader.startsWith('Bearer ')) {
|
|
683
|
+
return {
|
|
684
|
+
statusCode: 401,
|
|
685
|
+
response: {
|
|
686
|
+
message: (0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Validation_TokenMissing),
|
|
687
|
+
error: (0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Validation_TokenMissing),
|
|
688
|
+
},
|
|
689
|
+
};
|
|
690
|
+
}
|
|
691
|
+
const oldToken = authHeader.slice('Bearer '.length);
|
|
692
|
+
const decoded = await authService.verifyToken(oldToken);
|
|
693
|
+
// Re-sign with fresh expiry
|
|
694
|
+
const newToken = authService.signToken(decoded.memberId, decoded.username, decoded.type);
|
|
695
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
696
|
+
const env = this.application.environment;
|
|
697
|
+
const serverPublicKey = env.systemPublicKeyHex ?? '';
|
|
698
|
+
return {
|
|
699
|
+
statusCode: 200,
|
|
700
|
+
response: {
|
|
701
|
+
message: (0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Common_Success),
|
|
702
|
+
user,
|
|
703
|
+
token: newToken,
|
|
704
|
+
serverPublicKey,
|
|
705
|
+
},
|
|
706
|
+
headers: {
|
|
707
|
+
Authorization: `Bearer ${newToken}`,
|
|
708
|
+
},
|
|
709
|
+
};
|
|
710
|
+
}
|
|
711
|
+
catch {
|
|
712
|
+
return {
|
|
713
|
+
statusCode: 500,
|
|
714
|
+
response: {
|
|
715
|
+
message: (0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Common_UnexpectedError),
|
|
716
|
+
error: (0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Common_UnexpectedError),
|
|
717
|
+
},
|
|
718
|
+
};
|
|
719
|
+
}
|
|
720
|
+
}
|
|
545
721
|
};
|
|
546
722
|
exports.UserController = UserController;
|
|
547
723
|
tslib_1.__decorate([
|
|
@@ -610,6 +786,30 @@ tslib_1.__decorate([
|
|
|
610
786
|
tslib_1.__metadata("design:paramtypes", [Object, Object, Function]),
|
|
611
787
|
tslib_1.__metadata("design:returntype", Promise)
|
|
612
788
|
], UserController.prototype, "directChallenge", null);
|
|
789
|
+
tslib_1.__decorate([
|
|
790
|
+
(0, node_express_suite_1.Get)('/verify', { auth: true }),
|
|
791
|
+
tslib_1.__metadata("design:type", Function),
|
|
792
|
+
tslib_1.__metadata("design:paramtypes", [Object, Object, Function]),
|
|
793
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
794
|
+
], UserController.prototype, "verify", null);
|
|
795
|
+
tslib_1.__decorate([
|
|
796
|
+
(0, node_express_suite_1.Get)('/settings', { auth: true }),
|
|
797
|
+
tslib_1.__metadata("design:type", Function),
|
|
798
|
+
tslib_1.__metadata("design:paramtypes", [Object, Object, Function]),
|
|
799
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
800
|
+
], UserController.prototype, "getSettings", null);
|
|
801
|
+
tslib_1.__decorate([
|
|
802
|
+
(0, node_express_suite_1.Post)('/settings', { auth: true }),
|
|
803
|
+
tslib_1.__metadata("design:type", Function),
|
|
804
|
+
tslib_1.__metadata("design:paramtypes", [Object, Object, Function]),
|
|
805
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
806
|
+
], UserController.prototype, "updateSettings", null);
|
|
807
|
+
tslib_1.__decorate([
|
|
808
|
+
(0, node_express_suite_1.Get)('/refresh-token', { auth: true }),
|
|
809
|
+
tslib_1.__metadata("design:type", Function),
|
|
810
|
+
tslib_1.__metadata("design:paramtypes", [Object, Object, Function]),
|
|
811
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
812
|
+
], UserController.prototype, "refreshToken", null);
|
|
613
813
|
exports.UserController = UserController = tslib_1.__decorate([
|
|
614
814
|
(0, node_express_suite_1.Controller)(),
|
|
615
815
|
tslib_1.__metadata("design:paramtypes", [Object])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../../../../brightchain-api-lib/src/lib/controllers/api/user.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../../../../brightchain-api-lib/src/lib/controllers/api/user.ts"],"names":[],"mappings":"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"}
|
package/src/lib/routers/app.d.ts
CHANGED
|
@@ -22,12 +22,29 @@ export declare class AppRouter<TID extends PlatformID = DefaultBackendIdType> ex
|
|
|
22
22
|
* Useful for wiring services (e.g. setSyncEventSystem) after construction.
|
|
23
23
|
*/
|
|
24
24
|
getBrightchainApiRouter(): ApiRouter<TID>;
|
|
25
|
+
/**
|
|
26
|
+
* Parses the webpack-generated index.html to extract the hashed script
|
|
27
|
+
* and stylesheet filenames. This is the most reliable way to serve the
|
|
28
|
+
* correct bundles since webpack already resolved the content hashes.
|
|
29
|
+
*
|
|
30
|
+
* Returns { scripts, stylesheets } arrays of filenames (relative paths).
|
|
31
|
+
* Returns empty arrays if index.html is missing or unparseable.
|
|
32
|
+
*/
|
|
33
|
+
private parseWebpackIndexHtml;
|
|
34
|
+
/**
|
|
35
|
+
* Finds Nx webpack hashed filenames in reactDistDir matching a pattern
|
|
36
|
+
* like main.{hash}.js or runtime.{hash}.js.
|
|
37
|
+
*/
|
|
38
|
+
private findHashedFiles;
|
|
25
39
|
/**
|
|
26
40
|
* Override the upstream's renderIndex to inject BrightChain-specific
|
|
27
41
|
* template locals (fontAwesomeKitId, custom tagline, etc.).
|
|
28
42
|
*
|
|
29
|
-
*
|
|
30
|
-
*
|
|
43
|
+
* Supports three bundle layouts:
|
|
44
|
+
* 1. Vite: hashed assets/index-[hash].js in assets/ dir
|
|
45
|
+
* 2. Nx webpack: hashed main.[hash].js + runtime.[hash].js in reactDistDir
|
|
46
|
+
* (detected by parsing the webpack-generated index.html)
|
|
47
|
+
* 3. Dev fallback: unhashed runtime.js + main.js + vendor.js
|
|
31
48
|
*/
|
|
32
49
|
renderIndex(req: Request, res: Response, next: NextFunction): void;
|
|
33
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../../../brightchain-api-lib/src/lib/routers/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EACL,YAAY,EACZ,SAAS,IAAI,iBAAiB,EAC/B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAI1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC;;;;;GAKG;AACH,qBAAa,SAAS,CACpB,GAAG,SAAS,UAAU,GAAG,oBAAoB,CAC7C,SAAQ,iBAAiB,CAAC,GAAG,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC;IACjD;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAiB;gBAE1C,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC;IAKrC;;;OAGG;IACI,uBAAuB,IAAI,SAAS,CAAC,GAAG,CAAC;IAIhD
|
|
1
|
+
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../../../brightchain-api-lib/src/lib/routers/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EACL,YAAY,EACZ,SAAS,IAAI,iBAAiB,EAC/B,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAI1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC;;;;;GAKG;AACH,qBAAa,SAAS,CACpB,GAAG,SAAS,UAAU,GAAG,oBAAoB,CAC7C,SAAQ,iBAAiB,CAAC,GAAG,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC;IACjD;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAiB;gBAE1C,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC;IAKrC;;;OAGG;IACI,uBAAuB,IAAI,SAAS,CAAC,GAAG,CAAC;IAIhD;;;;;;;OAOG;IACH,OAAO,CAAC,qBAAqB;IA6B7B;;;OAGG;IACH,OAAO,CAAC,eAAe;IAgBvB;;;;;;;;;OASG;IACa,WAAW,CACzB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,YAAY,GACjB,IAAI;CAyDR"}
|
package/src/lib/routers/app.js
CHANGED
|
@@ -22,32 +22,112 @@ class AppRouter extends node_express_suite_1.AppRouter {
|
|
|
22
22
|
getBrightchainApiRouter() {
|
|
23
23
|
return this.brightchainApiRouter;
|
|
24
24
|
}
|
|
25
|
+
/**
|
|
26
|
+
* Parses the webpack-generated index.html to extract the hashed script
|
|
27
|
+
* and stylesheet filenames. This is the most reliable way to serve the
|
|
28
|
+
* correct bundles since webpack already resolved the content hashes.
|
|
29
|
+
*
|
|
30
|
+
* Returns { scripts, stylesheets } arrays of filenames (relative paths).
|
|
31
|
+
* Returns empty arrays if index.html is missing or unparseable.
|
|
32
|
+
*/
|
|
33
|
+
parseWebpackIndexHtml() {
|
|
34
|
+
const indexHtmlPath = (0, path_1.join)(this.reactDistDir, 'index.html');
|
|
35
|
+
if (!(0, fs_1.existsSync)(indexHtmlPath)) {
|
|
36
|
+
return { scripts: [], stylesheets: [] };
|
|
37
|
+
}
|
|
38
|
+
try {
|
|
39
|
+
const html = (0, fs_1.readFileSync)(indexHtmlPath, 'utf8');
|
|
40
|
+
// Match <script ... src="filename.js" ...>
|
|
41
|
+
const scriptRegex = /<script[^>]+src="([^"]+\.js)"[^>]*>/g;
|
|
42
|
+
const scripts = [];
|
|
43
|
+
let match;
|
|
44
|
+
while ((match = scriptRegex.exec(html)) !== null) {
|
|
45
|
+
scripts.push(match[1]);
|
|
46
|
+
}
|
|
47
|
+
// Match <link ... href="filename.css" ...>
|
|
48
|
+
const cssRegex = /<link[^>]+href="([^"]+\.css)"[^>]*>/g;
|
|
49
|
+
const stylesheets = [];
|
|
50
|
+
while ((match = cssRegex.exec(html)) !== null) {
|
|
51
|
+
stylesheets.push(match[1]);
|
|
52
|
+
}
|
|
53
|
+
return { scripts, stylesheets };
|
|
54
|
+
}
|
|
55
|
+
catch {
|
|
56
|
+
return { scripts: [], stylesheets: [] };
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
/**
|
|
60
|
+
* Finds Nx webpack hashed filenames in reactDistDir matching a pattern
|
|
61
|
+
* like main.{hash}.js or runtime.{hash}.js.
|
|
62
|
+
*/
|
|
63
|
+
findHashedFiles(baseName, ext) {
|
|
64
|
+
try {
|
|
65
|
+
const pattern = new RegExp(`^${baseName}\\.[a-f0-9]+\\.${ext}$`);
|
|
66
|
+
const files = (0, fs_1.readdirSync)(this.reactDistDir, 'utf8');
|
|
67
|
+
// Sort descending by name to get the latest hash if multiple exist
|
|
68
|
+
return files.filter((f) => pattern.test(f)).sort().pop();
|
|
69
|
+
}
|
|
70
|
+
catch {
|
|
71
|
+
return undefined;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
25
74
|
/**
|
|
26
75
|
* Override the upstream's renderIndex to inject BrightChain-specific
|
|
27
76
|
* template locals (fontAwesomeKitId, custom tagline, etc.).
|
|
28
77
|
*
|
|
29
|
-
*
|
|
30
|
-
*
|
|
78
|
+
* Supports three bundle layouts:
|
|
79
|
+
* 1. Vite: hashed assets/index-[hash].js in assets/ dir
|
|
80
|
+
* 2. Nx webpack: hashed main.[hash].js + runtime.[hash].js in reactDistDir
|
|
81
|
+
* (detected by parsing the webpack-generated index.html)
|
|
82
|
+
* 3. Dev fallback: unhashed runtime.js + main.js + vendor.js
|
|
31
83
|
*/
|
|
32
84
|
renderIndex(req, res, next) {
|
|
33
85
|
if (req.url.endsWith('.js')) {
|
|
34
86
|
res.type('application/javascript');
|
|
35
87
|
}
|
|
36
|
-
//
|
|
88
|
+
// Strategy 1: Vite — hashed bundle in assets/
|
|
37
89
|
const jsFile = this.getAssetFilename(this.assetsDir, /^index-.*\.js$/);
|
|
38
90
|
const cssFile = this.getAssetFilename(this.assetsDir, /^index-.*\.css$/);
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
:
|
|
91
|
+
let devScripts = [];
|
|
92
|
+
let webpackCss = [];
|
|
93
|
+
if (!jsFile) {
|
|
94
|
+
// Strategy 2: Nx webpack — parse the generated index.html for hashed filenames.
|
|
95
|
+
// This is the authoritative source since webpack writes the correct references.
|
|
96
|
+
const { scripts, stylesheets } = this.parseWebpackIndexHtml();
|
|
97
|
+
webpackCss = stylesheets;
|
|
98
|
+
if (scripts.length > 0) {
|
|
99
|
+
// Webpack index.html found with hashed scripts — use them.
|
|
100
|
+
// Scripts are served from reactDistDir via the /static/js/ mount
|
|
101
|
+
// or directly if they're root-relative paths.
|
|
102
|
+
devScripts = scripts;
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
// Strategy 3: Dev fallback — unhashed files.
|
|
106
|
+
// Also try to find hashed files directly in case index.html is missing.
|
|
107
|
+
const hashedRuntime = this.findHashedFiles('runtime', 'js');
|
|
108
|
+
const hashedMain = this.findHashedFiles('main', 'js');
|
|
109
|
+
if (hashedMain) {
|
|
110
|
+
// Prefer hashed files over unhashed
|
|
111
|
+
if (hashedRuntime)
|
|
112
|
+
devScripts.push(hashedRuntime);
|
|
113
|
+
devScripts.push(hashedMain);
|
|
114
|
+
}
|
|
115
|
+
else {
|
|
116
|
+
// True dev fallback: unhashed files
|
|
117
|
+
devScripts = ['runtime.js', 'main.js', 'vendor.js'].filter((f) => (0, fs_1.existsSync)((0, path_1.join)(this.reactDistDir, f)));
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
43
121
|
const environment = this.application.environment;
|
|
44
122
|
const locals = {
|
|
45
123
|
...this.getBaseViewLocals(req, res),
|
|
46
124
|
fontawesomeKitId: environment.fontAwesomeKitId,
|
|
47
125
|
jsFile: jsFile ? `assets/${jsFile}` : undefined,
|
|
48
126
|
cssFile: cssFile ? `assets/${cssFile}` : undefined,
|
|
49
|
-
//
|
|
127
|
+
// Script list for non-Vite builds (hashed or dev)
|
|
50
128
|
devScripts,
|
|
129
|
+
// Additional CSS from webpack index.html
|
|
130
|
+
webpackCss,
|
|
51
131
|
};
|
|
52
132
|
this.renderTemplate(req, res, next, 'index', locals);
|
|
53
133
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../../../brightchain-api-lib/src/lib/routers/app.ts"],"names":[],"mappings":";;;AACA,4EAG6C;AAE7C,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../../../brightchain-api-lib/src/lib/routers/app.ts"],"names":[],"mappings":"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"}
|