@linked.cm/capacitor 0.3.3 → 0.3.4
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 +6 -0
- package/lib/esm/backend.js +2 -0
- package/lib/esm/backend.js.map +1 -1
- package/package.json +1 -1
- package/tests/whatsapp-otp.test.mjs +6 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# @linked.cm/capacitor
|
|
2
2
|
|
|
3
|
+
## 0.3.4
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#18](https://github.com/linked-cm/capacitor/pull/18) [`b3a3633`](https://github.com/linked-cm/capacitor/commit/b3a36335996ac527ff97ae18a8b2b35b06a3e15e) Thanks [@abdipramana](https://github.com/abdipramana)! - Invalidate previous WhatsApp OTPs when a resend fails or is not confirmed by the provider.
|
|
8
|
+
|
|
3
9
|
## 0.3.3
|
|
4
10
|
|
|
5
11
|
### Patch Changes
|
package/lib/esm/backend.js
CHANGED
|
@@ -197,6 +197,8 @@ export default class CapacitorBackendProvider extends BackendProvider {
|
|
|
197
197
|
throw new Error('WA_D360_API_KEY is required to send a WhatsApp code');
|
|
198
198
|
}
|
|
199
199
|
const otp = this.generateOTP();
|
|
200
|
+
// A resend invalidates an earlier code even when the provider rejects it.
|
|
201
|
+
delete session.otp;
|
|
200
202
|
const url = `${baseUrl}/messages`;
|
|
201
203
|
try {
|
|
202
204
|
const response = await this.sendMessage(url, API_KEY, otp, recipient);
|
package/lib/esm/backend.js.map
CHANGED
|
@@ -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 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":"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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"]}
|
package/package.json
CHANGED
|
@@ -2,9 +2,9 @@ import assert from 'node:assert/strict';
|
|
|
2
2
|
import test from 'node:test';
|
|
3
3
|
import CapacitorBackendProvider from '../lib/esm/backend.js';
|
|
4
4
|
|
|
5
|
-
const makeProvider = () => {
|
|
5
|
+
const makeProvider = (session = {}) => {
|
|
6
6
|
const provider = Object.create(CapacitorBackendProvider.prototype);
|
|
7
|
-
Object.defineProperty(provider, 'request', { value: { session
|
|
7
|
+
Object.defineProperty(provider, 'request', { value: { session } });
|
|
8
8
|
provider.generateOTP = () => 123456;
|
|
9
9
|
return provider;
|
|
10
10
|
};
|
|
@@ -40,12 +40,12 @@ test('WhatsApp send uses the API key and configured authentication template', as
|
|
|
40
40
|
assert.equal(provider.request.session.otp, 123456);
|
|
41
41
|
});
|
|
42
42
|
|
|
43
|
-
test('a rejected WhatsApp
|
|
43
|
+
test('a rejected WhatsApp resend invalidates the earlier OTP', async (t) => {
|
|
44
44
|
setEnv(t, 'WA_D360_API_KEY', 'test-key');
|
|
45
45
|
setEnv(t, 'WA_D360_TEMPLATE_NAME', 'authentication_test');
|
|
46
46
|
t.mock.method(globalThis, 'fetch', async () => ({ ok: false, status: 401 }));
|
|
47
47
|
t.mock.method(console, 'error', () => {});
|
|
48
|
-
const provider = makeProvider();
|
|
48
|
+
const provider = makeProvider({ otp: 654321 });
|
|
49
49
|
await assert.rejects(
|
|
50
50
|
provider.generateOTPWhatsapp('15551234567'),
|
|
51
51
|
/Could not send the code/
|
|
@@ -53,12 +53,12 @@ test('a rejected WhatsApp request never enables an OTP', async (t) => {
|
|
|
53
53
|
assert.equal(provider.request.session.otp, undefined);
|
|
54
54
|
});
|
|
55
55
|
|
|
56
|
-
test('
|
|
56
|
+
test('an unconfirmed WhatsApp resend invalidates the earlier OTP', async (t) => {
|
|
57
57
|
setEnv(t, 'WA_D360_API_KEY', 'test-key');
|
|
58
58
|
setEnv(t, 'WA_D360_TEMPLATE_NAME', 'authentication_test');
|
|
59
59
|
t.mock.method(globalThis, 'fetch', async () => ({ ok: true, json: async () => ({}) }));
|
|
60
60
|
t.mock.method(console, 'error', () => {});
|
|
61
|
-
const provider = makeProvider();
|
|
61
|
+
const provider = makeProvider({ otp: 654321 });
|
|
62
62
|
await assert.rejects(
|
|
63
63
|
provider.generateOTPWhatsapp('15551234567'),
|
|
64
64
|
/Could not send the code/
|