Skip to content

Commit f4dea01

Browse files
committed
[Auth] Break down event ID digits to a max Math.random() digit count
1 parent 61f0d7e commit f4dea01

File tree

3 files changed

+30
-7
lines changed

3 files changed

+30
-7
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { expect } from 'chai';
2+
import { _generateEventId } from './event_id';
3+
4+
describe('core/util/event_id', () => {
5+
it('sub-15 digit id', () => {
6+
expect(_generateEventId('', 10)).to.have.length(10);
7+
});
8+
9+
it('15 digit id', () => {
10+
expect(_generateEventId('', 15)).to.have.length(15);
11+
});
12+
13+
it('above-15 digit id', () => {
14+
expect(_generateEventId('', 20)).to.have.length(20);
15+
});
16+
});

packages-exp/auth-exp/src/core/util/event_id.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@
1515
* limitations under the License.
1616
*/
1717

18-
export function _generateEventId(prefix?: string): string {
19-
return `${prefix ? prefix : ''}${Math.floor(Math.random() * 1000000000)}`;
18+
const MAX_RANDOM_DIGITS = 15;
19+
20+
export function _generateEventId(prefix = '', digits = 10): string {
21+
// This array breaks down digits into a list of numbers, maxed at 15, that
22+
// sums to digits. For example, 10 becomes [10] and 16 becomes [15, 1].
23+
const digitBreakdown = Array(Math.floor(digits / MAX_RANDOM_DIGITS)).fill(MAX_RANDOM_DIGITS);
24+
if (digits % MAX_RANDOM_DIGITS) {
25+
digitBreakdown.push(digits % MAX_RANDOM_DIGITS);
26+
}
27+
28+
const random = digitBreakdown.map(digits => Math.floor(Math.random() * Math.pow(10, digits)).toString().padStart(digits, '0')).join('');
29+
return prefix + random;
2030
}

packages-exp/auth-exp/src/platform_browser/messagechannel/sender.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18+
import { _generateEventId } from '../../core/util/event_id';
1819
import {
1920
_SenderRequest,
2021
_EventType,
@@ -32,10 +33,6 @@ interface MessageHandler {
3233
onMessage: EventListenerOrEventListenerObject;
3334
}
3435

35-
function generateEventId(prefix = '', digits = 20): string {
36-
return `${prefix}${Math.floor(Math.random() * Math.pow(10, digits))}`;
37-
}
38-
3936
/**
4037
* Interface for sending messages and waiting for a completion response.
4138
*
@@ -91,7 +88,7 @@ export class Sender {
9188
let completionTimer: any;
9289
let handler: MessageHandler;
9390
return new Promise<_ReceiverMessageResponse<T>>((resolve, reject) => {
94-
const eventId = generateEventId();
91+
const eventId = _generateEventId('', 20);
9592
messageChannel.port1.start();
9693
const ackTimer = setTimeout(() => {
9794
reject(new Error(_MessageError.UNSUPPORTED_EVENT));

0 commit comments

Comments
 (0)