Skip to content

Commit d247887

Browse files
ashleysmithTTDashleysmithTTD
committed
revert public key changes
1 parent 63aed0e commit d247887

File tree

1 file changed

+41
-23
lines changed

1 file changed

+41
-23
lines changed

‎src/integrationTests/clientSideTokenGeneration.test.ts‎

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,18 @@ describe('Client-side token generation Tests', () => {
4848
const scenarios = [
4949
{
5050
name: 'setIdentityFromEmail',
51+
identityType: 'uid2',
5152
setInvalidIdentity: () => uid2.setIdentityFromEmail('test.com', mocks.makeUid2CstgOption()),
5253
setIdentity: (serverPublicKey?: string) =>
5354
uid2.setIdentityFromEmail(
5455
'[email protected]',
5556
mocks.makeUid2CstgOption({ serverPublicKey })
5657
),
5758
getIdentity: mocks.getUid2(),
58-
serverPublicKey: serverPublicKeyUid2,
5959
},
6060
{
6161
name: 'setIdentityFromEmailHash',
62+
identityType: 'uid2',
6263
setInvalidIdentity: () =>
6364
uid2.setIdentityFromEmailHash('[email protected]', mocks.makeUid2CstgOption()),
6465
setIdentity: (serverPublicKey?: string) =>
@@ -67,19 +68,19 @@ describe('Client-side token generation Tests', () => {
6768
mocks.makeUid2CstgOption({ serverPublicKey })
6869
),
6970
getIdentity: mocks.getUid2(),
70-
serverPublicKey: serverPublicKeyUid2,
7171
},
7272
{
7373
name: 'setIdentityFromPhone',
74+
identityType: 'uid2',
7475
setInvalidIdentity: () =>
7576
uid2.setIdentityFromPhone('12345678910', mocks.makeUid2CstgOption()),
7677
setIdentity: (serverPublicKey?: string) =>
7778
uid2.setIdentityFromPhone('+12345678910', mocks.makeUid2CstgOption({ serverPublicKey })),
7879
getIdentity: mocks.getUid2(),
79-
serverPublicKey: serverPublicKeyUid2,
8080
},
8181
{
8282
name: 'setIdentityFromPhoneHash',
83+
identityType: 'uid2',
8384
setInvalidIdentity: () =>
8485
uid2.setIdentityFromPhoneHash('+12345678910', mocks.makeUid2CstgOption()),
8586
setIdentity: (serverPublicKey?: string) =>
@@ -88,21 +89,21 @@ describe('Client-side token generation Tests', () => {
8889
mocks.makeUid2CstgOption({ serverPublicKey })
8990
),
9091
getIdentity: mocks.getUid2(),
91-
serverPublicKey: serverPublicKeyUid2,
9292
},
9393
{
9494
name: 'setIdentityFromEmail',
95+
identityType: 'euid',
9596
setInvalidIdentity: () => euid.setIdentityFromEmail('test.com', mocks.makeEuidCstgOption()),
9697
setIdentity: (serverPublicKey?: string) =>
9798
euid.setIdentityFromEmail(
9899
'[email protected]',
99100
mocks.makeEuidCstgOption({ serverPublicKey })
100101
),
101102
getIdentity: mocks.getEuid(),
102-
serverPublicKey: serverPublicKeyEuid,
103103
},
104104
{
105105
name: 'setIdentityFromEmailHash',
106+
identityType: 'euid',
106107
setInvalidIdentity: () =>
107108
euid.setIdentityFromEmailHash('[email protected]', mocks.makeEuidCstgOption()),
108109
setIdentity: (serverPublicKey?: string) =>
@@ -111,19 +112,19 @@ describe('Client-side token generation Tests', () => {
111112
mocks.makeEuidCstgOption({ serverPublicKey })
112113
),
113114
getIdentity: mocks.getEuid(),
114-
serverPublicKey: serverPublicKeyEuid,
115115
},
116116
{
117117
name: 'setIdentityFromPhone',
118+
identityType: 'euid',
118119
setInvalidIdentity: () =>
119120
euid.setIdentityFromPhone('12345678910', mocks.makeEuidCstgOption()),
120121
setIdentity: (serverPublicKey?: string) =>
121122
euid.setIdentityFromPhone('+12345678910', mocks.makeEuidCstgOption({ serverPublicKey })),
122123
getIdentity: mocks.getEuid(),
123-
serverPublicKey: serverPublicKeyEuid,
124124
},
125125
{
126126
name: 'setIdentityFromPhoneHash',
127+
identityType: 'euid',
127128
setInvalidIdentity: () =>
128129
euid.setIdentityFromPhoneHash('+12345678910', mocks.makeEuidCstgOption()),
129130
setIdentity: (serverPublicKey?: string) =>
@@ -132,18 +133,17 @@ describe('Client-side token generation Tests', () => {
132133
mocks.makeEuidCstgOption({ serverPublicKey })
133134
),
134135
getIdentity: mocks.getEuid(),
135-
serverPublicKey: serverPublicKeyEuid,
136136
},
137137
];
138138

139139
scenarios.forEach((scenario) => {
140140
describe(scenario.name, () => {
141141
beforeEach(() => {
142-
if (scenario.serverPublicKey.includes('UID2')) {
142+
if (scenario.identityType === 'uid2') {
143143
uid2 = new UID2();
144144
uid2.init({});
145145
uid2OrEuid = uid2;
146-
} else if (scenario.serverPublicKey.includes('EUID')) {
146+
} else if (scenario.identityType === 'euid') {
147147
euid = new EUID();
148148
euid.init({});
149149
uid2OrEuid = euid;
@@ -183,21 +183,29 @@ describe('Client-side token generation Tests', () => {
183183
done();
184184
}
185185
});
186-
scenario.setIdentity(scenario.serverPublicKey);
186+
scenario.setIdentity(
187+
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
188+
);
187189
});
188190

189191
test('should set identity to storage', async () => {
190-
await scenario.setIdentity(scenario.serverPublicKey);
192+
await scenario.setIdentity(
193+
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
194+
);
191195
expect(scenario.getIdentity).toEqual(cstgToken);
192196
});
193197

194198
test('UID2 or EUID should be in available state', async () => {
195-
await scenario.setIdentity(scenario.serverPublicKey);
199+
await scenario.setIdentity(
200+
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
201+
);
196202
(expect(uid2OrEuid) as any).toBeInAvailableState(cstgToken.advertising_token);
197203
});
198204

199205
test('should refresh token when generated token requires a refresh', async () => {
200-
await scenario.setIdentity(scenario.serverPublicKey);
206+
await scenario.setIdentity(
207+
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
208+
);
201209
const refreshedToken = {
202210
...mocks.makeIdentityV2(),
203211
advertising_token: 'refreshed_token',
@@ -224,15 +232,19 @@ describe('Client-side token generation Tests', () => {
224232
});
225233
});
226234
test('should not set identity', async () => {
227-
await expect(scenario.setIdentity(scenario.serverPublicKey)).rejects.toEqual(
228-
'Client error: Here is a client error'
229-
);
235+
await expect(
236+
scenario.setIdentity(
237+
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
238+
)
239+
).rejects.toEqual('Client error: Here is a client error');
230240
expect(scenario.getIdentity).toBeNull();
231241
});
232242
test('should be in unavailable state', async () => {
233-
await expect(scenario.setIdentity(scenario.serverPublicKey)).rejects.toEqual(
234-
'Client error: Here is a client error'
235-
);
243+
await expect(
244+
scenario.setIdentity(
245+
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
246+
)
247+
).rejects.toEqual('Client error: Here is a client error');
236248
(expect(uid2OrEuid) as any).toBeInUnavailableState();
237249
});
238250
});
@@ -251,7 +263,9 @@ describe('Client-side token generation Tests', () => {
251263
});
252264
});
253265
test('UID2 or EUID should be in optout state', async () => {
254-
await scenario.setIdentity(scenario.serverPublicKey);
266+
await scenario.setIdentity(
267+
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
268+
);
255269
(expect(uid2OrEuid) as any).toBeInOptoutState();
256270
});
257271

@@ -262,7 +276,9 @@ describe('Client-side token generation Tests', () => {
262276
done();
263277
}
264278
});
265-
scenario.setIdentity(scenario.serverPublicKey);
279+
scenario.setIdentity(
280+
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
281+
);
266282
});
267283

268284
test('The callback should be called with an optout event', (done) => {
@@ -271,7 +287,9 @@ describe('Client-side token generation Tests', () => {
271287
done();
272288
}
273289
});
274-
scenario.setIdentity(scenario.serverPublicKey);
290+
scenario.setIdentity(
291+
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
292+
);
275293
});
276294
});
277295
});

0 commit comments

Comments
 (0)