@sudoplatform/sudo-secure-communications 5.1.3 → 5.1.5
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/cjs/private/data/messaging/matrixMessagingService.js +6 -1
- package/cjs/private/data/messaging/matrixMessagingService.js.map +1 -1
- package/cjs/private/data/session/sessionManager.js +167 -66
- package/cjs/private/data/session/sessionManager.js.map +1 -1
- package/cjs/public/secureCommsClient.js +1 -1
- package/cjs/public/secureCommsClient.js.map +1 -1
- package/docs/assets/hierarchy.js +1 -1
- package/docs/assets/search.js +1 -1
- package/docs/classes/DefaultSecureCommsClient.html +15 -15
- package/docs/hierarchy.html +1 -1
- package/docs/interfaces/Audio.html +1 -1
- package/docs/interfaces/AudioMedia.html +1 -1
- package/docs/interfaces/BaseMessageContent.html +1 -1
- package/docs/interfaces/ChannelInvite.html +1 -1
- package/docs/interfaces/ChannelMember.html +1 -1
- package/docs/interfaces/DirectChatInvite.html +1 -1
- package/docs/interfaces/Emote.html +1 -1
- package/docs/interfaces/EncryptedMessage.html +1 -1
- package/docs/interfaces/File.html +1 -1
- package/docs/interfaces/FileMedia.html +1 -1
- package/docs/interfaces/GroupInvite.html +1 -1
- package/docs/interfaces/GroupMember.html +1 -1
- package/docs/interfaces/Handle.html +1 -1
- package/docs/interfaces/Image.html +1 -1
- package/docs/interfaces/ImageMedia.html +1 -1
- package/docs/interfaces/Invite.html +1 -1
- package/docs/interfaces/KeyVerificationRequest.html +1 -1
- package/docs/interfaces/Location.html +1 -1
- package/docs/interfaces/Member.html +1 -1
- package/docs/interfaces/MembershipChange.html +1 -1
- package/docs/interfaces/MessageNotification.html +1 -1
- package/docs/interfaces/Notice.html +1 -1
- package/docs/interfaces/NotificationInfo.html +1 -1
- package/docs/interfaces/OwnedHandle.html +1 -1
- package/docs/interfaces/Poll.html +1 -1
- package/docs/interfaces/PollResponse.html +1 -1
- package/docs/interfaces/RedactedMessage.html +1 -1
- package/docs/interfaces/SelfDestructedMessage.html +1 -1
- package/docs/interfaces/Text.html +1 -1
- package/docs/interfaces/Video.html +1 -1
- package/docs/interfaces/VideoMedia.html +1 -1
- package/docs/types/SecureCommsClientOptions.html +5 -3
- package/lib/private/data/messaging/matrixMessagingService.js +6 -1
- package/lib/private/data/messaging/matrixMessagingService.js.map +1 -1
- package/lib/private/data/session/sessionManager.js +167 -66
- package/lib/private/data/session/sessionManager.js.map +1 -1
- package/lib/public/secureCommsClient.js +1 -1
- package/lib/public/secureCommsClient.js.map +1 -1
- package/package.json +19 -10
- package/types/private/data/session/sessionManager.d.ts +14 -1
- package/types/public/secureCommsClient.d.ts +2 -0
|
@@ -310,7 +310,12 @@ class MatrixMessagingService {
|
|
|
310
310
|
case 'editReaction':
|
|
311
311
|
return reason.type;
|
|
312
312
|
case 'moderation':
|
|
313
|
-
|
|
313
|
+
if (reason.hide) {
|
|
314
|
+
return `${reason.type}: (hidden)${threadSuffix}`;
|
|
315
|
+
}
|
|
316
|
+
return reason.reason
|
|
317
|
+
? `${reason.type}: ${reason.reason}${threadSuffix}`
|
|
318
|
+
: `${reason.type}${threadSuffix}`;
|
|
314
319
|
case 'unknown':
|
|
315
320
|
return 'Redacted for unknown reason';
|
|
316
321
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matrixMessagingService.js","sourceRoot":"","sources":["../../../../src/private/data/messaging/matrixMessagingService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"matrixMessagingService.js","sourceRoot":"","sources":["../../../../src/private/data/messaging/matrixMessagingService.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,yEAA6D;AAC7D,qDAA+D;AAE/D,4CAAwE;AAkCxE,2EAAuE;AAEvE,MAAa,sBAAsB;IACjC,YACmB,YAAiC,EACjC,kBAAuC;QADvC,iBAAY,GAAZ,YAAY,CAAqB;QACjC,uBAAkB,GAAlB,kBAAkB,CAAqB;IACvD,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,KAAuB;QACvC,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAA;QACrD,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACtD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,KAA6B;QAC5C,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAA;QACrD,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IAC5E,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAA4B;QAC1C,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAA;QACrD,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,CACtC,MAAM,EACN,KAAK,CAAC,gBAAgB,EACtB,OAAO,CACR,CAAA;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAqB;QACnC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC7B,MAAM,IAAI,yBAAgB,CAAC,gCAAgC,CAAC,CAAA;QAC9D,CAAC;QACD,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,MAAM,OAAO,GACX,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,gBAAO,CAAC,IAAI,CAAA;QAEpE,0FAA0F;QAC1F,MAAM,cAAc,GAClB,OAAO,KAAK,gBAAO,CAAC,KAAK,IAAI,OAAO,KAAK,gBAAO,CAAC,KAAK;YACpD,CAAC,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;YACrC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,CAAA;QAElE,oGAAoG;QACpG,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,YAAY,kBAAS,CAAA;QACrD,MAAM,OAAO,GAAG,QAAQ;YACtB,CAAC,CAAC,MAAM,IAAI,CAAC,qBAAqB,CAAC,cAAc,EAAE,OAAO,CAAC;YAC3D,CAAC,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;QAE3D,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAC5E,CAAC;aAAM,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,CACtC,MAAM,EACN,KAAK,CAAC,gBAAgB,EACtB,OAAO,CACR,CAAA;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACtD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,KAAsB;QAC9B,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QAC3E,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACrD,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC;YAC5D,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC;YACzD,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC;SACxE,CAAC,CAAA;QACF,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,CAAC,OAAO,GAAG,KAAK;iBACpB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC;iBACzC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,OAAO,CAAA;YAClB,OAAO,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAA;QACjC,CAAC;QACD,OAAO,CAAC,SAAS,GAAG,SAAS,CAAA;QAC7B,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAA;QAC3B,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,KAAuB;QAChC,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,MAAM,OAAO,GAA4B;YACvC,IAAI,EAAE,KAAK,CAAC,OAAO;YACnB,OAAO,EAAE,gBAAO,CAAC,IAAI;SACtB,CAAA;QACD,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IACvE,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAyB;QACpC,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QACpD,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;IACxE,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,KAAwB;QACjC,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CACrD,MAAM,EACN,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,SAAS,CAChB,CAAA;QACD,UAAU,CAAC,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CACrC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YACxC,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACrD,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC;gBAC5D,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC;gBACzD,IAAI,CAAC,YAAY,CAAC,eAAe,CAC/B,MAAM,EACN,IAAI,oBAAW,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,EAChD,OAAO,CAAC,SAAS,CAClB;aACF,CAAC,CAAA;YACF,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrB,OAAO,CAAC,OAAO,GAAG,KAAK;qBACpB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC;qBACzC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,OAAO,CAAA;gBAClB,OAAO,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAA;YACjC,CAAC;YACD,OAAO,CAAC,SAAS,GAAG,SAAS,CAAA;YAC7B,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAA;YAC3B,OAAO,OAAO,CAAA;QAChB,CAAC,CAAC,CACH,CAAA;QACD,OAAO,UAAU,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,KAA0B;QAE1B,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAC3C,KAAK,CAAC,UAAU,EAChB,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,SAAS,CAChB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,KAA4B;QAE5B,MAAM,OAAO,GAAG,IAAI,GAAG,CACrB,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAClE,CAAA;QACD,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAC1D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,KAAsB;QACrC,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACjD,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,KAAkC;QAElC,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,MAAM,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;IACxE,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,KAA0B;QAC7C,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CACpC,MAAM,EACN,KAAK,CAAC,SAAS,EACf,KAAK,CAAC,OAAO,CACd,CAAA;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,KAA2B;QAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,CAAA;IAClE,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,KAA6B;QAE7B,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAA;QACxE,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;YAC3B,OAAO,EAAE,CAAA;QACX,CAAC;QACD,OAAO,MAAM,OAAO,CAAC,GAAG,CACtB,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YACnC,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACrD,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC;gBAC5D,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC;gBACzD,IAAI,CAAC,YAAY,CAAC,eAAe,CAC/B,MAAM,EACN,SAAS,EACT,OAAO,CAAC,SAAS,CAClB;aACF,CAAC,CAAA;YACF,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrB,OAAO,CAAC,OAAO,GAAG,KAAK;qBACpB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC;qBACzC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,OAAO,CAAA;gBAClB,OAAO,CAAC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAA;YACjC,CAAC;YACD,OAAO,CAAC,SAAS,GAAG,SAAS,CAAA;YAC7B,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAA;YAC3B,OAAO,OAAO,CAAA;QAChB,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAC/B,KAAwE;QAExE,IAAI,aAAa,GAAG,KAAK,CAAC,OAAO,CAAA;QACjC,MAAM,YAAY,GAAa,EAAE,CAAA;QACjC,IAAI,cAAc,GAAG,KAAK,CAAA;QAE1B,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QAEpC,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACrC,wBAAwB;YACxB,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC9B,MAAM,YAAY,GAAG,IAAI,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAA;gBAC3E,MAAM,WAAW,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,CAAA;gBACtC,MAAM,IAAI,GAAG,uBAAuB,YAAY,EAAE,CAAA;gBAElD,0BAA0B;gBAC1B,MAAM,kBAAkB,GAAG,WAAW,CAAC,OAAO,CAC5C,uBAAuB,EACvB,MAAM,CACP,CAAA;gBACD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAA;gBACjD,aAAa,GAAG,aAAa,CAAC,OAAO,CACnC,KAAK,EACL,YAAY,IAAI,KAAK,WAAW,MAAM,CACvC,CAAA;gBACD,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YACjC,CAAC;iBAAM,CAAC;gBACN,sBAAsB;gBACtB,MAAM,OAAO,GAAG,OAAO,CAAA;gBACvB,aAAa,GAAG,aAAa,CAAC,OAAO,CACnC,IAAI,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,EACxB,gCAAgC,MAAM,KAAK,OAAO,MAAM,CACzD,CAAA;gBACD,cAAc,GAAG,IAAI,CAAA;YACvB,CAAC;QACH,CAAC;QACD,8BAA8B;QAC9B,MAAM,OAAO,GAA4B;YACvC,IAAI,EAAE,KAAK,CAAC,OAAO;YACnB,OAAO,EAAE,gBAAO,CAAC,IAAI;YACrB,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI;gBAC/B,MAAM,EAAE,wBAAwB;gBAChC,cAAc,EAAE,aAAa;gBAC7B,YAAY,EAAE;oBACZ,QAAQ,EAAE,YAAY;oBACtB,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC1C;aACF,CAAC;SACH,CAAA;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC7B,KAAqB;QAErB,IAAI,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,aAAa,EAAE,QAAQ,EAAE,CAAC;YACrD,OAAO,KAAK,CAAA,CAAC,2CAA2C;QAC1D,CAAC;QACD,qDAAqD;QACrD,MAAM,oBAAoB,GACxB,MAAM,IAAI,CAAC,kBAAkB,EAAE,4BAA4B,CAAC;YAC1D,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACzB,CAAC,CAAA;QACJ,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,MAAM,IAAI,yBAAgB,CAAC,4CAA4C,CAAC,CAAA;QAC1E,CAAC;QACD,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAC1D,oBAAoB,CAAA;QACtB,IAAI,CAAC,SAAS,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC9D,MAAM,IAAI,yBAAgB,CAAC,0CAA0C,CAAC,CAAA;QACxE,CAAC;QACD,OAAO;YACL,GAAG,KAAK;YACR,SAAS;YACT,aAAa,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE;SAC3D,CAAA;IACH,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAC/B,KAAqB,EACrB,OAAgB;QAEhB,MAAM,OAAO,GAAG;YACd,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,KAAK,CAAC,QAAQ;YACpB,IAAI,EAAE,EAAE;SACkB,CAAA;QAE5B,mBAAmB;QACnB,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,kBAAkB,GAAG,MAAM,IAAA,6CAAiB,EAAC,KAAK,CAAC,SAAU,CAAC,CAAA;YACpE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,eAAe,CAAC;gBAClE,IAAI,EAAE,kBAAkB,CAAC,IAAI;gBAC7B,QAAQ,EAAE,GAAG,KAAK,CAAC,QAAQ,gBAAgB;gBAC3C,QAAQ,EAAE,KAAK,CAAC,aAAc,CAAC,QAAQ;gBACvC,eAAe,EAAE,KAAK,CAAC,eAAe;aACvC,CAAC,CACD;YAAC,OAAe,CAAC,IAAI,CAAC,cAAc,GAAG;gBACtC,QAAQ,EAAE,KAAK,CAAC,aAAc,CAAC,QAAQ;gBACvC,IAAI,EAAE,KAAK,CAAC,aAAc,CAAC,IAAI;gBAC/B,CAAC,EAAE,KAAK,CAAC,aAAc,CAAC,KAAK;gBAC7B,CAAC,EAAE,KAAK,CAAC,aAAc,CAAC,MAAM;gBAC9B,QAAQ,EAAE,KAAK,CAAC,aAAc,CAAC,QAAQ;aACxC,CACA;YAAC,OAAe,CAAC,IAAI,CAAC,cAAc,GAAG;gBACtC,GAAG,kBAAkB,CAAC,IAAI;gBAC1B,GAAG,EAAE,YAAY;aAClB,CAAA;QACH,CAAC;QAED,cAAc;QACd,MAAM,aAAa,GAAG,MAAM,IAAA,6CAAiB,EAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACzD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,eAAe,CAAC;YAC7D,IAAI,EAAE,aAAa,CAAC,IAAI;YACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,eAAe,EAAE,KAAK,CAAC,eAAe;SACvC,CAAC,CACD;QAAC,OAAe,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAC/C;QAAC,OAAe,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,QAAQ,CAC3C;QAAC,OAAe,CAAC,IAAI,GAAG;YACvB,GAAG,aAAa,CAAC,IAAI;YACrB,GAAG,EAAE,OAAO;SACb,CAAA;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;IAEO,KAAK,CAAC,qBAAqB,CACjC,KAAqB,EACrB,OAAgB;QAEhB,MAAM,OAAO,GAAG;YACd,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,KAAK,CAAC,QAAQ;YACpB,IAAI,EAAE,EAAE;SACkB,CAAA;QAE5B,mBAAmB;QACnB,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,eAAe,CAAC;gBAClE,IAAI,EAAE,KAAK,CAAC,SAAS;gBACrB,QAAQ,EAAE,GAAG,KAAK,CAAC,QAAQ,gBAAgB;gBAC3C,QAAQ,EAAE,KAAK,CAAC,aAAc,CAAC,QAAQ;gBACvC,eAAe,EAAE,KAAK,CAAC,eAAe;aACvC,CAAC,CACD;YAAC,OAAe,CAAC,IAAI,CAAC,cAAc,GAAG;gBACtC,QAAQ,EAAE,KAAK,CAAC,aAAc,CAAC,QAAQ;gBACvC,IAAI,EAAE,KAAK,CAAC,aAAc,CAAC,IAAI;gBAC/B,CAAC,EAAE,KAAK,CAAC,aAAc,CAAC,KAAK;gBAC7B,CAAC,EAAE,KAAK,CAAC,aAAc,CAAC,MAAM;gBAC9B,QAAQ,EAAE,KAAK,CAAC,aAAc,CAAC,QAAQ;aACxC,CACA;YAAC,OAAe,CAAC,IAAI,CAAC,aAAa,GAAG,YAAY,CAAA;QACrD,CAAC;QAED,cAAc;QACd,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,eAAe,CAAC;YAC7D,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,eAAe,EAAE,KAAK,CAAC,eAAe;SACvC,CAAC,CACD;QAAC,OAAe,CAAC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAC/C;QAAC,OAAe,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,QAAQ,CAC3C;QAAC,OAAe,CAAC,GAAG,GAAG,OAAO,CAAA;QAC/B,OAAO,OAAO,CAAA;IAChB,CAAC;IAEO,kBAAkB,CACxB,MAAsC;QAEtC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,SAAS,CAAA;QAClB,CAAC;QACD,MAAM,YAAY,GAChB,MAAM,CAAC,IAAI,KAAK,cAAc;YAC9B,MAAM,CAAC,IAAI,KAAK,SAAS;YACzB,MAAM,CAAC,QAAQ;YACb,CAAC,CAAC,yBAAyB,MAAM,CAAC,QAAQ,GAAG;YAC7C,CAAC,CAAC,EAAE,CAAA;QACR,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,WAAW;gBACd,OAAO,GAAG,MAAM,CAAC,IAAI,GAAG,YAAY,EAAE,CAAA;YACxC,KAAK,cAAc;gBACjB,OAAO,MAAM,CAAC,IAAI,CAAA;YACpB,KAAK,YAAY;gBACf,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;oBAChB,OAAO,GAAG,MAAM,CAAC,IAAI,aAAa,YAAY,EAAE,CAAA;gBAClD,CAAC;gBACD,OAAO,MAAM,CAAC,MAAM;oBAClB,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,MAAM,GAAG,YAAY,EAAE;oBACnD,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,GAAG,YAAY,EAAE,CAAA;YACrC,KAAK,SAAS;gBACZ,OAAO,6BAA6B,CAAA;QACxC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,KAAsB;QACrC,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,MAAM,mBAAmB,GAAG,IAAI,yCAAmB,EAAE,CAAA;QACrD,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAChC,MAAM,EACN,mBAAmB,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,EAClD,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,aAAa,CACpB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,KAA4B;QACjD,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,CACtC,MAAM,EACN,KAAK,CAAC,MAAM,EACZ,KAAK,CAAC,OAAO,CACd,CAAA;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAoB;QACjC,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,gEAAgE;QAChE,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QAErD,yCAAyC;QACzC,MAAM,mBAAmB,GAAG,IAAI,yCAAmB,EAAE,CAAA;QACrD,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAChC,MAAM,EACN,mBAAmB,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,EAClD,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,aAAa,CACpB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAmB;QAC/B,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IACvD,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,KAA4B;QAE5B,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAA;QACpC,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IACvE,CAAC;CACF;AAtcD,wDAscC"}
|
|
@@ -14,15 +14,20 @@ const public_1 = require("../../../public");
|
|
|
14
14
|
const delay_1 = require("../../util/delay");
|
|
15
15
|
const matrixClientManager_1 = require("../common/matrixClientManager");
|
|
16
16
|
class SessionManager {
|
|
17
|
-
constructor(sessionService, storageModule) {
|
|
17
|
+
constructor(sessionService, storageModule, autoRefreshTokenMinutesBeforeExpiration) {
|
|
18
18
|
this.sessionService = sessionService;
|
|
19
19
|
this.storageModule = storageModule;
|
|
20
|
+
this.autoRefreshTokenMinutesBeforeExpiration = autoRefreshTokenMinutesBeforeExpiration;
|
|
20
21
|
this.sessions = {};
|
|
21
22
|
this.log = new sudo_common_1.DefaultLogger(this.constructor.name);
|
|
22
23
|
}
|
|
23
24
|
async deleteSession(handleId, deleteStorage = false) {
|
|
24
25
|
const session = this.sessions[handleId.toString()];
|
|
25
26
|
if (session) {
|
|
27
|
+
// Clear any scheduled token refresh
|
|
28
|
+
if (session.refreshTimeout) {
|
|
29
|
+
clearTimeout(session.refreshTimeout);
|
|
30
|
+
}
|
|
26
31
|
// stop syncing matrix client
|
|
27
32
|
await session.matrixClient.stopSyncing();
|
|
28
33
|
// Flush any still existing background watchers
|
|
@@ -57,88 +62,184 @@ class SessionManager {
|
|
|
57
62
|
}
|
|
58
63
|
// MARK: Access Tokens
|
|
59
64
|
async ensureValidSession(handleId, storePassphrase) {
|
|
60
|
-
// check if we have a cached session for this handleId
|
|
61
65
|
const cachedSession = this.sessions[handleId.toString()];
|
|
62
66
|
const newStorePassphrase = cachedSession?.storePassphrase ?? storePassphrase ?? undefined;
|
|
63
|
-
|
|
67
|
+
// Try to use cached session if valid
|
|
64
68
|
if (cachedSession) {
|
|
65
|
-
const
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
const now = Math.floor(Date.now() / 1000);
|
|
69
|
-
const isExpiredOrExpiringSoon = expiry - now <= 300; // Check if the token has expired or will expire in 300 seconds
|
|
70
|
-
if (!isExpiredOrExpiringSoon &&
|
|
71
|
-
cachedSession.matrixClient.isUsingToken(cachedSession.accessToken)) {
|
|
72
|
-
return cachedSession.accessToken;
|
|
73
|
-
}
|
|
74
|
-
// token is expired or different than matrix token. Refresh
|
|
75
|
-
try {
|
|
76
|
-
const newSession = await this.sessionService.get({
|
|
77
|
-
handleId: handleId.toString(),
|
|
78
|
-
deviceId: deviceId ?? (0, uuid_1.v4)(),
|
|
79
|
-
});
|
|
80
|
-
const newToken = newSession.token;
|
|
81
|
-
// update matrix client and session with new token
|
|
82
|
-
cachedSession.matrixClient.updateAccessToken(newToken);
|
|
83
|
-
this.sessions[handleId.toString()] = {
|
|
84
|
-
accessToken: newToken,
|
|
85
|
-
storePassphrase: newStorePassphrase,
|
|
86
|
-
matrixClient: cachedSession.matrixClient,
|
|
87
|
-
};
|
|
88
|
-
// store session for future reloads
|
|
89
|
-
const handleStorage = await this.storageModule.useHandleStorage(handleId.toString(), newStorePassphrase);
|
|
90
|
-
await handleStorage?.secureCommsStore.sessionAPIs.saveAccessToken(newToken);
|
|
91
|
-
return newToken;
|
|
69
|
+
const validAccessToken = await this.tryUseCachedSession(handleId, cachedSession, newStorePassphrase);
|
|
70
|
+
if (validAccessToken) {
|
|
71
|
+
return validAccessToken;
|
|
92
72
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
73
|
+
}
|
|
74
|
+
// Create new session from storage or fresh token
|
|
75
|
+
return await this.createNewSession(handleId, newStorePassphrase);
|
|
76
|
+
}
|
|
77
|
+
decodeToken(token) {
|
|
78
|
+
const decoded = JWT.decode(token);
|
|
79
|
+
if (!decoded || !decoded.exp || !decoded.device_id) {
|
|
80
|
+
throw new Error('Invalid token');
|
|
81
|
+
}
|
|
82
|
+
const expiry = parseInt(decoded.exp, 10);
|
|
83
|
+
const deviceId = decoded.device_id;
|
|
84
|
+
return { decoded, expiry, deviceId };
|
|
85
|
+
}
|
|
86
|
+
isTokenExpired(expiry) {
|
|
87
|
+
const now = Math.floor(Date.now() / 1000);
|
|
88
|
+
return expiry - now <= 0;
|
|
89
|
+
}
|
|
90
|
+
isTokenExpiringSoon(expiry) {
|
|
91
|
+
const now = Math.floor(Date.now() / 1000);
|
|
92
|
+
const refreshThresholdSeconds = this.autoRefreshTokenMinutesBeforeExpiration * 60;
|
|
93
|
+
const timeUntilExpiry = expiry - now;
|
|
94
|
+
return timeUntilExpiry > 0 && timeUntilExpiry <= refreshThresholdSeconds;
|
|
95
|
+
}
|
|
96
|
+
isTokenExpiredOrExpiringSoon(expiry) {
|
|
97
|
+
return this.isTokenExpired(expiry) || this.isTokenExpiringSoon(expiry);
|
|
98
|
+
}
|
|
99
|
+
scheduleTokenRefresh(handleId, expiry, storePassphrase) {
|
|
100
|
+
const now = Math.floor(Date.now() / 1000);
|
|
101
|
+
const timeUntilExpiry = expiry - now;
|
|
102
|
+
const refreshThresholdSeconds = this.autoRefreshTokenMinutesBeforeExpiration * 60;
|
|
103
|
+
const timeBeforeExpiryToSchedule = timeUntilExpiry - refreshThresholdSeconds;
|
|
104
|
+
// Only schedule refresh if auto-refresh is enabled and there's enough time until expiry
|
|
105
|
+
// If auto-refresh is disabled (0) or less than the threshold, the token will not be auto refreshed.
|
|
106
|
+
if (this.autoRefreshTokenMinutesBeforeExpiration > 0 &&
|
|
107
|
+
timeBeforeExpiryToSchedule > 0) {
|
|
108
|
+
return setTimeout(async () => {
|
|
109
|
+
try {
|
|
110
|
+
await this.ensureValidSession(handleId, storePassphrase);
|
|
111
|
+
}
|
|
112
|
+
catch (error) {
|
|
113
|
+
this.log.error(`Failed to refresh token for handle ${handleId.toString()}`, { err: error });
|
|
114
|
+
}
|
|
115
|
+
}, timeBeforeExpiryToSchedule * 1000);
|
|
116
|
+
}
|
|
117
|
+
return undefined;
|
|
118
|
+
}
|
|
119
|
+
// Test if the cached session is still valid.
|
|
120
|
+
// Returns access token if it is still valid or can be refreshed.
|
|
121
|
+
// Returns undefined if the token is expired or cannot be refreshed.
|
|
122
|
+
async tryUseCachedSession(handleId, cachedSession, storePassphrase) {
|
|
123
|
+
const { expiry, deviceId } = this.decodeToken(cachedSession.accessToken);
|
|
124
|
+
if (!this.isTokenExpiredOrExpiringSoon(expiry) &&
|
|
125
|
+
cachedSession.matrixClient.isUsingToken(cachedSession.accessToken)) {
|
|
126
|
+
return cachedSession.accessToken;
|
|
127
|
+
}
|
|
128
|
+
if (this.isTokenExpired(expiry)) {
|
|
129
|
+
return await this.handleExpiredToken(handleId);
|
|
130
|
+
}
|
|
131
|
+
return await this.refreshCachedSessionToken(handleId, cachedSession, deviceId, storePassphrase);
|
|
132
|
+
}
|
|
133
|
+
async handleExpiredToken(handleId) {
|
|
134
|
+
this.log.debug(`Token expired for handle ${handleId.toString()}, cleaned up session`);
|
|
135
|
+
// Stop syncing the matrix client since token is expired
|
|
136
|
+
await this.deleteSession(handleId);
|
|
137
|
+
return undefined;
|
|
138
|
+
}
|
|
139
|
+
async refreshCachedSessionToken(handleId, cachedSession, deviceId, storePassphrase) {
|
|
140
|
+
try {
|
|
141
|
+
const newSession = await this.getAccessTokenFromService(handleId, deviceId);
|
|
142
|
+
const newToken = newSession.token;
|
|
143
|
+
const { expiry: newExpiry } = this.decodeToken(newToken);
|
|
144
|
+
// Schedule new refresh timeout
|
|
145
|
+
if (cachedSession.refreshTimeout) {
|
|
146
|
+
clearTimeout(cachedSession.refreshTimeout);
|
|
97
147
|
}
|
|
148
|
+
const refreshTimeout = this.scheduleTokenRefresh(handleId, newExpiry, storePassphrase);
|
|
149
|
+
// Update matrix client and session with new token
|
|
150
|
+
cachedSession.matrixClient.updateAccessToken(newToken);
|
|
151
|
+
this.sessions[handleId.toString()] = {
|
|
152
|
+
accessToken: newToken,
|
|
153
|
+
storePassphrase: storePassphrase,
|
|
154
|
+
matrixClient: cachedSession.matrixClient,
|
|
155
|
+
refreshTimeout,
|
|
156
|
+
};
|
|
157
|
+
// Store session for future reloads
|
|
158
|
+
const handleStorage = await this.storageModule.useHandleStorage(handleId.toString(), storePassphrase);
|
|
159
|
+
await handleStorage?.secureCommsStore.sessionAPIs.saveAccessToken(newToken);
|
|
160
|
+
return newToken;
|
|
161
|
+
}
|
|
162
|
+
catch (error) {
|
|
163
|
+
// If refresh fails, clean up defunct matrix client and remove cached session
|
|
164
|
+
this.log.error(`Failed to refresh token for handle ${handleId.toString()}: ${error}`);
|
|
165
|
+
await this.deleteSession(handleId);
|
|
166
|
+
return undefined;
|
|
98
167
|
}
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
let accessToken;
|
|
102
|
-
// Retrieve access token from store if cached session does not exist
|
|
168
|
+
}
|
|
169
|
+
async getAccessTokenFromStorage(handleStorage) {
|
|
103
170
|
const storedAccessToken = await handleStorage?.secureCommsStore.sessionAPIs.getAccessToken();
|
|
104
|
-
if (storedAccessToken) {
|
|
105
|
-
|
|
106
|
-
deviceId = decoded.device_id;
|
|
107
|
-
const expiry = parseInt(decoded.exp, 10);
|
|
108
|
-
const now = Math.floor(Date.now() / 1000);
|
|
109
|
-
const isExpiredOrExpiringSoon = expiry - now <= 300; // Check if the token has expired or will expire in 300 seconds
|
|
110
|
-
if (!isExpiredOrExpiringSoon) {
|
|
111
|
-
accessToken = storedAccessToken;
|
|
112
|
-
}
|
|
113
|
-
else {
|
|
114
|
-
// get new access token
|
|
115
|
-
accessToken = (await this.sessionService.get({
|
|
116
|
-
handleId: handleId.toString(),
|
|
117
|
-
deviceId: deviceId ?? (0, uuid_1.v4)(),
|
|
118
|
-
})).token;
|
|
119
|
-
}
|
|
171
|
+
if (!storedAccessToken) {
|
|
172
|
+
return undefined;
|
|
120
173
|
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
174
|
+
// Parse token once to check validity
|
|
175
|
+
const { expiry, deviceId } = this.decodeToken(storedAccessToken);
|
|
176
|
+
// If token is still valid (not expired and not expiring soon), use it
|
|
177
|
+
if (!this.isTokenExpired(expiry) && !this.isTokenExpiringSoon(expiry)) {
|
|
178
|
+
return {
|
|
179
|
+
token: storedAccessToken,
|
|
180
|
+
deviceId,
|
|
181
|
+
isValid: true,
|
|
182
|
+
};
|
|
127
183
|
}
|
|
184
|
+
// Token is expired or expiring soon, return it with isValid: false
|
|
185
|
+
return {
|
|
186
|
+
token: storedAccessToken,
|
|
187
|
+
deviceId,
|
|
188
|
+
isValid: false,
|
|
189
|
+
};
|
|
190
|
+
}
|
|
191
|
+
async getAccessTokenFromService(handleId, deviceId) {
|
|
192
|
+
const newSession = await this.sessionService.get({
|
|
193
|
+
handleId: handleId.toString(),
|
|
194
|
+
deviceId: deviceId ?? (0, uuid_1.v4)(),
|
|
195
|
+
});
|
|
196
|
+
// Parse new token to get deviceId (in case deviceId wasn't provided)
|
|
197
|
+
const { deviceId: tokenDeviceId } = this.decodeToken(newSession.token);
|
|
198
|
+
return {
|
|
199
|
+
token: newSession.token,
|
|
200
|
+
deviceId: deviceId ?? tokenDeviceId,
|
|
201
|
+
};
|
|
202
|
+
}
|
|
203
|
+
async getAccessTokenFromStorageOrService(handleId, handleStorage) {
|
|
204
|
+
// Try to get token from storage first
|
|
205
|
+
const storedToken = await this.getAccessTokenFromStorage(handleStorage);
|
|
206
|
+
if (storedToken?.isValid) {
|
|
207
|
+
return {
|
|
208
|
+
token: storedToken.token,
|
|
209
|
+
deviceId: storedToken.deviceId,
|
|
210
|
+
};
|
|
211
|
+
}
|
|
212
|
+
// Token not in storage or invalid, get from service
|
|
213
|
+
// Use deviceId from invalid stored token if available
|
|
214
|
+
const deviceId = storedToken?.deviceId;
|
|
215
|
+
const serviceToken = await this.getAccessTokenFromService(handleId, deviceId);
|
|
216
|
+
return {
|
|
217
|
+
token: serviceToken.token,
|
|
218
|
+
deviceId: serviceToken.deviceId,
|
|
219
|
+
};
|
|
220
|
+
}
|
|
221
|
+
async createNewSession(handleId, storePassphrase) {
|
|
222
|
+
// useHandleStorage will initialize the handle storage if it is not already initialized
|
|
223
|
+
const handleStorage = await this.storageModule.useHandleStorage(handleId.toString(), storePassphrase);
|
|
224
|
+
// Get access token from storage or service
|
|
225
|
+
const { token: accessToken } = await this.getAccessTokenFromStorageOrService(handleId, handleStorage);
|
|
226
|
+
// Parse token once for both matrix client creation and refresh scheduling
|
|
227
|
+
const { decoded, expiry } = this.decodeToken(accessToken);
|
|
128
228
|
// Create a new matrix client
|
|
129
|
-
const matrixClient = await this.createMatrixClient(handleId.toString(), accessToken,
|
|
130
|
-
|
|
229
|
+
const matrixClient = await this.createMatrixClient(handleId.toString(), accessToken, decoded, storePassphrase, handleStorage);
|
|
230
|
+
// Schedule token refresh before expiry
|
|
231
|
+
const refreshTimeout = this.scheduleTokenRefresh(handleId, expiry, storePassphrase);
|
|
232
|
+
// Store session
|
|
131
233
|
this.sessions[handleId.toString()] = {
|
|
132
234
|
accessToken: accessToken,
|
|
133
|
-
storePassphrase:
|
|
235
|
+
storePassphrase: storePassphrase,
|
|
134
236
|
matrixClient,
|
|
237
|
+
refreshTimeout,
|
|
135
238
|
};
|
|
136
|
-
// store session for future reloads
|
|
137
239
|
await handleStorage?.secureCommsStore.sessionAPIs.saveAccessToken(accessToken);
|
|
138
240
|
return accessToken;
|
|
139
241
|
}
|
|
140
|
-
async createMatrixClient(handleId, token, storePassphrase, handleStorage) {
|
|
141
|
-
const decoded = JWT.decode(token);
|
|
242
|
+
async createMatrixClient(handleId, token, decoded, storePassphrase, handleStorage) {
|
|
142
243
|
const client = new matrixClientManager_1.MatrixClientManager(token, decoded, handleStorage);
|
|
143
244
|
if (typeof indexedDB !== 'undefined') {
|
|
144
245
|
// use indexedDB if available (i.e., in browser or Node with polyfill)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionManager.js","sourceRoot":"","sources":["../../../../src/private/data/session/sessionManager.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;AAEH,2DAAiE;AACjE,0DAAmC;AACnC,+BAAyB;AACzB,4CAAwE;AAExE,4CAAwC;AACxC,uEAAmE;AAEnE,MAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"sessionManager.js","sourceRoot":"","sources":["../../../../src/private/data/session/sessionManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ class DefaultSecureCommsClient {
|
|
|
39
39
|
this.keyManager =
|
|
40
40
|
opts.sudoKeyManager ?? new sudo_common_1.DefaultSudoKeyManager(this.sudoCryptoProvider);
|
|
41
41
|
this.sessionService = new defaultSessionService_1.DefaultSessionService(this.apiClient);
|
|
42
|
-
this.sessionManager = new sessionManager_1.SessionManager(this.sessionService, this.storage);
|
|
42
|
+
this.sessionManager = new sessionManager_1.SessionManager(this.sessionService, this.storage, opts.autoRefreshTokenMinutesBeforeExpiration ?? 5);
|
|
43
43
|
this.mediaCredentialService = new defaultMediaCredentialService_1.DefaultMediaCredentialService(this.apiClient);
|
|
44
44
|
this.mediaCredentialManager = new mediaCredentialManager_1.MediaCredentialManager(this.userClient, this.mediaCredentialService, this.identityServiceConfig, this.secureCommsServiceConfig);
|
|
45
45
|
this.handles = new handlesModule_1.DefaultHandlesModule(this.apiClient, this.sessionManager);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secureCommsClient.js","sourceRoot":"","sources":["../../src/public/secureCommsClient.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,2DAOkC;AAClC,uDAGgC;AAChC,qFAA8E;AAC9E,uCAYkB;AAClB,6DAAgF;AAChF,mEAGoC;AACpC,2DAA6E;AAC7E,uDAAuE;AAEvE,gEAA4D;AAC5D,0DAGsC;AAEtC,uGAAmG;AACnG,yFAAqF;AACrF,yFAAqF;AACrF,2EAAuE;
|
|
1
|
+
{"version":3,"file":"secureCommsClient.js","sourceRoot":"","sources":["../../src/public/secureCommsClient.ts"],"names":[],"mappings":"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"}
|
package/docs/assets/hierarchy.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
window.hierarchyData = "
|
|
1
|
+
window.hierarchyData = "eJydWU1z2zYQ/S88Iy3xRQK6OXKSelq3HnvSHjI+0CRkYUqRLgnZSTP+7x1QigyQoLDsxR5bb/H27S4WC+h70rWt6ZPVFyyxQCwXKMsFyiVDWGCCJOVI5hnCgqcIYyIQSe2fFFOEucCIYIwR5hIjjDCVAmHO7UeY3aOkU5talUa3TZ+svifY/miKnUpWyZ0q951at7td/6Hr2i5Byd+6qZKV5Uj2XZ2skrIu+l71P4+xP23Nrk7Q4fNklZi+emeN3x3+gZJyq+uqU02y+kI54gRlEokM4ZQiTFKEaY4wZwjnGGFhJXFECEGESkR4hkhOEZEpommOKGGIMowoF/evKKHc0XDVPBe1ri66x/1ONSaqI4SPaHlFCScO5eem2Jtt2+l/VRXlm4DjZJn0ycpSPZnioVZ/tV0Vz1TYIk4rMof2l6KpavV7ay6eC13bpaK8MyZxYpzSEPPHdt/E4xuAAxhJOi2h40rFLi41bAHgpfkc71VcaggP4OTM4byoddEvSmvYAsCbu61mvS2aRtXgtIbwAE4hApzFblkhn7OL+0DSQHs6LnlnCgOurokNgJuQWe4hjwu532wA3NRtW7dtuwMnewIGsHG3W92obqf7XrfNpWo0oCsHDQCsudupbHHUdfsC4BtBAUzS7VCXulOlWW8L8+Gr7k08jUGDOCtN8yDrtdo9qK7f6qcFzCMjADth4eHkTnXPulTrttnoR3BVgRYAeMW8kYl+fqrbAsDuAgEsXHgsl+1LA+TxoHEmlrpRvtk/1Lr80WpU0ZXbq+Zpb06UdhY7UurGqG5TlHb/zJjN0p9sBxfyQJvur9tqX6sIsQ8G0HmDKOe5HSA598pcbYp9bWbcCJV4yAAw1nmq3/YJTPgEv1R7nlKrPfeGraOUeWfm5cMdOkUgl27pfera/RNMvAtdqluwzOoWLJvqDrowLxnkxkmtpO5h/JvuzWFy6yEbbAyHbSzpXY2O9qAIe9ilIZZsuJdJJqYhDjsxH2OYI29Bzt20XqtKFyC9DnKxWpEOakU6VRtyYF4rxAnnluQdzp+UuVZ9XzzC6mkMh9UTTnHmHcm20S+hDVgAmTERXmLtCrp5BCbXQy9NMMaS3A8+SBJKcdiVc2mGueNcE/FoztQbXRbDGw4oAAGLxUGg9BAESgNBOOfSfCCWuOUEQ4rxWKjNN1AcfPDiEDCGhxAwbwQ8iplxZF490Bnn4p5m3m2uUl9Vdfn+zrRd8ahuuvZZV6r7WJSm7b6dv9SdNYW4gr3R/LwHM7lYxj2XE54Ox7l94Zx6BCsKF7ucP2MH/owFaiLoxpmSALnipEG4hXhjm8qwmWLT+gm4VC5LGZKUIHv4IHsaHLTLmVfkda1VEz8TRvjFOciwHPzIsJzZl0F3IlsT5JLz1ITJZNYCDVmL5QrM7w+M7nT3x0ujKhCtgwQevoKn3uFrL/LRM9eClmvjEmGR0YNALqf3QhC7h4WKzOj4NgLicpBAJondE+x90avjRLRuGxPfMFODxWGWhCI8bGRJBcKSHQIuiRuCX9W3P1V3OqFv1T971cecCxtBA+PNFreqKkqjqqPWCPEIDWb0h4l6c6l60+3hvEEbKDujk31lH8hs+UaJx3AYp/2qcGaWvGo27YJB0sKXFh5JRYpIKod+bf/wn6e1iYk+gP4HLUMkFdJysyO3d16fHi9AXozh0NALOe4wIDoHCWXyXlaO3RDE5WHBbHJyN1NuqYDuZ54FkBlj7DWMUj8BJo4TbnEd2W+qCSa5/Yp9aJn29ySn1bkR4wgBPPn730r+SMzZxU8g0PK5v7yJrm3iC7++/gfk3dqo"
|