File tree Expand file tree Collapse file tree 2 files changed +18
-3
lines changed
libs/sq-server-commons/src/helpers Expand file tree Collapse file tree 2 files changed +18
-3
lines changed Original file line number Diff line number Diff line change @@ -118,6 +118,15 @@ describe('computeTokenExpirationDate', () => {
118118 ] ) ( 'should correctly compute the proper expiration date for %s days' , ( days , expected ) => {
119119 expect ( computeTokenExpirationDate ( Number ( days ) ) ) . toBe ( expected ) ;
120120 } ) ;
121+
122+ it ( 'should calculate expiration date in UTC regardless of local timezone' , ( ) => {
123+ const result = computeTokenExpirationDate ( Number ( TokenExpiration . OneMonth ) ) ;
124+ expect ( result ) . toBe ( '2022-07-01' ) ;
125+ const date = new Date ( result ) ;
126+ expect ( date . getUTCDate ( ) ) . toBe ( 1 ) ;
127+ expect ( date . getUTCMonth ( ) ) . toBe ( 6 ) ;
128+ expect ( date . getUTCFullYear ( ) ) . toBe ( 2022 ) ;
129+ } ) ;
121130} ) ;
122131
123132describe ( 'getNextTokenName' , ( ) => {
Original file line number Diff line number Diff line change @@ -66,9 +66,15 @@ export async function getAvailableExpirationOptions() {
6666}
6767
6868export function computeTokenExpirationDate ( days : number ) {
69- const expirationDate = now ( ) ;
70- expirationDate . setDate ( expirationDate . getDate ( ) + days ) ;
71- return toShortISO8601String ( expirationDate ) ;
69+ const currentDate = now ( ) ;
70+ const utcDate = new Date (
71+ Date . UTC (
72+ currentDate . getUTCFullYear ( ) ,
73+ currentDate . getUTCMonth ( ) ,
74+ currentDate . getUTCDate ( ) + days ,
75+ ) ,
76+ ) ;
77+ return toShortISO8601String ( utcDate ) ;
7278}
7379
7480export function getNextTokenName ( tokenNameBase : string , tokens : UserToken [ ] ) {
You can’t perform that action at this time.
0 commit comments