@linked.cm/capacitor 0.3.4 → 0.3.6

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/CHANGELOG.md CHANGED
@@ -1,5 +1,22 @@
1
1
  # @linked.cm/capacitor
2
2
 
3
+ ## 0.3.6
4
+
5
+ ### Patch Changes
6
+
7
+ - [#22](https://github.com/linked-cm/capacitor/pull/22) [`4c50080`](https://github.com/linked-cm/capacitor/commit/4c50080dd9456b730e3a16a1a9e12d07c198bd01) Thanks [@abdipramana](https://github.com/abdipramana)! - Support WhatsApp OTP sign-in in cookie-less native clients with short-lived signed challenges.
8
+
9
+ ## 0.3.5
10
+
11
+ ### Patch Changes
12
+
13
+ - [#20](https://github.com/linked-cm/capacitor/pull/20) [`4f2a72a`](https://github.com/linked-cm/capacitor/commit/4f2a72a1641200837b3efbd03a3febfb024bc4d3) Thanks [@abdipramana](https://github.com/abdipramana)! - Check deterministic WhatsApp WebID and telephone-property matches together so
14
+ an existing duplicate identity is rejected instead of authenticated.
15
+
16
+ - [#20](https://github.com/linked-cm/capacitor/pull/20) [`4f2a72a`](https://github.com/linked-cm/capacitor/commit/4f2a72a1641200837b3efbd03a3febfb024bc4d3) Thanks [@abdipramana](https://github.com/abdipramana)! - WhatsApp code requests now obtain a 360dialog access token and send it as `Authorization: bearer` together with `D360-API-KEY`. The template payload includes `WA_D360_TEMPLATE_NAMESPACE` and a deterministic language policy.
17
+
18
+ `generateOTPWhatsapp` still returns `{ sent: true }` only after the provider answers HTTP 2xx. A 2xx response without `messages[0].id` is treated as delivered, and the code is stored on the session only then. A rejected send clears any previous code. `WA_D360_USERNAME` and `WA_D360_PASSWORD` are required.
19
+
3
20
  ## 0.3.4
4
21
 
5
22
  ### Patch Changes
@@ -0,0 +1,61 @@
1
+ ---
2
+ summary: WhatsApp code sends request a 360dialog bearer token, then store the code and return `{ sent: true }` only after HTTP 2xx.
3
+ ---
4
+
5
+ # WhatsApp code send
6
+
7
+ ## Outcome
8
+
9
+ `generateOTPWhatsapp` asks the 360dialog hub for an access token, then posts the authentication template with both `Authorization: bearer <token>` and `D360-API-KEY`. The sign-in screen opens the code step only when the call returns `{ sent: true }`.
10
+
11
+ There was no plan document for this change. This report is the record.
12
+
13
+ Pull request: https://github.com/linked-cm/capacitor/pull/20
14
+
15
+ ## Request flow
16
+
17
+ 1. Refuse the call when the request has no session.
18
+ 2. Normalize the phone number to digits and require `WA_D360_API_KEY`.
19
+ 3. Delete any code already stored on the session, so a failed resend cannot be used.
20
+ 4. `POST https://hub.360dialog.io/api/v2/token` with `WA_D360_USERNAME` and `WA_D360_PASSWORD`. A missing token is a failed send.
21
+ 5. `POST https://waba-v2.360dialog.io/messages` with the template namespace, template name, deterministic language policy, and the code in the body and URL button.
22
+ 6. On HTTP 2xx, store the code and return `{ sent: true }`. The response body is not required to contain `messages[0].id`.
23
+ 7. On any other failure, leave the session without a code and throw `Could not send the code. Please try again.`
24
+
25
+ `validateOTPWhatsapp` is unchanged. It still compares the submitted code with `session.otp`.
26
+
27
+ ## Decisions
28
+
29
+ - The bearer token is added because the hub token endpoint is what the current 360dialog account uses. The API key header stays.
30
+ - HTTP 2xx is the acceptance signal. Requiring `messages[0].id` hid a delivered code from the sign-in screen when the provider omitted that id.
31
+ - The code is written to the session only after that 2xx. Writing it before the request let a rejected send leave a usable code behind.
32
+ - The screen keeps checking `response.sent`. A call that resolves without that flag, which non-2xx RPC responses can do, stays on the phone step and shows the inline error.
33
+ - `WA_D360_TEMPLATE_LANGUAGE` still overrides the language code. The default remains `en`. The policy is always `deterministic` because authentication templates are rejected without it.
34
+
35
+ ## Public behavior
36
+
37
+ Callers of `generateOTPWhatsapp` receive `{ sent: true }` or a thrown error. They no longer receive the provider body. Required environment variables:
38
+
39
+ - `WA_D360_API_KEY`
40
+ - `WA_D360_USERNAME`
41
+ - `WA_D360_PASSWORD`
42
+ - `WA_D360_TEMPLATE_NAMESPACE`
43
+ - `WA_D360_TEMPLATE_NAME`
44
+ - `WA_D360_TEMPLATE_LANGUAGE` (optional)
45
+
46
+ ## Files
47
+
48
+ - `src/backend.ts` — token request, template send, and session write.
49
+ - `src/components/SignInWithWhatsapp.tsx` — opens the code step only for `{ sent: true }`.
50
+ - `tests/whatsapp-otp.test.mjs` — token header, rejected resend, and 2xx without a message id.
51
+ - `readme.md` — documents the `{ sent: true }` result next to the environment variables.
52
+
53
+ ## Tests
54
+
55
+ `npm test` builds `lib/esm` and runs `tests/*.test.mjs`. The WhatsApp send tests cover the bearer header, namespace, normalized recipient, successful store, rejected resend clearing the previous code, and a 2xx body without a message id.
56
+
57
+ ## Limitations
58
+
59
+ The session is still `express-session` on the app server. This package does not create that session. If `req.session` is missing, the send fails before 360dialog is called.
60
+
61
+ The token is requested on every send and is not cached.
@@ -0,0 +1,36 @@
1
+ # Cookie-less WhatsApp OTP sign-in
2
+
3
+ ## Scope
4
+
5
+ Support the existing WhatsApp OTP component when a native WebView cannot retain
6
+ the cross-origin session cookie required by the browser flow.
7
+
8
+ ## Behavior
9
+
10
+ - Cookie-backed browser requests continue storing and validating the OTP in the
11
+ server session.
12
+ - Cookie-less requests receive a ten-minute, phone-bound signed challenge after
13
+ the provider accepts the code delivery.
14
+ - The client returns that opaque challenge with the entered OTP. The server
15
+ rejects challenges with an invalid signature, a different phone number, or an
16
+ expired timestamp.
17
+ - Successful session-backed codes are consumed; a mistyped code may still be
18
+ retried, as before.
19
+
20
+ ## Security considerations
21
+
22
+ The signed challenge deliberately contains no plaintext OTP. Its signature
23
+ covers the payload and entered OTP, and comparison is constant-time. It is not
24
+ server-stored, so it cannot be made single-use across multiple workers; its
25
+ validity is limited to ten minutes. Deployments should keep normal OTP attempt
26
+ rate limits at the application edge.
27
+
28
+ ## Verification
29
+
30
+ The package test covers challenge issuance, valid verification, incorrect OTP,
31
+ and a challenge bound to another phone number. The application regression suite
32
+ also covers expired and modified challenges.
33
+
34
+ ## Notes
35
+
36
+ This was a focused compatibility fix without a dedicated implementation plan.
@@ -8,7 +8,7 @@ export default class CapacitorBackendProvider extends BackendProvider {
8
8
  private readonly onAccountRemoved;
9
9
  setupBeforeControllers(): Promise<void>;
10
10
  dispose(): void;
11
- validateOTPWhatsapp(phoneIdentifier: any, OPT_Input: any): Promise<({
11
+ validateOTPWhatsapp(phoneIdentifier: any, OPT_Input: any, otpChallenge?: string): Promise<({
12
12
  auth: import("@_linked/auth/types/auth").AuthSession;
13
13
  accessToken: string;
14
14
  refreshToken?: string;
@@ -21,9 +21,17 @@ export default class CapacitorBackendProvider extends BackendProvider {
21
21
  }>;
22
22
  generateOTPWhatsapp(phoneNumber: any): Promise<{
23
23
  sent: boolean;
24
+ challenge?: undefined;
25
+ } | {
26
+ sent: boolean;
27
+ challenge: string;
24
28
  }>;
29
+ private otpChallengeSecret;
30
+ private createOTPChallenge;
31
+ private verifyOTPChallenge;
32
+ getBearerToken(): Promise<any>;
25
33
  generateOTP(): number;
26
- sendMessage(url: any, apiKey: any, otp: any, phoneNumber: any): Promise<Response>;
34
+ sendMessage(url: any, bearerToken: any, apiKey: any, otp: any, phoneNumber: any): Promise<Response>;
27
35
  getUserLocationAction(user: UserData): Promise<{
28
36
  agent: {
29
37
  id: string;
@@ -18,6 +18,7 @@ import { UserAccount } from '@_linked/sioc/shapes/UserAccount';
18
18
  import { AuthCredential } from '@_linked/auth/shapes/AuthCredential';
19
19
  import { telephoneToWebID } from '@_linked/auth/utils/webID';
20
20
  import { normalizeTelephone } from './utils/helper.js';
21
+ import crypto from 'crypto';
21
22
  import { AMBIGUOUS_TELEPHONE_IDENTITY, AmbiguousTelephoneIdentityError, resolveTelephoneAccount, } from './utils/telephoneAccount.js';
22
23
  export default class CapacitorBackendProvider extends BackendProvider {
23
24
  constructor() {
@@ -42,7 +43,8 @@ export default class CapacitorBackendProvider extends BackendProvider {
42
43
  dispose() {
43
44
  offAccountWillBeRemoved(this.onAccountRemoved);
44
45
  }
45
- async validateOTPWhatsapp(phoneIdentifier, OPT_Input) {
46
+ async validateOTPWhatsapp(phoneIdentifier, OPT_Input, otpChallenge) {
47
+ var _a;
46
48
  try {
47
49
  if (!phoneIdentifier) {
48
50
  console.log('No phone number provided');
@@ -58,10 +60,22 @@ export default class CapacitorBackendProvider extends BackendProvider {
58
60
  console.log('No OTP code provided');
59
61
  return { error: 'No OTP code provided' };
60
62
  }
61
- if (this.request.session.otp.toString() !== OPT_Input) {
63
+ // Browser requests normally verify against the OTP kept in their Express
64
+ // session. Native WebViews may not carry that cross-origin session cookie,
65
+ // so they verify the signed challenge returned by generateOTPWhatsapp.
66
+ const sessionOtp = (_a = this.request.session) === null || _a === void 0 ? void 0 : _a.otp;
67
+ const otpIsValid = sessionOtp !== undefined && sessionOtp !== null
68
+ ? sessionOtp.toString() === OPT_Input
69
+ : this.verifyOTPChallenge(normalizedPhone, String(OPT_Input), otpChallenge);
70
+ if (!otpIsValid) {
62
71
  console.log('OTP code is incorrect');
63
72
  return { error: 'OTP code is incorrect' };
64
73
  }
74
+ // Preserve the old retry behavior for a mistyped code, but consume a
75
+ // successful session-backed code so it cannot be replayed.
76
+ if (sessionOtp !== undefined && sessionOtp !== null) {
77
+ delete this.request.session.otp;
78
+ }
65
79
  return await Auth.login(this, async () => {
66
80
  const telephoneWebId = telephoneToWebID(normalizedPhone);
67
81
  // first, try to find account by telephone-based webID (for new users)
@@ -69,7 +83,8 @@ export default class CapacitorBackendProvider extends BackendProvider {
69
83
  // UserAccount subclass with a different target class, so querying the
70
84
  // base SIOC shape would miss their existing accounts and create a
71
85
  // duplicate telephone-only identity.
72
- const webIdAccounts = await this.accountShape.select((ua) => [
86
+ const webIdAccounts = await this.accountShape
87
+ .select((ua) => [
73
88
  ua.email,
74
89
  ua.accountOf.select((p) => [
75
90
  p.givenName,
@@ -82,21 +97,12 @@ export default class CapacitorBackendProvider extends BackendProvider {
82
97
  id: telephoneWebId,
83
98
  });
84
99
  });
85
- const webIdResolution = resolveTelephoneAccount(webIdAccounts);
86
- if (webIdResolution.kind === 'ambiguous') {
87
- throw new AmbiguousTelephoneIdentityError(webIdResolution);
88
- }
89
- let account = webIdResolution.kind === 'one' ? webIdResolution.account : null;
90
- if (account && account.accountOf) {
91
- console.log(`Found account by telephone-based webID for phone number ${phoneIdentifier}`);
92
- return {
93
- account,
94
- person: account.accountOf,
95
- };
96
- }
97
- // if not found, try to find by telephone property (for old users with normal ID)
98
- console.log(`Account not found by webID, searching by telephone property for ${normalizedPhone}`);
99
- const telephoneAccounts = await this.accountShape.select((ua) => [
100
+ // Also query the telephone property even when the deterministic WebID
101
+ // exists. Legacy email accounts may own the same number; returning the
102
+ // WebID match early would hide that conflict and authenticate the
103
+ // duplicate account.
104
+ const telephoneAccounts = await this.accountShape
105
+ .select((ua) => [
100
106
  ua.email,
101
107
  ua.accountOf.select((p) => [
102
108
  p.givenName,
@@ -110,16 +116,16 @@ export default class CapacitorBackendProvider extends BackendProvider {
110
116
  .equals(normalizedPhone)
111
117
  .or(ua.accountOf.telephone.equals(legacyPhone));
112
118
  });
113
- const telephoneResolution = resolveTelephoneAccount(telephoneAccounts);
114
- if (telephoneResolution.kind === 'ambiguous') {
115
- throw new AmbiguousTelephoneIdentityError(telephoneResolution);
119
+ const resolution = resolveTelephoneAccount([
120
+ ...webIdAccounts,
121
+ ...telephoneAccounts,
122
+ ]);
123
+ if (resolution.kind === 'ambiguous') {
124
+ throw new AmbiguousTelephoneIdentityError(resolution);
116
125
  }
117
- account =
118
- telephoneResolution.kind === 'one'
119
- ? telephoneResolution.account
120
- : null;
126
+ const account = resolution.kind === 'one' ? resolution.account : null;
121
127
  if (account && account.accountOf) {
122
- console.log(`Found account by telephone property for phone number ${phoneIdentifier}`);
128
+ console.log(`Found one account across WhatsApp WebID and telephone lookups for phone number ${phoneIdentifier}`);
123
129
  return {
124
130
  account,
125
131
  person: account.accountOf,
@@ -185,56 +191,137 @@ export default class CapacitorBackendProvider extends BackendProvider {
185
191
  }
186
192
  }
187
193
  async generateOTPWhatsapp(phoneNumber) {
188
- var _a, _b;
189
194
  const session = this.request.session;
190
- const baseUrl = 'https://waba-v2.360dialog.io';
191
- const API_KEY = process.env.WA_D360_API_KEY;
192
195
  const recipient = normalizeTelephone(phoneNumber).replace(/^\+/, '');
193
196
  if (!/^\d{8,15}$/.test(recipient)) {
194
197
  throw new Error('A valid WhatsApp phone number is required');
195
198
  }
196
- if (!API_KEY) {
199
+ const apiKey = process.env.WA_D360_API_KEY;
200
+ if (!apiKey) {
197
201
  throw new Error('WA_D360_API_KEY is required to send a WhatsApp code');
198
202
  }
199
203
  const otp = this.generateOTP();
200
204
  // A resend invalidates an earlier code even when the provider rejects it.
201
- delete session.otp;
202
- const url = `${baseUrl}/messages`;
205
+ if (session) {
206
+ delete session.otp;
207
+ }
203
208
  try {
204
- const response = await this.sendMessage(url, API_KEY, otp, recipient);
209
+ const bearerToken = await this.getBearerToken();
210
+ const response = await this.sendMessage('https://waba-v2.360dialog.io/messages', bearerToken, apiKey, otp, recipient);
205
211
  if (!response.ok) {
206
212
  console.error('WhatsApp code request rejected by provider:', response.status);
207
213
  throw new Error('Could not send the code. Please try again.');
208
214
  }
209
- const data = await response.json();
210
- if (!((_b = (_a = data === null || data === void 0 ? void 0 : data.messages) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.id)) {
211
- throw new Error('WhatsApp provider did not confirm the code request');
215
+ }
216
+ catch (error) {
217
+ const message = error instanceof Error ? error.message : '';
218
+ if (message !== 'Could not send the code. Please try again.') {
219
+ console.error('WhatsApp code send failed:', message);
212
220
  }
213
- // Only make a code usable after the provider accepts the message.
221
+ throw new Error('Could not send the code. Please try again.');
222
+ }
223
+ // HTTP 2xx is acceptance. The provider can omit messages[0].id after the
224
+ // message is already delivered, so the code becomes usable here.
225
+ if (session) {
214
226
  session.otp = otp;
215
227
  return { sent: true };
216
228
  }
217
- catch (error) {
218
- console.error('WhatsApp code send failed:', error.message);
229
+ // iOS native calls can be cookie-less. Return an opaque proof that lets the
230
+ // server validate the entered code without storing the plaintext OTP in the
231
+ // client or relying on process-local memory (the app runs multiple workers).
232
+ return {
233
+ sent: true,
234
+ challenge: this.createOTPChallenge(`+${recipient}`, otp),
235
+ };
236
+ }
237
+ otpChallengeSecret() {
238
+ // Prefer the application's authentication secret. The WhatsApp API key is
239
+ // a fallback for installations that have not configured JWT auth yet.
240
+ const secret = process.env.JWT_SECRET || process.env.WA_D360_API_KEY;
241
+ if (!secret) {
242
+ throw new Error('An auth or WhatsApp secret is required to verify a WhatsApp code');
243
+ }
244
+ return secret;
245
+ }
246
+ createOTPChallenge(phoneNumber, otp) {
247
+ // The payload is readable but cannot be changed or matched to an OTP without
248
+ // the server secret: the HMAC covers both the payload and the six-digit code.
249
+ const payload = Buffer.from(JSON.stringify({
250
+ phoneNumber,
251
+ expiresAt: Date.now() + 10 * 60 * 1000,
252
+ nonce: crypto.randomBytes(16).toString('base64url'),
253
+ })).toString('base64url');
254
+ const signature = crypto
255
+ .createHmac('sha256', this.otpChallengeSecret())
256
+ .update(`${payload}.${otp}`)
257
+ .digest('base64url');
258
+ return `${payload}.${signature}`;
259
+ }
260
+ verifyOTPChallenge(phoneNumber, otp, challenge) {
261
+ if (!challenge)
262
+ return false;
263
+ const [payload, signature, extra] = challenge.split('.');
264
+ if (!payload || !signature || extra)
265
+ return false;
266
+ let claims;
267
+ try {
268
+ claims = JSON.parse(Buffer.from(payload, 'base64url').toString('utf8'));
269
+ }
270
+ catch (_a) {
271
+ return false;
272
+ }
273
+ if (claims.phoneNumber !== phoneNumber ||
274
+ typeof claims.expiresAt !== 'number' ||
275
+ claims.expiresAt < Date.now()) {
276
+ return false;
277
+ }
278
+ const expected = crypto
279
+ .createHmac('sha256', this.otpChallengeSecret())
280
+ .update(`${payload}.${otp}`)
281
+ .digest();
282
+ const received = Buffer.from(signature, 'base64url');
283
+ // Constant-time comparison avoids leaking how much of a signature matched.
284
+ return (received.length === expected.length &&
285
+ crypto.timingSafeEqual(received, expected));
286
+ }
287
+ async getBearerToken() {
288
+ const username = process.env.WA_D360_USERNAME;
289
+ const password = process.env.WA_D360_PASSWORD;
290
+ if (!username || !password) {
291
+ throw new Error('WA_D360_USERNAME and WA_D360_PASSWORD are required to request a WhatsApp token');
292
+ }
293
+ const response = await fetch('https://hub.360dialog.io/api/v2/token', {
294
+ method: 'POST',
295
+ headers: { 'Content-Type': 'application/json' },
296
+ body: JSON.stringify({ username, password }),
297
+ });
298
+ const data = await response.json().catch(() => ({}));
299
+ if (!response.ok || !(data === null || data === void 0 ? void 0 : data.access_token)) {
300
+ console.error('WhatsApp token request rejected:', response.status);
219
301
  throw new Error('Could not send the code. Please try again.');
220
302
  }
303
+ return data.access_token;
221
304
  }
222
305
  generateOTP() {
223
306
  return Math.floor(100000 + Math.random() * 900000);
224
307
  }
225
- async sendMessage(url, apiKey, otp, phoneNumber) {
308
+ async sendMessage(url, bearerToken, apiKey, otp, phoneNumber) {
309
+ const templateNamespace = process.env.WA_D360_TEMPLATE_NAMESPACE;
226
310
  const templateName = process.env.WA_D360_TEMPLATE_NAME;
227
- if (!templateName) {
228
- throw new Error('WA_D360_TEMPLATE_NAME is required to send a WhatsApp code');
311
+ if (!templateNamespace || !templateName) {
312
+ throw new Error('WA_D360_TEMPLATE_NAMESPACE and WA_D360_TEMPLATE_NAME are required to send a WhatsApp code');
229
313
  }
230
314
  const payload = {
231
315
  messaging_product: 'whatsapp',
232
316
  to: phoneNumber,
233
317
  type: 'template',
234
318
  template: {
319
+ namespace: templateNamespace,
235
320
  name: templateName,
236
321
  language: {
237
322
  code: process.env.WA_D360_TEMPLATE_LANGUAGE || 'en',
323
+ // Authentication templates are rejected without a deterministic policy.
324
+ policy: 'deterministic',
238
325
  },
239
326
  components: [
240
327
  {
@@ -264,6 +351,7 @@ export default class CapacitorBackendProvider extends BackendProvider {
264
351
  method: 'POST',
265
352
  headers: {
266
353
  'Content-Type': 'application/json',
354
+ Authorization: `bearer ${bearerToken}`,
267
355
  'D360-API-KEY': apiKey,
268
356
  },
269
357
  body: JSON.stringify(payload),
@@ -322,7 +410,7 @@ export default class CapacitorBackendProvider extends BackendProvider {
322
410
  __decorate([
323
411
  callable('public'),
324
412
  __metadata("design:type", Function),
325
- __metadata("design:paramtypes", [Object, Object]),
413
+ __metadata("design:paramtypes", [Object, Object, String]),
326
414
  __metadata("design:returntype", Promise)
327
415
  ], CapacitorBackendProvider.prototype, "validateOTPWhatsapp", null);
328
416
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"backend.js","sourceRoot":"","sources":["../../src/backend.ts"],"names":[],"mappings":"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","sourcesContent":["import { Person as SchemaPerson } from '@_linked/schema/shapes/Person';\nimport { BackendProvider } from '@_linked/server-utils/utils/BackendProvider';\nimport { callable } from '@_linked/server-utils/utils/callable';\nimport { LocationUpdateAction } from './shapes/LocationUpdateAction.js';\nimport { AdministrativeArea } from '@_linked/schema/shapes/AdministrativeArea';\nimport { Auth } from '@_linked/auth/utils/auth';\nimport {\n offAccountWillBeRemoved,\n onAccountWillBeRemoved,\n} from '@_linked/auth/utils/events';\nimport { UserAccount } from '@_linked/sioc/shapes/UserAccount';\nimport { AuthCredential } from '@_linked/auth/shapes/AuthCredential';\nimport { telephoneToWebID } from '@_linked/auth/utils/webID';\nimport type { UserAccountData, UserData } from '@_linked/auth/types/auth';\nimport { normalizeTelephone } from './utils/helper.js';\nimport {\n AMBIGUOUS_TELEPHONE_IDENTITY,\n AmbiguousTelephoneIdentityError,\n resolveTelephoneAccount,\n} from './utils/telephoneAccount.js';\n\nexport default class CapacitorBackendProvider extends BackendProvider {\n public accountShape: typeof UserAccount = UserAccount;\n public userShape: typeof SchemaPerson = SchemaPerson;\n private readonly onAccountRemoved = async (account: UserAccountData) => {\n const person = account.accountOf;\n\n if (person) {\n // The location action is optional. Delete by its relation so accounts\n // without location history do not pass `null` into an ID-based delete.\n await LocationUpdateAction.deleteWhere((action) =>\n action.agent.equals(person)\n );\n }\n };\n\n async setupBeforeControllers() {\n //if defined, take the values from the environment variables to define the shapes for the account and user\n await this.assignEnvPathToField('AUTH_ACCOUNT_TYPE', 'accountShape');\n await this.assignEnvPathToField('AUTH_USER_TYPE', 'userShape');\n\n onAccountWillBeRemoved(this.onAccountRemoved);\n }\n\n dispose() {\n offAccountWillBeRemoved(this.onAccountRemoved);\n }\n\n @callable('public')\n async validateOTPWhatsapp(phoneIdentifier, OPT_Input) {\n try {\n if (!phoneIdentifier) {\n console.log('No phone number provided');\n return { error: 'No phone number provided' };\n }\n\n const normalizedPhone = normalizeTelephone(phoneIdentifier);\n const legacyPhone = String(phoneIdentifier || '').trim();\n if (!normalizedPhone) {\n console.log('No valid phone number provided');\n return { error: 'No phone number provided' };\n }\n\n if (!OPT_Input) {\n console.log('No OTP code provided');\n return { error: 'No OTP code provided' };\n }\n\n if (this.request.session.otp.toString() !== OPT_Input) {\n console.log('OTP code is incorrect');\n return { error: 'OTP code is incorrect' };\n }\n\n return await Auth.login(\n this,\n async () => {\n const telephoneWebId = telephoneToWebID(normalizedPhone);\n\n // first, try to find account by telephone-based webID (for new users)\n // Query through the configured account shape. Applications can use a\n // UserAccount subclass with a different target class, so querying the\n // base SIOC shape would miss their existing accounts and create a\n // duplicate telephone-only identity.\n const webIdAccounts = await this.accountShape.select((ua) => [\n ua.email,\n ua.accountOf.select((p) => [\n p.givenName,\n p.familyName,\n p.telephone,\n ]),\n ])\n .where((ua) => {\n return ua.accountOf.equals({\n id: telephoneWebId,\n });\n });\n\n const webIdResolution = resolveTelephoneAccount(webIdAccounts);\n if (webIdResolution.kind === 'ambiguous') {\n throw new AmbiguousTelephoneIdentityError(webIdResolution);\n }\n let account =\n webIdResolution.kind === 'one' ? webIdResolution.account : null;\n\n if (account && account.accountOf) {\n console.log(\n `Found account by telephone-based webID for phone number ${phoneIdentifier}`\n );\n return {\n account,\n person: account.accountOf,\n };\n }\n\n // if not found, try to find by telephone property (for old users with normal ID)\n console.log(\n `Account not found by webID, searching by telephone property for ${normalizedPhone}`\n );\n const telephoneAccounts = await this.accountShape.select((ua) => [\n ua.email,\n ua.accountOf.select((p) => [\n p.givenName,\n p.familyName,\n p.telephone,\n ]),\n ])\n .where((ua) => {\n // Try normalized phone first, but also support legacy stored strings.\n return ua.accountOf.telephone\n .equals(normalizedPhone)\n .or(ua.accountOf.telephone.equals(legacyPhone));\n });\n\n const telephoneResolution = resolveTelephoneAccount(telephoneAccounts);\n if (telephoneResolution.kind === 'ambiguous') {\n throw new AmbiguousTelephoneIdentityError(telephoneResolution);\n }\n account =\n telephoneResolution.kind === 'one'\n ? telephoneResolution.account\n : null;\n\n if (account && account.accountOf) {\n console.log(\n `Found account by telephone property for phone number ${phoneIdentifier}`\n );\n return {\n account,\n person: account.accountOf,\n };\n }\n\n console.warn(\n `Could not find any account for phone number ${normalizedPhone} (tried webID: ${telephoneWebId} and telephone property)`\n );\n return null;\n },\n async () => {\n const telephoneWebId = telephoneToWebID(normalizedPhone);\n\n // create a new user by telephone webID\n const user = await (this.userShape as any).create({\n __id: telephoneWebId,\n givenName: '',\n familyName: '',\n telephone: normalizedPhone,\n });\n\n if (!user) {\n console.error(\n 'Error creating user by telephone webID: ' + telephoneWebId\n );\n return null;\n }\n\n // create a new credential for the user\n const newCredential = await AuthCredential.create({\n credentialOf: {\n id: user.id,\n },\n telephone: normalizedPhone,\n });\n\n if (!newCredential) {\n console.error(\n 'Error creating credential by telephone webID: ' + telephoneWebId\n );\n return null;\n }\n\n const account = await (this.accountShape as any).create({\n email: '',\n accountOf: user,\n });\n\n if (!account) {\n console.warn(\n 'Creating new account by telephone webID: ' +\n telephoneWebId +\n ' failed'\n );\n return null;\n }\n\n return {\n account: account,\n person: user,\n };\n },\n 'Whatsapp. Phonenumber: ' + phoneIdentifier\n );\n } catch (err) {\n if (err instanceof AmbiguousTelephoneIdentityError) {\n console.warn(\n 'WhatsApp sign-in refused because the telephone matches multiple identities',\n {\n accountCount: err.resolution.accountIds.length,\n personCount: err.resolution.personIds.length,\n }\n );\n return {\n error:\n 'Multiple accounts use this phone number. Please use another sign-in method or contact support.',\n code: AMBIGUOUS_TELEPHONE_IDENTITY,\n };\n }\n console.error('validateOTPWhatsapp failed:', err);\n return {\n error: 'Sign-in failed. Please try again.',\n };\n }\n }\n\n @callable('public')\n async generateOTPWhatsapp(phoneNumber) {\n const session = this.request.session;\n const baseUrl = 'https://waba-v2.360dialog.io';\n const API_KEY = process.env.WA_D360_API_KEY;\n const recipient = normalizeTelephone(phoneNumber).replace(/^\\+/, '');\n if (!/^\\d{8,15}$/.test(recipient)) {\n throw new Error('A valid WhatsApp phone number is required');\n }\n if (!API_KEY) {\n throw new Error('WA_D360_API_KEY is required to send a WhatsApp code');\n }\n\n const otp = this.generateOTP();\n // A resend invalidates an earlier code even when the provider rejects it.\n delete session.otp;\n const url = `${baseUrl}/messages`;\n\n try {\n const response = await this.sendMessage(url, API_KEY, otp, recipient);\n if (!response.ok) {\n console.error('WhatsApp code request rejected by provider:', response.status);\n throw new Error('Could not send the code. Please try again.');\n }\n const data = await response.json();\n if (!data?.messages?.[0]?.id) {\n throw new Error('WhatsApp provider did not confirm the code request');\n }\n // Only make a code usable after the provider accepts the message.\n session.otp = otp;\n return { sent: true };\n } catch (error) {\n console.error('WhatsApp code send failed:', error.message);\n throw new Error('Could not send the code. Please try again.');\n }\n }\n\n generateOTP() {\n return Math.floor(100000 + Math.random() * 900000);\n }\n\n async sendMessage(url, apiKey, otp, phoneNumber) {\n const templateName = process.env.WA_D360_TEMPLATE_NAME;\n if (!templateName) {\n throw new Error('WA_D360_TEMPLATE_NAME is required to send a WhatsApp code');\n }\n const payload = {\n messaging_product: 'whatsapp',\n to: phoneNumber,\n type: 'template',\n template: {\n name: templateName,\n language: {\n code: process.env.WA_D360_TEMPLATE_LANGUAGE || 'en',\n },\n components: [\n {\n type: 'body',\n parameters: [\n {\n type: 'text',\n text: otp,\n },\n ],\n },\n {\n type: 'button',\n sub_type: 'url',\n index: 0,\n parameters: [\n {\n type: 'text',\n text: otp.toString(),\n },\n ],\n },\n ],\n },\n };\n const response = await fetch(url, {\n method: 'POST',\n headers: {\n 'Content-Type': 'application/json',\n 'D360-API-KEY': apiKey,\n },\n body: JSON.stringify(payload),\n });\n\n return response;\n }\n\n async getUserLocationAction(user: UserData) {\n const locationAction = await LocationUpdateAction.select((la) => {\n return [la.agent];\n })\n .where((la) => {\n return la.agent.equals({\n id: user.id,\n });\n })\n .one();\n\n return locationAction;\n }\n\n async updateUserLocation(latitude: number, longitude: number) {\n const auth = this.request.linkedAuth;\n if (!auth || !auth.userAccount) {\n console.warn('No user authenticated.');\n return Auth.enforceSignedIn();\n }\n const user = auth.user;\n\n // find existing instance for the login person\n const locationAction = await this.getUserLocationAction(user);\n\n // if not found, create one and set person property and location, then .save()\n if (!locationAction) {\n const newPlace = await AdministrativeArea.create({\n latitude: latitude.toString(),\n longitude: longitude.toString(),\n });\n\n const newLocationAction = await LocationUpdateAction.create({\n location: {\n id: newPlace.id,\n },\n agent: {\n id: user.id,\n },\n });\n return newLocationAction;\n } else {\n // if existing one found, update location\n const existingLocationAction = await (LocationUpdateAction as any).update(\n locationAction,\n {\n location: {\n latitude: latitude.toString(),\n longitude: longitude.toString(),\n },\n }\n );\n return existingLocationAction;\n }\n }\n}\n"]}
1
+ {"version":3,"file":"backend.js","sourceRoot":"","sources":["../../src/backend.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAChD,OAAO,EACL,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EACL,4BAA4B,EAC5B,+BAA+B,EAC/B,uBAAuB,GACxB,MAAM,6BAA6B,CAAC;AAErC,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,eAAe;IAArE;;QACS,iBAAY,GAAuB,WAAW,CAAC;QAC/C,cAAS,GAAwB,YAAY,CAAC;QACpC,qBAAgB,GAAG,KAAK,EAAE,OAAwB,EAAE,EAAE;YACrE,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;YAEjC,IAAI,MAAM,EAAE,CAAC;gBACX,sEAAsE;gBACtE,uEAAuE;gBACvE,MAAM,oBAAoB,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE,EAAE,CAChD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAC5B,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;IA8cJ,CAAC;IA5cC,KAAK,CAAC,sBAAsB;QAC1B,0GAA0G;QAC1G,MAAM,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;QAE/D,sBAAsB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC;IAED,OAAO;QACL,uBAAuB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACjD,CAAC;IAGK,AAAN,KAAK,CAAC,mBAAmB,CAAC,eAAe,EAAE,SAAS,EAAE,YAAqB;;QACzE,IAAI,CAAC;YACH,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;gBACxC,OAAO,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC;YAC/C,CAAC;YAED,MAAM,eAAe,GAAG,kBAAkB,CAAC,eAAe,CAAC,CAAC;YAC5D,MAAM,WAAW,GAAG,MAAM,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YACzD,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;gBAC9C,OAAO,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC;YAC/C,CAAC;YAED,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;gBACpC,OAAO,EAAE,KAAK,EAAE,sBAAsB,EAAE,CAAC;YAC3C,CAAC;YAED,yEAAyE;YACzE,2EAA2E;YAC3E,uEAAuE;YACvE,MAAM,UAAU,GAAG,MAAA,IAAI,CAAC,OAAO,CAAC,OAAO,0CAAE,GAAG,CAAC;YAC7C,MAAM,UAAU,GACd,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,IAAI;gBAC7C,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,SAAS;gBACrC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CACrB,eAAe,EACf,MAAM,CAAC,SAAS,CAAC,EACjB,YAAY,CACb,CAAC;YAER,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;gBACrC,OAAO,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC;YAC5C,CAAC;YACD,qEAAqE;YACrE,2DAA2D;YAC3D,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;gBACpD,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;YAClC,CAAC;YAED,OAAO,MAAM,IAAI,CAAC,KAAK,CACrB,IAAI,EACJ,KAAK,IAAI,EAAE;gBACT,MAAM,cAAc,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;gBAEzD,sEAAsE;gBACtE,qEAAqE;gBACrE,sEAAsE;gBACtE,kEAAkE;gBAClE,qCAAqC;gBACrC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY;qBAC1C,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC;oBACd,EAAE,CAAC,KAAK;oBACR,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;wBACzB,CAAC,CAAC,SAAS;wBACX,CAAC,CAAC,UAAU;wBACZ,CAAC,CAAC,SAAS;qBACZ,CAAC;iBACH,CAAC;qBACD,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;oBACZ,OAAO,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC;wBACzB,EAAE,EAAE,cAAc;qBACnB,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBAEL,sEAAsE;gBACtE,uEAAuE;gBACvE,kEAAkE;gBAClE,qBAAqB;gBACrB,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,YAAY;qBAC9C,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC;oBACd,EAAE,CAAC,KAAK;oBACR,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;wBACzB,CAAC,CAAC,SAAS;wBACX,CAAC,CAAC,UAAU;wBACZ,CAAC,CAAC,SAAS;qBACZ,CAAC;iBACH,CAAC;qBACD,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;oBACZ,sEAAsE;oBACtE,OAAO,EAAE,CAAC,SAAS,CAAC,SAAS;yBAC1B,MAAM,CAAC,eAAe,CAAC;yBACvB,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;gBACpD,CAAC,CAAC,CAAC;gBAEL,MAAM,UAAU,GAAG,uBAAuB,CAAC;oBACzC,GAAG,aAAa;oBAChB,GAAG,iBAAiB;iBACrB,CAAC,CAAC;gBACH,IAAI,UAAU,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBACpC,MAAM,IAAI,+BAA+B,CAAC,UAAU,CAAC,CAAC;gBACxD,CAAC;gBACD,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;gBAEtE,IAAI,OAAO,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;oBACjC,OAAO,CAAC,GAAG,CACT,kFAAkF,eAAe,EAAE,CACpG,CAAC;oBACF,OAAO;wBACL,OAAO;wBACP,MAAM,EAAE,OAAO,CAAC,SAAS;qBAC1B,CAAC;gBACJ,CAAC;gBAED,OAAO,CAAC,IAAI,CACV,+CAA+C,eAAe,kBAAkB,cAAc,0BAA0B,CACzH,CAAC;gBACF,OAAO,IAAI,CAAC;YACd,CAAC,EACD,KAAK,IAAI,EAAE;gBACT,MAAM,cAAc,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;gBAEzD,uCAAuC;gBACvC,MAAM,IAAI,GAAG,MAAO,IAAI,CAAC,SAAiB,CAAC,MAAM,CAAC;oBAChD,IAAI,EAAE,cAAc;oBACpB,SAAS,EAAE,EAAE;oBACb,UAAU,EAAE,EAAE;oBACd,SAAS,EAAE,eAAe;iBAC3B,CAAC,CAAC;gBAEH,IAAI,CAAC,IAAI,EAAE,CAAC;oBACV,OAAO,CAAC,KAAK,CACX,0CAA0C,GAAG,cAAc,CAC5D,CAAC;oBACF,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,uCAAuC;gBACvC,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC;oBAChD,YAAY,EAAE;wBACZ,EAAE,EAAE,IAAI,CAAC,EAAE;qBACZ;oBACD,SAAS,EAAE,eAAe;iBAC3B,CAAC,CAAC;gBAEH,IAAI,CAAC,aAAa,EAAE,CAAC;oBACnB,OAAO,CAAC,KAAK,CACX,gDAAgD,GAAG,cAAc,CAClE,CAAC;oBACF,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,MAAM,OAAO,GAAG,MAAO,IAAI,CAAC,YAAoB,CAAC,MAAM,CAAC;oBACtD,KAAK,EAAE,EAAE;oBACT,SAAS,EAAE,IAAI;iBAChB,CAAC,CAAC;gBAEH,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,OAAO,CAAC,IAAI,CACV,2CAA2C;wBACzC,cAAc;wBACd,SAAS,CACZ,CAAC;oBACF,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,OAAO;oBACL,OAAO,EAAE,OAAO;oBAChB,MAAM,EAAE,IAAI;iBACb,CAAC;YACJ,CAAC,EACD,yBAAyB,GAAG,eAAe,CAC5C,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,+BAA+B,EAAE,CAAC;gBACnD,OAAO,CAAC,IAAI,CACV,4EAA4E,EAC5E;oBACE,YAAY,EAAE,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM;oBAC9C,WAAW,EAAE,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM;iBAC7C,CACF,CAAC;gBACF,OAAO;oBACL,KAAK,EACH,gGAAgG;oBAClG,IAAI,EAAE,4BAA4B;iBACnC,CAAC;YACJ,CAAC;YACD,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;YAClD,OAAO;gBACL,KAAK,EAAE,mCAAmC;aAC3C,CAAC;QACJ,CAAC;IACH,CAAC;IAGK,AAAN,KAAK,CAAC,mBAAmB,CAAC,WAAW;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QAErC,MAAM,SAAS,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC/D,CAAC;QACD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;QACzE,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC/B,0EAA0E;QAC1E,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,OAAO,CAAC,GAAG,CAAC;QACrB,CAAC;QAED,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YAChD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CACrC,uCAAuC,EACvC,WAAW,EACX,MAAM,EACN,GAAG,EACH,SAAS,CACV,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,OAAO,CAAC,KAAK,CACX,6CAA6C,EAC7C,QAAQ,CAAC,MAAM,CAChB,CAAC;gBACF,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,IAAI,OAAO,KAAK,4CAA4C,EAAE,CAAC;gBAC7D,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,OAAO,CAAC,CAAC;YACvD,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,CAAC;QAED,yEAAyE;QACzE,iEAAiE;QACjE,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,GAAG,GAAG,GAAG,CAAC;YAClB,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QACxB,CAAC;QAED,4EAA4E;QAC5E,4EAA4E;QAC5E,6EAA6E;QAC7E,OAAO;YACL,IAAI,EAAE,IAAI;YACV,SAAS,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,SAAS,EAAE,EAAE,GAAG,CAAC;SACzD,CAAC;IACJ,CAAC;IAEO,kBAAkB;QACxB,0EAA0E;QAC1E,sEAAsE;QACtE,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QACrE,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,kBAAkB,CAAC,WAAmB,EAAE,GAAW;QACzD,6EAA6E;QAC7E,8EAA8E;QAC9E,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CACzB,IAAI,CAAC,SAAS,CAAC;YACb,WAAW;YACX,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;YACtC,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC;SACpD,CAAC,CACH,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACxB,MAAM,SAAS,GAAG,MAAM;aACrB,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC;aAC/C,MAAM,CAAC,GAAG,OAAO,IAAI,GAAG,EAAE,CAAC;aAC3B,MAAM,CAAC,WAAW,CAAC,CAAC;QACvB,OAAO,GAAG,OAAO,IAAI,SAAS,EAAE,CAAC;IACnC,CAAC;IAEO,kBAAkB,CACxB,WAAmB,EACnB,GAAW,EACX,SAAkB;QAElB,IAAI,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QAC7B,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzD,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;QAElD,IAAI,MAAsD,CAAC;QAC3D,IAAI,CAAC;YACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1E,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IACE,MAAM,CAAC,WAAW,KAAK,WAAW;YAClC,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ;YACpC,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,EAC7B,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM;aACpB,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC;aAC/C,MAAM,CAAC,GAAG,OAAO,IAAI,GAAG,EAAE,CAAC;aAC3B,MAAM,EAAE,CAAC;QACZ,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QACrD,2EAA2E;QAC3E,OAAO,CACL,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM;YACnC,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAC3C,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;QAC9C,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;QAC9C,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CACb,gFAAgF,CACjF,CAAC;QACJ,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,uCAAuC,EAAE;YACpE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;SAC7C,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY,CAAA,EAAE,CAAC;YACxC,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;YACnE,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW;QAC1D,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC;QACjE,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;QACvD,IAAI,CAAC,iBAAiB,IAAI,CAAC,YAAY,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CACb,2FAA2F,CAC5F,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG;YACd,iBAAiB,EAAE,UAAU;YAC7B,EAAE,EAAE,WAAW;YACf,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE;gBACR,SAAS,EAAE,iBAAiB;gBAC5B,IAAI,EAAE,YAAY;gBAClB,QAAQ,EAAE;oBACR,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,IAAI;oBACnD,wEAAwE;oBACxE,MAAM,EAAE,eAAe;iBACxB;gBACD,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,MAAM;wBACZ,UAAU,EAAE;4BACV;gCACE,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,GAAG;6BACV;yBACF;qBACF;oBACD;wBACE,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,KAAK;wBACf,KAAK,EAAE,CAAC;wBACR,UAAU,EAAE;4BACV;gCACE,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE;6BACrB;yBACF;qBACF;iBACF;aACF;SACF,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAChC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,WAAW,EAAE;gBACtC,cAAc,EAAE,MAAM;aACvB;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;SAC9B,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,IAAc;QACxC,MAAM,cAAc,GAAG,MAAM,oBAAoB,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;YAC9D,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC,CAAC;aACC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YACZ,OAAO,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC;gBACrB,EAAE,EAAE,IAAI,CAAC,EAAE;aACZ,CAAC,CAAC;QACL,CAAC,CAAC;aACD,GAAG,EAAE,CAAC;QAET,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,QAAgB,EAAE,SAAiB;QAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;QACrC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAC/B,OAAO,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YACvC,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC;QAChC,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAEvB,8CAA8C;QAC9C,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAE9D,8EAA8E;QAC9E,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC;gBAC/C,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;gBAC7B,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE;aAChC,CAAC,CAAC;YAEH,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,CAAC,MAAM,CAAC;gBAC1D,QAAQ,EAAE;oBACR,EAAE,EAAE,QAAQ,CAAC,EAAE;iBAChB;gBACD,KAAK,EAAE;oBACL,EAAE,EAAE,IAAI,CAAC,EAAE;iBACZ;aACF,CAAC,CAAC;YACH,OAAO,iBAAiB,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,yCAAyC;YACzC,MAAM,sBAAsB,GAAG,MAAO,oBAA4B,CAAC,MAAM,CACvE,cAAc,EACd;gBACE,QAAQ,EAAE;oBACR,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE;oBAC7B,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE;iBAChC;aACF,CACF,CAAC;YACF,OAAO,sBAAsB,CAAC;QAChC,CAAC;IACH,CAAC;CACF;AA/bO;IADL,QAAQ,CAAC,QAAQ,CAAC;;;;mEA0LlB;AAGK;IADL,QAAQ,CAAC,QAAQ,CAAC;;;;mEAyDlB","sourcesContent":["import { Person as SchemaPerson } from '@_linked/schema/shapes/Person';\nimport { BackendProvider } from '@_linked/server-utils/utils/BackendProvider';\nimport { callable } from '@_linked/server-utils/utils/callable';\nimport { LocationUpdateAction } from './shapes/LocationUpdateAction.js';\nimport { AdministrativeArea } from '@_linked/schema/shapes/AdministrativeArea';\nimport { Auth } from '@_linked/auth/utils/auth';\nimport {\n offAccountWillBeRemoved,\n onAccountWillBeRemoved,\n} from '@_linked/auth/utils/events';\nimport { UserAccount } from '@_linked/sioc/shapes/UserAccount';\nimport { AuthCredential } from '@_linked/auth/shapes/AuthCredential';\nimport { telephoneToWebID } from '@_linked/auth/utils/webID';\nimport type { UserAccountData, UserData } from '@_linked/auth/types/auth';\nimport { normalizeTelephone } from './utils/helper.js';\nimport crypto from 'crypto';\nimport {\n AMBIGUOUS_TELEPHONE_IDENTITY,\n AmbiguousTelephoneIdentityError,\n resolveTelephoneAccount,\n} from './utils/telephoneAccount.js';\n\nexport default class CapacitorBackendProvider extends BackendProvider {\n public accountShape: typeof UserAccount = UserAccount;\n public userShape: typeof SchemaPerson = SchemaPerson;\n private readonly onAccountRemoved = async (account: UserAccountData) => {\n const person = account.accountOf;\n\n if (person) {\n // The location action is optional. Delete by its relation so accounts\n // without location history do not pass `null` into an ID-based delete.\n await LocationUpdateAction.deleteWhere((action) =>\n action.agent.equals(person)\n );\n }\n };\n\n async setupBeforeControllers() {\n //if defined, take the values from the environment variables to define the shapes for the account and user\n await this.assignEnvPathToField('AUTH_ACCOUNT_TYPE', 'accountShape');\n await this.assignEnvPathToField('AUTH_USER_TYPE', 'userShape');\n\n onAccountWillBeRemoved(this.onAccountRemoved);\n }\n\n dispose() {\n offAccountWillBeRemoved(this.onAccountRemoved);\n }\n\n @callable('public')\n async validateOTPWhatsapp(phoneIdentifier, OPT_Input, otpChallenge?: string) {\n try {\n if (!phoneIdentifier) {\n console.log('No phone number provided');\n return { error: 'No phone number provided' };\n }\n\n const normalizedPhone = normalizeTelephone(phoneIdentifier);\n const legacyPhone = String(phoneIdentifier || '').trim();\n if (!normalizedPhone) {\n console.log('No valid phone number provided');\n return { error: 'No phone number provided' };\n }\n\n if (!OPT_Input) {\n console.log('No OTP code provided');\n return { error: 'No OTP code provided' };\n }\n\n // Browser requests normally verify against the OTP kept in their Express\n // session. Native WebViews may not carry that cross-origin session cookie,\n // so they verify the signed challenge returned by generateOTPWhatsapp.\n const sessionOtp = this.request.session?.otp;\n const otpIsValid =\n sessionOtp !== undefined && sessionOtp !== null\n ? sessionOtp.toString() === OPT_Input\n : this.verifyOTPChallenge(\n normalizedPhone,\n String(OPT_Input),\n otpChallenge\n );\n\n if (!otpIsValid) {\n console.log('OTP code is incorrect');\n return { error: 'OTP code is incorrect' };\n }\n // Preserve the old retry behavior for a mistyped code, but consume a\n // successful session-backed code so it cannot be replayed.\n if (sessionOtp !== undefined && sessionOtp !== null) {\n delete this.request.session.otp;\n }\n\n return await Auth.login(\n this,\n async () => {\n const telephoneWebId = telephoneToWebID(normalizedPhone);\n\n // first, try to find account by telephone-based webID (for new users)\n // Query through the configured account shape. Applications can use a\n // UserAccount subclass with a different target class, so querying the\n // base SIOC shape would miss their existing accounts and create a\n // duplicate telephone-only identity.\n const webIdAccounts = await this.accountShape\n .select((ua) => [\n ua.email,\n ua.accountOf.select((p) => [\n p.givenName,\n p.familyName,\n p.telephone,\n ]),\n ])\n .where((ua) => {\n return ua.accountOf.equals({\n id: telephoneWebId,\n });\n });\n\n // Also query the telephone property even when the deterministic WebID\n // exists. Legacy email accounts may own the same number; returning the\n // WebID match early would hide that conflict and authenticate the\n // duplicate account.\n const telephoneAccounts = await this.accountShape\n .select((ua) => [\n ua.email,\n ua.accountOf.select((p) => [\n p.givenName,\n p.familyName,\n p.telephone,\n ]),\n ])\n .where((ua) => {\n // Try normalized phone first, but also support legacy stored strings.\n return ua.accountOf.telephone\n .equals(normalizedPhone)\n .or(ua.accountOf.telephone.equals(legacyPhone));\n });\n\n const resolution = resolveTelephoneAccount([\n ...webIdAccounts,\n ...telephoneAccounts,\n ]);\n if (resolution.kind === 'ambiguous') {\n throw new AmbiguousTelephoneIdentityError(resolution);\n }\n const account = resolution.kind === 'one' ? resolution.account : null;\n\n if (account && account.accountOf) {\n console.log(\n `Found one account across WhatsApp WebID and telephone lookups for phone number ${phoneIdentifier}`\n );\n return {\n account,\n person: account.accountOf,\n };\n }\n\n console.warn(\n `Could not find any account for phone number ${normalizedPhone} (tried webID: ${telephoneWebId} and telephone property)`\n );\n return null;\n },\n async () => {\n const telephoneWebId = telephoneToWebID(normalizedPhone);\n\n // create a new user by telephone webID\n const user = await (this.userShape as any).create({\n __id: telephoneWebId,\n givenName: '',\n familyName: '',\n telephone: normalizedPhone,\n });\n\n if (!user) {\n console.error(\n 'Error creating user by telephone webID: ' + telephoneWebId\n );\n return null;\n }\n\n // create a new credential for the user\n const newCredential = await AuthCredential.create({\n credentialOf: {\n id: user.id,\n },\n telephone: normalizedPhone,\n });\n\n if (!newCredential) {\n console.error(\n 'Error creating credential by telephone webID: ' + telephoneWebId\n );\n return null;\n }\n\n const account = await (this.accountShape as any).create({\n email: '',\n accountOf: user,\n });\n\n if (!account) {\n console.warn(\n 'Creating new account by telephone webID: ' +\n telephoneWebId +\n ' failed'\n );\n return null;\n }\n\n return {\n account: account,\n person: user,\n };\n },\n 'Whatsapp. Phonenumber: ' + phoneIdentifier\n );\n } catch (err) {\n if (err instanceof AmbiguousTelephoneIdentityError) {\n console.warn(\n 'WhatsApp sign-in refused because the telephone matches multiple identities',\n {\n accountCount: err.resolution.accountIds.length,\n personCount: err.resolution.personIds.length,\n }\n );\n return {\n error:\n 'Multiple accounts use this phone number. Please use another sign-in method or contact support.',\n code: AMBIGUOUS_TELEPHONE_IDENTITY,\n };\n }\n console.error('validateOTPWhatsapp failed:', err);\n return {\n error: 'Sign-in failed. Please try again.',\n };\n }\n }\n\n @callable('public')\n async generateOTPWhatsapp(phoneNumber) {\n const session = this.request.session;\n\n const recipient = normalizeTelephone(phoneNumber).replace(/^\\+/, '');\n if (!/^\\d{8,15}$/.test(recipient)) {\n throw new Error('A valid WhatsApp phone number is required');\n }\n const apiKey = process.env.WA_D360_API_KEY;\n if (!apiKey) {\n throw new Error('WA_D360_API_KEY is required to send a WhatsApp code');\n }\n\n const otp = this.generateOTP();\n // A resend invalidates an earlier code even when the provider rejects it.\n if (session) {\n delete session.otp;\n }\n\n try {\n const bearerToken = await this.getBearerToken();\n const response = await this.sendMessage(\n 'https://waba-v2.360dialog.io/messages',\n bearerToken,\n apiKey,\n otp,\n recipient\n );\n if (!response.ok) {\n console.error(\n 'WhatsApp code request rejected by provider:',\n response.status\n );\n throw new Error('Could not send the code. Please try again.');\n }\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n if (message !== 'Could not send the code. Please try again.') {\n console.error('WhatsApp code send failed:', message);\n }\n throw new Error('Could not send the code. Please try again.');\n }\n\n // HTTP 2xx is acceptance. The provider can omit messages[0].id after the\n // message is already delivered, so the code becomes usable here.\n if (session) {\n session.otp = otp;\n return { sent: true };\n }\n\n // iOS native calls can be cookie-less. Return an opaque proof that lets the\n // server validate the entered code without storing the plaintext OTP in the\n // client or relying on process-local memory (the app runs multiple workers).\n return {\n sent: true,\n challenge: this.createOTPChallenge(`+${recipient}`, otp),\n };\n }\n\n private otpChallengeSecret(): string {\n // Prefer the application's authentication secret. The WhatsApp API key is\n // a fallback for installations that have not configured JWT auth yet.\n const secret = process.env.JWT_SECRET || process.env.WA_D360_API_KEY;\n if (!secret) {\n throw new Error(\n 'An auth or WhatsApp secret is required to verify a WhatsApp code'\n );\n }\n return secret;\n }\n\n private createOTPChallenge(phoneNumber: string, otp: number): string {\n // The payload is readable but cannot be changed or matched to an OTP without\n // the server secret: the HMAC covers both the payload and the six-digit code.\n const payload = Buffer.from(\n JSON.stringify({\n phoneNumber,\n expiresAt: Date.now() + 10 * 60 * 1000,\n nonce: crypto.randomBytes(16).toString('base64url'),\n })\n ).toString('base64url');\n const signature = crypto\n .createHmac('sha256', this.otpChallengeSecret())\n .update(`${payload}.${otp}`)\n .digest('base64url');\n return `${payload}.${signature}`;\n }\n\n private verifyOTPChallenge(\n phoneNumber: string,\n otp: string,\n challenge?: string\n ): boolean {\n if (!challenge) return false;\n const [payload, signature, extra] = challenge.split('.');\n if (!payload || !signature || extra) return false;\n\n let claims: { phoneNumber?: unknown; expiresAt?: unknown };\n try {\n claims = JSON.parse(Buffer.from(payload, 'base64url').toString('utf8'));\n } catch {\n return false;\n }\n if (\n claims.phoneNumber !== phoneNumber ||\n typeof claims.expiresAt !== 'number' ||\n claims.expiresAt < Date.now()\n ) {\n return false;\n }\n\n const expected = crypto\n .createHmac('sha256', this.otpChallengeSecret())\n .update(`${payload}.${otp}`)\n .digest();\n const received = Buffer.from(signature, 'base64url');\n // Constant-time comparison avoids leaking how much of a signature matched.\n return (\n received.length === expected.length &&\n crypto.timingSafeEqual(received, expected)\n );\n }\n\n async getBearerToken() {\n const username = process.env.WA_D360_USERNAME;\n const password = process.env.WA_D360_PASSWORD;\n if (!username || !password) {\n throw new Error(\n 'WA_D360_USERNAME and WA_D360_PASSWORD are required to request a WhatsApp token'\n );\n }\n const response = await fetch('https://hub.360dialog.io/api/v2/token', {\n method: 'POST',\n headers: { 'Content-Type': 'application/json' },\n body: JSON.stringify({ username, password }),\n });\n const data = await response.json().catch(() => ({}));\n if (!response.ok || !data?.access_token) {\n console.error('WhatsApp token request rejected:', response.status);\n throw new Error('Could not send the code. Please try again.');\n }\n return data.access_token;\n }\n\n generateOTP() {\n return Math.floor(100000 + Math.random() * 900000);\n }\n\n async sendMessage(url, bearerToken, apiKey, otp, phoneNumber) {\n const templateNamespace = process.env.WA_D360_TEMPLATE_NAMESPACE;\n const templateName = process.env.WA_D360_TEMPLATE_NAME;\n if (!templateNamespace || !templateName) {\n throw new Error(\n 'WA_D360_TEMPLATE_NAMESPACE and WA_D360_TEMPLATE_NAME are required to send a WhatsApp code'\n );\n }\n const payload = {\n messaging_product: 'whatsapp',\n to: phoneNumber,\n type: 'template',\n template: {\n namespace: templateNamespace,\n name: templateName,\n language: {\n code: process.env.WA_D360_TEMPLATE_LANGUAGE || 'en',\n // Authentication templates are rejected without a deterministic policy.\n policy: 'deterministic',\n },\n components: [\n {\n type: 'body',\n parameters: [\n {\n type: 'text',\n text: otp,\n },\n ],\n },\n {\n type: 'button',\n sub_type: 'url',\n index: 0,\n parameters: [\n {\n type: 'text',\n text: otp.toString(),\n },\n ],\n },\n ],\n },\n };\n const response = await fetch(url, {\n method: 'POST',\n headers: {\n 'Content-Type': 'application/json',\n Authorization: `bearer ${bearerToken}`,\n 'D360-API-KEY': apiKey,\n },\n body: JSON.stringify(payload),\n });\n\n return response;\n }\n\n async getUserLocationAction(user: UserData) {\n const locationAction = await LocationUpdateAction.select((la) => {\n return [la.agent];\n })\n .where((la) => {\n return la.agent.equals({\n id: user.id,\n });\n })\n .one();\n\n return locationAction;\n }\n\n async updateUserLocation(latitude: number, longitude: number) {\n const auth = this.request.linkedAuth;\n if (!auth || !auth.userAccount) {\n console.warn('No user authenticated.');\n return Auth.enforceSignedIn();\n }\n const user = auth.user;\n\n // find existing instance for the login person\n const locationAction = await this.getUserLocationAction(user);\n\n // if not found, create one and set person property and location, then .save()\n if (!locationAction) {\n const newPlace = await AdministrativeArea.create({\n latitude: latitude.toString(),\n longitude: longitude.toString(),\n });\n\n const newLocationAction = await LocationUpdateAction.create({\n location: {\n id: newPlace.id,\n },\n agent: {\n id: user.id,\n },\n });\n return newLocationAction;\n } else {\n // if existing one found, update location\n const existingLocationAction = await (LocationUpdateAction as any).update(\n locationAction,\n {\n location: {\n latitude: latitude.toString(),\n longitude: longitude.toString(),\n },\n }\n );\n return existingLocationAction;\n }\n }\n}\n"]}
@@ -28,6 +28,9 @@ export const SigninWithWhatsappButton = ({ label = 'Sign in with Whatsapp', clas
28
28
  const [isLoading, setLoading] = React.useState(false);
29
29
  const [showPhoneError, setShowPhoneError] = React.useState(false);
30
30
  const [sendError, setSendError] = React.useState(false);
31
+ // Present only when the backend could not use a cookie-backed session (for
32
+ // example, an iOS WebView calling the staging origin).
33
+ const [otpChallenge, setOTPChallenge] = React.useState();
31
34
  const isValid = isPhoneValid(phoneNumber);
32
35
  const auth = useAuth();
33
36
  const { t } = useTranslate();
@@ -36,7 +39,7 @@ export const SigninWithWhatsappButton = ({ label = 'Sign in with Whatsapp', clas
36
39
  const validateOTP = (phone, otp) => {
37
40
  if (!phone || !otp)
38
41
  return;
39
- Server.call(packageName, 'validateOTPWhatsapp', phone, otp).then((response) => {
42
+ Server.call(packageName, 'validateOTPWhatsapp', phone, otp, otpChallenge).then((response) => {
40
43
  if (response && response.auth) {
41
44
  // A browser gets the tokens as httpOnly cookies the server already set; only a
42
45
  // native client (body transport) receives refreshToken. The expiry fields size the
@@ -72,6 +75,9 @@ export const SigninWithWhatsappButton = ({ label = 'Sign in with Whatsapp', clas
72
75
  setSendError(true);
73
76
  return;
74
77
  }
78
+ // Echo this opaque value with the entered code. It contains no plaintext
79
+ // OTP and the server rejects modification, expiry, or another phone.
80
+ setOTPChallenge(response.challenge);
75
81
  setOTPField(true);
76
82
  })
77
83
  .catch(() => {
@@ -1 +1 @@
1
- {"version":3,"file":"SignInWithWhatsapp.js","sourceRoot":"","sources":["../../../src/components/SignInWithWhatsapp.tsx"],"names":[],"mappings":"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","sourcesContent":["import React from 'react';\nimport style from './SignInWithWhatsapp.module.css';\nimport { Button } from '@_linked/primitives/components/Button';\nimport { cl } from '@_linked/react/utils/ClassNames';\nimport { packageName } from '../package.js';\nimport { Server } from '@_linked/server-utils/utils/Server';\nimport {\n InputOTP,\n InputOTPGroup,\n InputOTPSlot,\n REGEXP_ONLY_DIGITS,\n} from '@_linked/primitives/components/InputOTP';\nimport { PhoneInput } from 'react-international-phone';\nimport 'react-international-phone/style.css';\nimport libphone from 'google-libphonenumber';\nimport { useAuth } from '@_linked/auth/hooks/useAuth';\nimport { asset } from '@_linked/core/utils/LinkedFileStorage';\nimport { useTranslate } from '@tolgee/react';\n\nconst PhoneNumberUtil = libphone.PhoneNumberUtil;\n\ninterface SigninWithWhatsappButton\n extends Omit<React.ComponentProps<typeof Button>, 'onClick' | 'children'> {\n label?: string;\n onSuccess: (data: boolean) => void;\n}\n\nexport const SigninWithWhatsappButton = ({\n label = 'Sign in with Whatsapp',\n className,\n onSuccess,\n ...buttonProps\n}: SigninWithWhatsappButton) => {\n const phoneUtil = PhoneNumberUtil.getInstance();\n const isPhoneValid = (phoneNumber: string) => {\n try {\n return phoneUtil.isValidNumber(\n phoneUtil.parseAndKeepRawInput(phoneNumber)\n );\n } catch {\n return false;\n }\n };\n const [otpField, setOTPField] = React.useState(false);\n const [phoneNumber, setPhoneNumber] = React.useState('');\n const [phoneNumberField, setPhoneNumberField] = React.useState(false);\n const [isLoading, setLoading] = React.useState(false);\n const [showPhoneError, setShowPhoneError] = React.useState(false);\n const [sendError, setSendError] = React.useState(false);\n const isValid = isPhoneValid(phoneNumber);\n\n const auth = useAuth();\n const { t } = useTranslate();\n const prefix = 'signIn';\n const otpLabel = t(\n prefix + '.whatsappVerificationCode',\n 'WhatsApp verification code'\n );\n\n const validateOTP = (phone: string, otp: string) => {\n if (!phone || !otp) return;\n Server.call(packageName, 'validateOTPWhatsapp', phone, otp).then(\n (response) => {\n if (response && response.auth) {\n // A browser gets the tokens as httpOnly cookies the server already set; only a\n // native client (body transport) receives refreshToken. The expiry fields size the\n // refresh token in native storage to the server's record.\n auth.updateAuth({\n auth: response.auth,\n accessToken: response.accessToken,\n refreshToken: response.refreshToken,\n refreshTokenExpiresIn: response.refreshTokenExpiresIn,\n refreshTokenExpiresAt: response.refreshTokenExpiresAt,\n });\n onSuccess(true);\n } else if (response?.error) {\n alert(response.error);\n } else {\n onSuccess(false);\n }\n }\n );\n };\n\n const sendWhatsappMessage = (phone: string) => {\n if (!isValid) {\n setShowPhoneError(true);\n return;\n }\n setShowPhoneError(false);\n setSendError(false);\n setLoading(true);\n Server.call(packageName, 'generateOTPWhatsapp', phone)\n .then((response) => {\n if (!response?.sent) {\n setSendError(true);\n return;\n }\n setOTPField(true);\n })\n .catch(() => {\n setSendError(true);\n })\n .finally(() => {\n setLoading(false);\n });\n };\n\n return (\n <>\n {!otpField && !phoneNumberField ? (\n <Button\n type=\"button\"\n className={cl(style.root, className)}\n onClick={() => setPhoneNumberField(true)}\n variant=\"outline\"\n {...buttonProps}\n >\n <img\n src={asset('/images/wa_icon.png')}\n alt=\"\"\n className={style.WhatsappIcon}\n />\n {t(prefix + '.whatsapp', label)}\n </Button>\n ) : isLoading ? (\n <img\n src={asset('/images/loading.gif')}\n className={style.loading}\n alt=\"loading\"\n />\n ) : phoneNumberField && !otpField ? (\n <div className={style.phoneStep}>\n <div className={style.phoneRow}>\n <PhoneInput\n className={style.phoneInput}\n defaultCountry=\"us\"\n value={phoneNumber}\n onChange={(nextPhone) => setPhoneNumber(nextPhone)}\n inputProps={{\n placeholder: '+1 555 123 4567',\n }}\n />\n <button\n type=\"button\"\n className={style.signButton}\n aria-label=\"Send code\"\n onClick={() => sendWhatsappMessage(phoneNumber)}\n >\n <img src={asset('/images/signButton.png')} alt=\"\" />\n </button>\n </div>\n {showPhoneError && !isValid ? (\n <div className={style.phoneError}>Phone is not valid</div>\n ) : null}\n {sendError && (\n <div className={style.phoneError} role=\"alert\">\n Could not send the WhatsApp code. Please try again.\n </div>\n )}\n </div>\n ) : (\n <div className={style.otpStep}>\n <h3>Enter your OTP code</h3>\n <InputOTP\n maxLength={6}\n pattern={REGEXP_ONLY_DIGITS}\n inputMode=\"numeric\"\n autoComplete=\"one-time-code\"\n aria-label={otpLabel}\n containerClassName={style.otpInput}\n onComplete={(otp) => validateOTP(phoneNumber, otp)}\n >\n <InputOTPGroup>\n {Array.from({ length: 6 }, (_, index) => (\n <InputOTPSlot key={index} index={index} />\n ))}\n </InputOTPGroup>\n </InputOTP>\n </div>\n )}\n </>\n );\n};\n"]}
1
+ {"version":3,"file":"SignInWithWhatsapp.js","sourceRoot":"","sources":["../../../src/components/SignInWithWhatsapp.tsx"],"names":[],"mappings":"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","sourcesContent":["import React from 'react';\nimport style from './SignInWithWhatsapp.module.css';\nimport { Button } from '@_linked/primitives/components/Button';\nimport { cl } from '@_linked/react/utils/ClassNames';\nimport { packageName } from '../package.js';\nimport { Server } from '@_linked/server-utils/utils/Server';\nimport {\n InputOTP,\n InputOTPGroup,\n InputOTPSlot,\n REGEXP_ONLY_DIGITS,\n} from '@_linked/primitives/components/InputOTP';\nimport { PhoneInput } from 'react-international-phone';\nimport 'react-international-phone/style.css';\nimport libphone from 'google-libphonenumber';\nimport { useAuth } from '@_linked/auth/hooks/useAuth';\nimport { asset } from '@_linked/core/utils/LinkedFileStorage';\nimport { useTranslate } from '@tolgee/react';\n\nconst PhoneNumberUtil = libphone.PhoneNumberUtil;\n\ninterface SigninWithWhatsappButton\n extends Omit<React.ComponentProps<typeof Button>, 'onClick' | 'children'> {\n label?: string;\n onSuccess: (data: boolean) => void;\n}\n\nexport const SigninWithWhatsappButton = ({\n label = 'Sign in with Whatsapp',\n className,\n onSuccess,\n ...buttonProps\n}: SigninWithWhatsappButton) => {\n const phoneUtil = PhoneNumberUtil.getInstance();\n const isPhoneValid = (phoneNumber: string) => {\n try {\n return phoneUtil.isValidNumber(\n phoneUtil.parseAndKeepRawInput(phoneNumber)\n );\n } catch {\n return false;\n }\n };\n const [otpField, setOTPField] = React.useState(false);\n const [phoneNumber, setPhoneNumber] = React.useState('');\n const [phoneNumberField, setPhoneNumberField] = React.useState(false);\n const [isLoading, setLoading] = React.useState(false);\n const [showPhoneError, setShowPhoneError] = React.useState(false);\n const [sendError, setSendError] = React.useState(false);\n // Present only when the backend could not use a cookie-backed session (for\n // example, an iOS WebView calling the staging origin).\n const [otpChallenge, setOTPChallenge] = React.useState<string>();\n const isValid = isPhoneValid(phoneNumber);\n\n const auth = useAuth();\n const { t } = useTranslate();\n const prefix = 'signIn';\n const otpLabel = t(\n prefix + '.whatsappVerificationCode',\n 'WhatsApp verification code'\n );\n\n const validateOTP = (phone: string, otp: string) => {\n if (!phone || !otp) return;\n Server.call(\n packageName,\n 'validateOTPWhatsapp',\n phone,\n otp,\n otpChallenge\n ).then((response) => {\n if (response && response.auth) {\n // A browser gets the tokens as httpOnly cookies the server already set; only a\n // native client (body transport) receives refreshToken. The expiry fields size the\n // refresh token in native storage to the server's record.\n auth.updateAuth({\n auth: response.auth,\n accessToken: response.accessToken,\n refreshToken: response.refreshToken,\n refreshTokenExpiresIn: response.refreshTokenExpiresIn,\n refreshTokenExpiresAt: response.refreshTokenExpiresAt,\n });\n onSuccess(true);\n } else if (response?.error) {\n alert(response.error);\n } else {\n onSuccess(false);\n }\n });\n };\n\n const sendWhatsappMessage = (phone: string) => {\n if (!isValid) {\n setShowPhoneError(true);\n return;\n }\n setShowPhoneError(false);\n setSendError(false);\n setLoading(true);\n Server.call(packageName, 'generateOTPWhatsapp', phone)\n .then((response) => {\n if (!response?.sent) {\n setSendError(true);\n return;\n }\n // Echo this opaque value with the entered code. It contains no plaintext\n // OTP and the server rejects modification, expiry, or another phone.\n setOTPChallenge(response.challenge);\n setOTPField(true);\n })\n .catch(() => {\n setSendError(true);\n })\n .finally(() => {\n setLoading(false);\n });\n };\n\n return (\n <>\n {!otpField && !phoneNumberField ? (\n <Button\n type=\"button\"\n className={cl(style.root, className)}\n onClick={() => setPhoneNumberField(true)}\n variant=\"outline\"\n {...buttonProps}\n >\n <img\n src={asset('/images/wa_icon.png')}\n alt=\"\"\n className={style.WhatsappIcon}\n />\n {t(prefix + '.whatsapp', label)}\n </Button>\n ) : isLoading ? (\n <img\n src={asset('/images/loading.gif')}\n className={style.loading}\n alt=\"loading\"\n />\n ) : phoneNumberField && !otpField ? (\n <div className={style.phoneStep}>\n <div className={style.phoneRow}>\n <PhoneInput\n className={style.phoneInput}\n defaultCountry=\"us\"\n value={phoneNumber}\n onChange={(nextPhone) => setPhoneNumber(nextPhone)}\n inputProps={{\n placeholder: '+1 555 123 4567',\n }}\n />\n <button\n type=\"button\"\n className={style.signButton}\n aria-label=\"Send code\"\n onClick={() => sendWhatsappMessage(phoneNumber)}\n >\n <img src={asset('/images/signButton.png')} alt=\"\" />\n </button>\n </div>\n {showPhoneError && !isValid ? (\n <div className={style.phoneError}>Phone is not valid</div>\n ) : null}\n {sendError && (\n <div className={style.phoneError} role=\"alert\">\n Could not send the WhatsApp code. Please try again.\n </div>\n )}\n </div>\n ) : (\n <div className={style.otpStep}>\n <h3>Enter your OTP code</h3>\n <InputOTP\n maxLength={6}\n pattern={REGEXP_ONLY_DIGITS}\n inputMode=\"numeric\"\n autoComplete=\"one-time-code\"\n aria-label={otpLabel}\n containerClassName={style.otpInput}\n onComplete={(otp) => validateOTP(phoneNumber, otp)}\n >\n <InputOTPGroup>\n {Array.from({ length: 6 }, (_, index) => (\n <InputOTPSlot key={index} index={index} />\n ))}\n </InputOTPGroup>\n </InputOTP>\n </div>\n )}\n </>\n );\n};\n"]}
package/package.json CHANGED
@@ -10,7 +10,7 @@
10
10
  "type": "git",
11
11
  "url": "git+ssh://git@github.com/linked-cm/capacitor.git"
12
12
  },
13
- "version": "0.3.4",
13
+ "version": "0.3.6",
14
14
  "linkedPackage": true,
15
15
  "type": "module",
16
16
  "main": "lib/esm/index.js",
package/readme.md CHANGED
@@ -43,7 +43,7 @@ Sign-in is verified by `@_linked/auth` 3:
43
43
  - When the provider's email belongs to an existing account that signed in another way, `onCallback` gets `{ error, action: 'sign_in_to_link' }`. Sign the user in the way they did before, then call `useAuth().linkOAuthIdentity`.
44
44
  - An app with an RPC exposure list must expose auth's `createOAuthNonce: 'public'` for Apple sign-in, and `linkOAuthIdentity: 'user'` to link a provider.
45
45
 
46
- WhatsApp sign-in asks the backend to send a code, then validates it. The server reads:
46
+ WhatsApp sign-in asks the backend to send a code, then validates it. `generateOTPWhatsapp` returns `{ sent: true }` after the provider answers HTTP 2xx, and only then stores the code on the browser session. The server reads:
47
47
 
48
48
  - `WA_D360_API_KEY`
49
49
  - `WA_D360_USERNAME`
@@ -65,3 +65,15 @@ test('one account linked to distinct Persons is ambiguous', () => {
65
65
  assert.deepEqual(resolution.personIds, ['urn:person:1', 'urn:person:2']);
66
66
  });
67
67
 
68
+ test('combined WebID and telephone matches expose a legacy duplicate', () => {
69
+ const resolution = resolveTelephoneAccount([
70
+ account('urn:account:whatsapp', 'urn:person:whatsapp'),
71
+ account('urn:account:email', 'urn:person:email'),
72
+ ]);
73
+
74
+ assert.deepEqual(resolution, {
75
+ kind: 'ambiguous',
76
+ accountIds: ['urn:account:email', 'urn:account:whatsapp'],
77
+ personIds: ['urn:person:email', 'urn:person:whatsapp'],
78
+ });
79
+ });
@@ -9,6 +9,13 @@ const makeProvider = (session = {}) => {
9
9
  return provider;
10
10
  };
11
11
 
12
+ const makeCookieLessProvider = () => {
13
+ const provider = Object.create(CapacitorBackendProvider.prototype);
14
+ Object.defineProperty(provider, 'request', { value: {} });
15
+ provider.generateOTP = () => 123456;
16
+ return provider;
17
+ };
18
+
12
19
  const setEnv = (t, key, value) => {
13
20
  const previous = process.env[key];
14
21
  process.env[key] = value;
@@ -18,32 +25,54 @@ const setEnv = (t, key, value) => {
18
25
  });
19
26
  };
20
27
 
28
+ const configureSend = (t) => {
29
+ setEnv(t, 'WA_D360_API_KEY', 'test-key');
30
+ setEnv(t, 'WA_D360_USERNAME', 'wa-user');
31
+ setEnv(t, 'WA_D360_PASSWORD', 'wa-password');
32
+ setEnv(t, 'WA_D360_TEMPLATE_NAMESPACE', 'test-namespace');
33
+ setEnv(t, 'WA_D360_TEMPLATE_NAME', 'authentication_test');
34
+ };
35
+
21
36
  test('WhatsApp send uses the API key and configured authentication template', async (t) => {
22
- t.mock.method(globalThis, 'fetch', async (_url, options) => {
37
+ t.mock.method(globalThis, 'fetch', async (url, options) => {
38
+ if (String(url).endsWith('/token')) {
39
+ assert.equal(JSON.parse(options.body).username, 'wa-user');
40
+ return { ok: true, json: async () => ({ access_token: 'token-1' }) };
41
+ }
23
42
  const payload = JSON.parse(options.body);
24
43
  assert.equal(options.headers['D360-API-KEY'], 'test-key');
25
- assert.equal(options.headers.Authorization, undefined);
44
+ assert.equal(options.headers.Authorization, 'bearer token-1');
45
+ assert.equal(payload.template.namespace, 'test-namespace');
26
46
  assert.equal(payload.template.name, 'authentication_test');
27
47
  assert.equal(payload.to, '15551234567');
28
48
  assert.equal(payload.template.language.code, 'en');
49
+ assert.equal(payload.template.language.policy, 'deterministic');
29
50
  assert.equal(payload.template.components[0].parameters[0].text, 123456);
30
51
  assert.equal(payload.template.components[1].parameters[0].text, '123456');
31
- return { ok: true, json: async () => ({ messages: [{ id: 'test-message' }] }) };
52
+ return {
53
+ ok: true,
54
+ json: async () => ({ messages: [{ id: 'test-message' }] }),
55
+ };
32
56
  });
33
57
  t.mock.method(console, 'log', () => {
34
58
  throw new Error('OTP must never be logged');
35
59
  });
36
- setEnv(t, 'WA_D360_API_KEY', 'test-key');
37
- setEnv(t, 'WA_D360_TEMPLATE_NAME', 'authentication_test');
60
+ configureSend(t);
38
61
  const provider = makeProvider();
39
- assert.deepEqual(await provider.generateOTPWhatsapp('+1 555 123 4567'), { sent: true });
62
+ assert.deepEqual(await provider.generateOTPWhatsapp('+1 555 123 4567'), {
63
+ sent: true,
64
+ });
40
65
  assert.equal(provider.request.session.otp, 123456);
41
66
  });
42
67
 
43
68
  test('a rejected WhatsApp resend invalidates the earlier OTP', async (t) => {
44
- setEnv(t, 'WA_D360_API_KEY', 'test-key');
45
- setEnv(t, 'WA_D360_TEMPLATE_NAME', 'authentication_test');
46
- t.mock.method(globalThis, 'fetch', async () => ({ ok: false, status: 401 }));
69
+ configureSend(t);
70
+ t.mock.method(globalThis, 'fetch', async (url) => {
71
+ if (String(url).endsWith('/token')) {
72
+ return { ok: true, json: async () => ({ access_token: 'token-1' }) };
73
+ }
74
+ return { ok: false, status: 401, json: async () => ({}) };
75
+ });
47
76
  t.mock.method(console, 'error', () => {});
48
77
  const provider = makeProvider({ otp: 654321 });
49
78
  await assert.rejects(
@@ -53,15 +82,46 @@ test('a rejected WhatsApp resend invalidates the earlier OTP', async (t) => {
53
82
  assert.equal(provider.request.session.otp, undefined);
54
83
  });
55
84
 
56
- test('an unconfirmed WhatsApp resend invalidates the earlier OTP', async (t) => {
57
- setEnv(t, 'WA_D360_API_KEY', 'test-key');
58
- setEnv(t, 'WA_D360_TEMPLATE_NAME', 'authentication_test');
59
- t.mock.method(globalThis, 'fetch', async () => ({ ok: true, json: async () => ({}) }));
85
+ test('an accepted WhatsApp send without a message id still returns the code entry step', async (t) => {
86
+ configureSend(t);
87
+ t.mock.method(globalThis, 'fetch', async (url) => {
88
+ if (String(url).endsWith('/token')) {
89
+ return { ok: true, json: async () => ({ access_token: 'token-1' }) };
90
+ }
91
+ return { ok: true, json: async () => ({}) };
92
+ });
60
93
  t.mock.method(console, 'error', () => {});
61
94
  const provider = makeProvider({ otp: 654321 });
62
- await assert.rejects(
63
- provider.generateOTPWhatsapp('15551234567'),
64
- /Could not send the code/
95
+ assert.deepEqual(await provider.generateOTPWhatsapp('15551234567'), {
96
+ sent: true,
97
+ });
98
+ assert.equal(provider.request.session.otp, 123456);
99
+ });
100
+
101
+ test('a cookie-less send returns a phone-bound signed challenge', async (t) => {
102
+ configureSend(t);
103
+ setEnv(t, 'JWT_SECRET', 'ios-auth-regression-test-secret');
104
+ t.mock.method(globalThis, 'fetch', async (url) => {
105
+ if (String(url).endsWith('/token')) {
106
+ return { ok: true, json: async () => ({ access_token: 'token-1' }) };
107
+ }
108
+ return { ok: true, json: async () => ({}) };
109
+ });
110
+
111
+ const provider = makeCookieLessProvider();
112
+ const response = await provider.generateOTPWhatsapp('+62 812 3456 789');
113
+ assert.equal(response.sent, true);
114
+ assert.equal(typeof response.challenge, 'string');
115
+ assert.equal(
116
+ provider.verifyOTPChallenge('+628123456789', '123456', response.challenge),
117
+ true
118
+ );
119
+ assert.equal(
120
+ provider.verifyOTPChallenge('+628123456789', '654321', response.challenge),
121
+ false
122
+ );
123
+ assert.equal(
124
+ provider.verifyOTPChallenge('+628000000000', '123456', response.challenge),
125
+ false
65
126
  );
66
- assert.equal(provider.request.session.otp, undefined);
67
127
  });
@@ -21,3 +21,14 @@ test('WhatsApp OTP generation does not log the plaintext code', () => {
21
21
  /console\.log\(['"]OTP/
22
22
  );
23
23
  });
24
+
25
+ test('WhatsApp validation resolves WebID and telephone matches together', () => {
26
+ const source =
27
+ CapacitorBackendProvider.prototype.validateOTPWhatsapp.toString();
28
+
29
+ assert.match(
30
+ source,
31
+ /resolveTelephoneAccount\(\[\s*\.\.\.webIdAccounts,\s*\.\.\.telephoneAccounts,?\s*\]\)/
32
+ );
33
+ assert.doesNotMatch(source, /webIdResolution\.kind === ['"]one['"]/);
34
+ });