Skip to content

Commit 63aed0e

Browse files
ashleysmithTTDashleysmithTTD
committed
identity type no longer needed
1 parent 66756e7 commit 63aed0e

File tree

1 file changed

+33
-47
lines changed

1 file changed

+33
-47
lines changed

‎src/integrationTests/clientSideTokenGeneration.test.ts‎

Lines changed: 33 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -48,94 +48,102 @@ describe('Client-side token generation Tests', () => {
4848
const scenarios = [
4949
{
5050
name: 'setIdentityFromEmail',
51-
identityType: 'uid2',
5251
setInvalidIdentity: () => uid2.setIdentityFromEmail('test.com', mocks.makeUid2CstgOption()),
5352
setIdentity: (serverPublicKey?: string) =>
5453
uid2.setIdentityFromEmail(
5554
'test@example.com',
5655
mocks.makeUid2CstgOption({ serverPublicKey })
5756
),
57+
getIdentity: mocks.getUid2(),
58+
serverPublicKey: serverPublicKeyUid2,
5859
},
5960
{
6061
name: 'setIdentityFromEmailHash',
61-
identityType: 'uid2',
6262
setInvalidIdentity: () =>
6363
uid2.setIdentityFromEmailHash('test@example.com', mocks.makeUid2CstgOption()),
6464
setIdentity: (serverPublicKey?: string) =>
6565
uid2.setIdentityFromEmailHash(
6666
'lz3+Rj7IV4X1+Vr1ujkG7tstkxwk5pgkqJ6mXbpOgTs=',
6767
mocks.makeUid2CstgOption({ serverPublicKey })
6868
),
69+
getIdentity: mocks.getUid2(),
70+
serverPublicKey: serverPublicKeyUid2,
6971
},
7072
{
7173
name: 'setIdentityFromPhone',
72-
identityType: 'uid2',
7374
setInvalidIdentity: () =>
7475
uid2.setIdentityFromPhone('12345678910', mocks.makeUid2CstgOption()),
7576
setIdentity: (serverPublicKey?: string) =>
7677
uid2.setIdentityFromPhone('+12345678910', mocks.makeUid2CstgOption({ serverPublicKey })),
78+
getIdentity: mocks.getUid2(),
79+
serverPublicKey: serverPublicKeyUid2,
7780
},
7881
{
7982
name: 'setIdentityFromPhoneHash',
80-
identityType: 'uid2',
8183
setInvalidIdentity: () =>
8284
uid2.setIdentityFromPhoneHash('+12345678910', mocks.makeUid2CstgOption()),
8385
setIdentity: (serverPublicKey?: string) =>
8486
uid2.setIdentityFromPhoneHash(
8587
'kVJ+4ilhrqm3HZDDnCQy4niZknvCoM4MkoVzZrQSdJw=',
8688
mocks.makeUid2CstgOption({ serverPublicKey })
8789
),
90+
getIdentity: mocks.getUid2(),
91+
serverPublicKey: serverPublicKeyUid2,
8892
},
8993
{
9094
name: 'setIdentityFromEmail',
91-
identityType: 'euid',
9295
setInvalidIdentity: () => euid.setIdentityFromEmail('test.com', mocks.makeEuidCstgOption()),
9396
setIdentity: (serverPublicKey?: string) =>
9497
euid.setIdentityFromEmail(
9598
'test@example.com',
9699
mocks.makeEuidCstgOption({ serverPublicKey })
97100
),
101+
getIdentity: mocks.getEuid(),
102+
serverPublicKey: serverPublicKeyEuid,
98103
},
99104
{
100105
name: 'setIdentityFromEmailHash',
101-
identityType: 'euid',
102106
setInvalidIdentity: () =>
103107
euid.setIdentityFromEmailHash('test@example.com', mocks.makeEuidCstgOption()),
104108
setIdentity: (serverPublicKey?: string) =>
105109
euid.setIdentityFromEmailHash(
106110
'lz3+Rj7IV4X1+Vr1ujkG7tstkxwk5pgkqJ6mXbpOgTs=',
107111
mocks.makeEuidCstgOption({ serverPublicKey })
108112
),
113+
getIdentity: mocks.getEuid(),
114+
serverPublicKey: serverPublicKeyEuid,
109115
},
110116
{
111117
name: 'setIdentityFromPhone',
112-
identityType: 'euid',
113118
setInvalidIdentity: () =>
114119
euid.setIdentityFromPhone('12345678910', mocks.makeEuidCstgOption()),
115120
setIdentity: (serverPublicKey?: string) =>
116121
euid.setIdentityFromPhone('+12345678910', mocks.makeEuidCstgOption({ serverPublicKey })),
122+
getIdentity: mocks.getEuid(),
123+
serverPublicKey: serverPublicKeyEuid,
117124
},
118125
{
119126
name: 'setIdentityFromPhoneHash',
120-
identityType: 'euid',
121127
setInvalidIdentity: () =>
122128
euid.setIdentityFromPhoneHash('+12345678910', mocks.makeEuidCstgOption()),
123129
setIdentity: (serverPublicKey?: string) =>
124130
euid.setIdentityFromPhoneHash(
125131
'kVJ+4ilhrqm3HZDDnCQy4niZknvCoM4MkoVzZrQSdJw=',
126132
mocks.makeEuidCstgOption({ serverPublicKey })
127133
),
134+
getIdentity: mocks.getEuid(),
135+
serverPublicKey: serverPublicKeyEuid,
128136
},
129137
];
130138

131139
scenarios.forEach((scenario) => {
132140
describe(scenario.name, () => {
133141
beforeEach(() => {
134-
if (scenario.identityType === 'uid2') {
142+
if (scenario.serverPublicKey.includes('UID2')) {
135143
uid2 = new UID2();
136144
uid2.init({});
137145
uid2OrEuid = uid2;
138-
} else if (scenario.identityType === 'euid') {
146+
} else if (scenario.serverPublicKey.includes('EUID')) {
139147
euid = new EUID();
140148
euid.init({});
141149
uid2OrEuid = euid;
@@ -175,31 +183,21 @@ describe('Client-side token generation Tests', () => {
175183
done();
176184
}
177185
});
178-
scenario.setIdentity(
179-
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
180-
);
186+
scenario.setIdentity(scenario.serverPublicKey);
181187
});
182188

183189
test('should set identity to storage', async () => {
184-
await scenario.setIdentity(
185-
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
186-
);
187-
scenario.identityType === 'uid2'
188-
? expect(mocks.getUid2()).toEqual(cstgToken)
189-
: expect(mocks.getEuid()).toEqual(cstgToken);
190+
await scenario.setIdentity(scenario.serverPublicKey);
191+
expect(scenario.getIdentity).toEqual(cstgToken);
190192
});
191193

192194
test('UID2 or EUID should be in available state', async () => {
193-
await scenario.setIdentity(
194-
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
195-
);
195+
await scenario.setIdentity(scenario.serverPublicKey);
196196
(expect(uid2OrEuid) as any).toBeInAvailableState(cstgToken.advertising_token);
197197
});
198198

199199
test('should refresh token when generated token requires a refresh', async () => {
200-
await scenario.setIdentity(
201-
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
202-
);
200+
await scenario.setIdentity(scenario.serverPublicKey);
203201
const refreshedToken = {
204202
...mocks.makeIdentityV2(),
205203
advertising_token: 'refreshed_token',
@@ -226,21 +224,15 @@ describe('Client-side token generation Tests', () => {
226224
});
227225
});
228226
test('should not set identity', async () => {
229-
await expect(
230-
scenario.setIdentity(
231-
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
232-
)
233-
).rejects.toEqual('Client error: Here is a client error');
234-
scenario.identityType === 'uid2'
235-
? expect(mocks.getUid2()).toBeNull()
236-
: expect(mocks.getEuid()).toBeNull();
227+
await expect(scenario.setIdentity(scenario.serverPublicKey)).rejects.toEqual(
228+
'Client error: Here is a client error'
229+
);
230+
expect(scenario.getIdentity).toBeNull();
237231
});
238232
test('should be in unavailable state', async () => {
239-
await expect(
240-
scenario.setIdentity(
241-
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
242-
)
243-
).rejects.toEqual('Client error: Here is a client error');
233+
await expect(scenario.setIdentity(scenario.serverPublicKey)).rejects.toEqual(
234+
'Client error: Here is a client error'
235+
);
244236
(expect(uid2OrEuid) as any).toBeInUnavailableState();
245237
});
246238
});
@@ -259,9 +251,7 @@ describe('Client-side token generation Tests', () => {
259251
});
260252
});
261253
test('UID2 or EUID should be in optout state', async () => {
262-
await scenario.setIdentity(
263-
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
264-
);
254+
await scenario.setIdentity(scenario.serverPublicKey);
265255
(expect(uid2OrEuid) as any).toBeInOptoutState();
266256
});
267257

@@ -272,9 +262,7 @@ describe('Client-side token generation Tests', () => {
272262
done();
273263
}
274264
});
275-
scenario.setIdentity(
276-
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
277-
);
265+
scenario.setIdentity(scenario.serverPublicKey);
278266
});
279267

280268
test('The callback should be called with an optout event', (done) => {
@@ -283,9 +271,7 @@ describe('Client-side token generation Tests', () => {
283271
done();
284272
}
285273
});
286-
scenario.setIdentity(
287-
scenario.identityType === 'uid2' ? serverPublicKeyUid2 : serverPublicKeyEuid
288-
);
274+
scenario.setIdentity(scenario.serverPublicKey);
289275
});
290276
});
291277
});

0 commit comments

Comments
 (0)