@linked.cm/capacitor 0.3.0 → 0.3.2
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 +12 -0
- package/lib/esm/backend.d.ts +13 -4
- package/lib/esm/backend.js +53 -49
- package/lib/esm/backend.js.map +1 -1
- package/lib/esm/components/SignInWithWhatsapp.js +12 -4
- package/lib/esm/components/SignInWithWhatsapp.js.map +1 -1
- package/lib/esm/components/SignInWithWhatsapp.module.css +25 -0
- package/lib/esm/utils/telephoneAccount.d.ts +33 -0
- package/lib/esm/utils/telephoneAccount.js +40 -0
- package/lib/esm/utils/telephoneAccount.js.map +1 -0
- package/package.json +1 -1
- package/tests/social-login-client.test.mjs +11 -0
- package/tests/telephone-account.test.mjs +67 -0
- package/tests/whatsapp-otp.test.mjs +67 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# @linked.cm/capacitor
|
|
2
2
|
|
|
3
|
+
## 0.3.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#12](https://github.com/linked-cm/capacitor/pull/12) [`f625398`](https://github.com/linked-cm/capacitor/commit/f625398e7be59d214663cf94f6fcddbe85b38f8d) Thanks [@abdipramana](https://github.com/abdipramana)! - Reject WhatsApp sign-in when a normalized telephone matches multiple identities instead of authenticating an arbitrary query result.
|
|
8
|
+
|
|
9
|
+
## 0.3.1
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- [#11](https://github.com/linked-cm/capacitor/pull/11) [`641906a`](https://github.com/linked-cm/capacitor/commit/641906a016d5d488096fcc8a3f3bb2c744b22d8e) Thanks [@carlenmy](https://github.com/carlenmy)! - Label the WhatsApp verification code input and keep its six numeric slots usable on narrow screens.
|
|
14
|
+
|
|
3
15
|
## 0.3.0
|
|
4
16
|
|
|
5
17
|
### Minor Changes
|
package/lib/esm/backend.d.ts
CHANGED
|
@@ -8,13 +8,22 @@ 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): Promise<({
|
|
12
|
+
auth: import("@_linked/auth/types/auth").AuthSession;
|
|
13
|
+
accessToken: string;
|
|
14
|
+
refreshToken?: string;
|
|
15
|
+
} & import("@_linked/auth/utils/token.js").RefreshTokenExpiry) | {
|
|
16
|
+
error: string;
|
|
17
|
+
action?: string;
|
|
18
|
+
} | {
|
|
19
|
+
error: string;
|
|
20
|
+
code: string;
|
|
21
|
+
}>;
|
|
12
22
|
generateOTPWhatsapp(phoneNumber: any): Promise<{
|
|
13
|
-
|
|
23
|
+
sent: boolean;
|
|
14
24
|
}>;
|
|
15
|
-
getBearerToken(): Promise<any>;
|
|
16
25
|
generateOTP(): number;
|
|
17
|
-
sendMessage(url: any,
|
|
26
|
+
sendMessage(url: any, apiKey: any, otp: any, phoneNumber: any): Promise<Response>;
|
|
18
27
|
getUserLocationAction(user: UserData): Promise<{
|
|
19
28
|
agent: {
|
|
20
29
|
id: string;
|
package/lib/esm/backend.js
CHANGED
|
@@ -8,6 +8,7 @@ import { UserAccount } from '@_linked/sioc/shapes/UserAccount';
|
|
|
8
8
|
import { AuthCredential } from '@_linked/auth/shapes/AuthCredential';
|
|
9
9
|
import { telephoneToWebID } from '@_linked/auth/utils/webID';
|
|
10
10
|
import { normalizeTelephone } from './utils/helper.js';
|
|
11
|
+
import { AMBIGUOUS_TELEPHONE_IDENTITY, AmbiguousTelephoneIdentityError, resolveTelephoneAccount, } from './utils/telephoneAccount.js';
|
|
11
12
|
export default class CapacitorBackendProvider extends BackendProvider {
|
|
12
13
|
constructor() {
|
|
13
14
|
super(...arguments);
|
|
@@ -54,7 +55,7 @@ export default class CapacitorBackendProvider extends BackendProvider {
|
|
|
54
55
|
return await Auth.login(this, async () => {
|
|
55
56
|
const telephoneWebId = telephoneToWebID(normalizedPhone);
|
|
56
57
|
// first, try to find account by telephone-based webID (for new users)
|
|
57
|
-
|
|
58
|
+
const webIdAccounts = await UserAccount.select((ua) => [
|
|
58
59
|
ua.email,
|
|
59
60
|
ua.accountOf.select((p) => [
|
|
60
61
|
p.givenName,
|
|
@@ -66,8 +67,12 @@ export default class CapacitorBackendProvider extends BackendProvider {
|
|
|
66
67
|
return ua.accountOf.equals({
|
|
67
68
|
id: telephoneWebId,
|
|
68
69
|
});
|
|
69
|
-
})
|
|
70
|
-
|
|
70
|
+
});
|
|
71
|
+
const webIdResolution = resolveTelephoneAccount(webIdAccounts);
|
|
72
|
+
if (webIdResolution.kind === 'ambiguous') {
|
|
73
|
+
throw new AmbiguousTelephoneIdentityError(webIdResolution);
|
|
74
|
+
}
|
|
75
|
+
let account = webIdResolution.kind === 'one' ? webIdResolution.account : null;
|
|
71
76
|
if (account && account.accountOf) {
|
|
72
77
|
console.log(`Found account by telephone-based webID for phone number ${phoneIdentifier}`);
|
|
73
78
|
return {
|
|
@@ -77,7 +82,7 @@ export default class CapacitorBackendProvider extends BackendProvider {
|
|
|
77
82
|
}
|
|
78
83
|
// if not found, try to find by telephone property (for old users with normal ID)
|
|
79
84
|
console.log(`Account not found by webID, searching by telephone property for ${normalizedPhone}`);
|
|
80
|
-
|
|
85
|
+
const telephoneAccounts = await UserAccount.select((ua) => [
|
|
81
86
|
ua.email,
|
|
82
87
|
ua.accountOf.select((p) => [
|
|
83
88
|
p.givenName,
|
|
@@ -90,8 +95,15 @@ export default class CapacitorBackendProvider extends BackendProvider {
|
|
|
90
95
|
return ua.accountOf.telephone
|
|
91
96
|
.equals(normalizedPhone)
|
|
92
97
|
.or(ua.accountOf.telephone.equals(legacyPhone));
|
|
93
|
-
})
|
|
94
|
-
|
|
98
|
+
});
|
|
99
|
+
const telephoneResolution = resolveTelephoneAccount(telephoneAccounts);
|
|
100
|
+
if (telephoneResolution.kind === 'ambiguous') {
|
|
101
|
+
throw new AmbiguousTelephoneIdentityError(telephoneResolution);
|
|
102
|
+
}
|
|
103
|
+
account =
|
|
104
|
+
telephoneResolution.kind === 'one'
|
|
105
|
+
? telephoneResolution.account
|
|
106
|
+
: null;
|
|
95
107
|
if (account && account.accountOf) {
|
|
96
108
|
console.log(`Found account by telephone property for phone number ${phoneIdentifier}`);
|
|
97
109
|
return {
|
|
@@ -142,6 +154,16 @@ export default class CapacitorBackendProvider extends BackendProvider {
|
|
|
142
154
|
}, 'Whatsapp. Phonenumber: ' + phoneIdentifier);
|
|
143
155
|
}
|
|
144
156
|
catch (err) {
|
|
157
|
+
if (err instanceof AmbiguousTelephoneIdentityError) {
|
|
158
|
+
console.warn('WhatsApp sign-in refused because the telephone matches multiple identities', {
|
|
159
|
+
accountCount: err.resolution.accountIds.length,
|
|
160
|
+
personCount: err.resolution.personIds.length,
|
|
161
|
+
});
|
|
162
|
+
return {
|
|
163
|
+
error: 'Multiple accounts use this phone number. Please use another sign-in method or contact support.',
|
|
164
|
+
code: AMBIGUOUS_TELEPHONE_IDENTITY,
|
|
165
|
+
};
|
|
166
|
+
}
|
|
145
167
|
console.error('validateOTPWhatsapp failed:', err);
|
|
146
168
|
return {
|
|
147
169
|
error: 'Sign-in failed. Please try again.',
|
|
@@ -149,71 +171,54 @@ export default class CapacitorBackendProvider extends BackendProvider {
|
|
|
149
171
|
}
|
|
150
172
|
}
|
|
151
173
|
async generateOTPWhatsapp(phoneNumber) {
|
|
174
|
+
var _a, _b;
|
|
152
175
|
const session = this.request.session;
|
|
153
176
|
const baseUrl = 'https://waba-v2.360dialog.io';
|
|
154
|
-
const bearerToken = this.getBearerToken();
|
|
155
177
|
const API_KEY = process.env.WA_D360_API_KEY;
|
|
156
|
-
const
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
// Save the OTP
|
|
160
|
-
session.otp = otp;
|
|
161
|
-
const url = `${baseUrl}/messages`;
|
|
162
|
-
try {
|
|
163
|
-
const response = await this.sendMessage(url, bearerToken, API_KEY, otp, phoneNumber);
|
|
164
|
-
const data = await response.json();
|
|
165
|
-
return { data };
|
|
178
|
+
const recipient = normalizeTelephone(phoneNumber).replace(/^\+/, '');
|
|
179
|
+
if (!/^\d{8,15}$/.test(recipient)) {
|
|
180
|
+
throw new Error('A valid WhatsApp phone number is required');
|
|
166
181
|
}
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
throw error; // Propagate the error for handling at a higher level
|
|
182
|
+
if (!API_KEY) {
|
|
183
|
+
throw new Error('WA_D360_API_KEY is required to send a WhatsApp code');
|
|
170
184
|
}
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
const username = process.env.WA_D360_USERNAME;
|
|
174
|
-
const password = process.env.WA_D360_PASSWORD;
|
|
175
|
-
if (!username || !password) {
|
|
176
|
-
throw new Error('WA_D360_USERNAME and WA_D360_PASSWORD are required to request a WhatsApp token');
|
|
177
|
-
}
|
|
178
|
-
const url = 'https://hub.360dialog.io/api/v2/token';
|
|
185
|
+
const otp = this.generateOTP();
|
|
186
|
+
const url = `${baseUrl}/messages`;
|
|
179
187
|
try {
|
|
180
|
-
const response = await
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
body: JSON.stringify({
|
|
186
|
-
username,
|
|
187
|
-
password,
|
|
188
|
-
}),
|
|
189
|
-
});
|
|
188
|
+
const response = await this.sendMessage(url, API_KEY, otp, recipient);
|
|
189
|
+
if (!response.ok) {
|
|
190
|
+
console.error('WhatsApp code request rejected by provider:', response.status);
|
|
191
|
+
throw new Error('Could not send the code. Please try again.');
|
|
192
|
+
}
|
|
190
193
|
const data = await response.json();
|
|
191
|
-
|
|
194
|
+
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)) {
|
|
195
|
+
throw new Error('WhatsApp provider did not confirm the code request');
|
|
196
|
+
}
|
|
197
|
+
// Only make a code usable after the provider accepts the message.
|
|
198
|
+
session.otp = otp;
|
|
199
|
+
return { sent: true };
|
|
192
200
|
}
|
|
193
201
|
catch (error) {
|
|
194
|
-
console.error('
|
|
195
|
-
throw
|
|
202
|
+
console.error('WhatsApp code send failed:', error.message);
|
|
203
|
+
throw new Error('Could not send the code. Please try again.');
|
|
196
204
|
}
|
|
197
205
|
}
|
|
198
206
|
generateOTP() {
|
|
199
207
|
return Math.floor(100000 + Math.random() * 900000);
|
|
200
208
|
}
|
|
201
|
-
async sendMessage(url,
|
|
202
|
-
const templateNamespace = process.env.WA_D360_TEMPLATE_NAMESPACE;
|
|
209
|
+
async sendMessage(url, apiKey, otp, phoneNumber) {
|
|
203
210
|
const templateName = process.env.WA_D360_TEMPLATE_NAME;
|
|
204
|
-
if (!
|
|
205
|
-
throw new Error('
|
|
211
|
+
if (!templateName) {
|
|
212
|
+
throw new Error('WA_D360_TEMPLATE_NAME is required to send a WhatsApp code');
|
|
206
213
|
}
|
|
207
214
|
const payload = {
|
|
208
215
|
messaging_product: 'whatsapp',
|
|
209
216
|
to: phoneNumber,
|
|
210
217
|
type: 'template',
|
|
211
218
|
template: {
|
|
212
|
-
namespace: templateNamespace,
|
|
213
219
|
name: templateName,
|
|
214
220
|
language: {
|
|
215
|
-
code: 'en',
|
|
216
|
-
policy: 'deterministic',
|
|
221
|
+
code: process.env.WA_D360_TEMPLATE_LANGUAGE || 'en',
|
|
217
222
|
},
|
|
218
223
|
components: [
|
|
219
224
|
{
|
|
@@ -243,7 +248,6 @@ export default class CapacitorBackendProvider extends BackendProvider {
|
|
|
243
248
|
method: 'POST',
|
|
244
249
|
headers: {
|
|
245
250
|
'Content-Type': 'application/json',
|
|
246
|
-
Authorization: `bearer ${bearerToken}`,
|
|
247
251
|
'D360-API-KEY': apiKey,
|
|
248
252
|
},
|
|
249
253
|
body: JSON.stringify(payload),
|
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 { 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';\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 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 let account = await UserAccount.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 .one();\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 account = await UserAccount.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 .one();\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 console.error('validateOTPWhatsapp failed:', err);\n return {\n error: 'Sign-in failed. Please try again.',\n };\n }\n }\n\n async generateOTPWhatsapp(phoneNumber) {\n const session = this.request.session;\n const baseUrl = 'https://waba-v2.360dialog.io';\n const bearerToken = this.getBearerToken();\n const API_KEY = process.env.WA_D360_API_KEY;\n\n const otp = this.generateOTP();\n const message = `Your OTP for Whatsapp Auth is ${otp}`;\n console.log('OTP', message);\n\n // Save the OTP\n session.otp = otp;\n\n const url = `${baseUrl}/messages`;\n\n try {\n const response = await this.sendMessage(\n url,\n bearerToken,\n API_KEY,\n otp,\n phoneNumber\n );\n const data = await response.json();\n return { data };\n } catch (error) {\n console.error('Error sending message:', error.message);\n throw error; // Propagate the error for handling at a higher level\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 url = 'https://hub.360dialog.io/api/v2/token';\n try {\n const response = await fetch(url, {\n method: 'POST',\n headers: {\n 'Content-Type': 'application/json',\n },\n body: JSON.stringify({\n username,\n password,\n }),\n });\n const data = await response.json();\n return data.access_token;\n } catch (error) {\n console.error('Error getting access token:', error.message);\n throw error; // Propagate the error for handling at a higher level\n }\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: 'en',\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"]}
|
|
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 { 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 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 const webIdAccounts = await UserAccount.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 UserAccount.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 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"]}
|
|
@@ -27,10 +27,12 @@ export const SigninWithWhatsappButton = ({ label = 'Sign in with Whatsapp', clas
|
|
|
27
27
|
const [phoneNumberField, setPhoneNumberField] = React.useState(false);
|
|
28
28
|
const [isLoading, setLoading] = React.useState(false);
|
|
29
29
|
const [showPhoneError, setShowPhoneError] = React.useState(false);
|
|
30
|
+
const [sendError, setSendError] = React.useState(false);
|
|
30
31
|
const isValid = isPhoneValid(phoneNumber);
|
|
31
32
|
const auth = useAuth();
|
|
32
33
|
const { t } = useTranslate();
|
|
33
34
|
const prefix = 'signIn';
|
|
35
|
+
const otpLabel = t(prefix + '.whatsappVerificationCode', 'WhatsApp verification code');
|
|
34
36
|
const validateOTP = (phone, otp) => {
|
|
35
37
|
if (!phone || !otp)
|
|
36
38
|
return;
|
|
@@ -62,13 +64,18 @@ export const SigninWithWhatsappButton = ({ label = 'Sign in with Whatsapp', clas
|
|
|
62
64
|
return;
|
|
63
65
|
}
|
|
64
66
|
setShowPhoneError(false);
|
|
67
|
+
setSendError(false);
|
|
65
68
|
setLoading(true);
|
|
66
69
|
Server.call(packageName, 'generateOTPWhatsapp', phone)
|
|
67
|
-
.then(() => {
|
|
70
|
+
.then((response) => {
|
|
71
|
+
if (!(response === null || response === void 0 ? void 0 : response.sent)) {
|
|
72
|
+
setSendError(true);
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
68
75
|
setOTPField(true);
|
|
69
76
|
})
|
|
70
77
|
.catch(() => {
|
|
71
|
-
|
|
78
|
+
setSendError(true);
|
|
72
79
|
})
|
|
73
80
|
.finally(() => {
|
|
74
81
|
setLoading(false);
|
|
@@ -83,9 +90,10 @@ export const SigninWithWhatsappButton = ({ label = 'Sign in with Whatsapp', clas
|
|
|
83
90
|
} }),
|
|
84
91
|
React.createElement("button", { type: "button", className: style.signButton, "aria-label": "Send code", onClick: () => sendWhatsappMessage(phoneNumber) },
|
|
85
92
|
React.createElement("img", { src: asset('/images/signButton.png'), alt: "" }))),
|
|
86
|
-
showPhoneError && !isValid ? (React.createElement("div", { className: style.phoneError }, "Phone is not valid")) : null
|
|
93
|
+
showPhoneError && !isValid ? (React.createElement("div", { className: style.phoneError }, "Phone is not valid")) : null,
|
|
94
|
+
sendError && (React.createElement("div", { className: style.phoneError, role: "alert" }, "Could not send the WhatsApp code. Please try again.")))) : (React.createElement("div", { className: style.otpStep },
|
|
87
95
|
React.createElement("h3", null, "Enter your OTP code"),
|
|
88
|
-
React.createElement(InputOTP, { maxLength: 6, pattern: REGEXP_ONLY_DIGITS, inputMode: "numeric", autoComplete: "one-time-code", onComplete: (otp) => validateOTP(phoneNumber, otp) },
|
|
96
|
+
React.createElement(InputOTP, { maxLength: 6, pattern: REGEXP_ONLY_DIGITS, inputMode: "numeric", autoComplete: "one-time-code", "aria-label": otpLabel, containerClassName: style.otpInput, onComplete: (otp) => validateOTP(phoneNumber, otp) },
|
|
89
97
|
React.createElement(InputOTPGroup, null, Array.from({ length: 6 }, (_, index) => (React.createElement(InputOTPSlot, { key: index, index: index })))))))));
|
|
90
98
|
};
|
|
91
99
|
//# sourceMappingURL=SignInWithWhatsapp.js.map
|
|
@@ -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 isValid = isPhoneValid(phoneNumber);\n\n const auth = useAuth();\n const { t } = useTranslate();\n const prefix = 'signIn';\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 setLoading(true);\n Server.call(packageName, 'generateOTPWhatsapp', phone)\n .then(() => {\n setOTPField(true);\n })\n .catch(() => {\n alert('Could not send the code. Please try again.');\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 </div>\n ) : (\n <>\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 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 </>\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 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"]}
|
|
@@ -85,6 +85,31 @@
|
|
|
85
85
|
margin-top: 6px;
|
|
86
86
|
}
|
|
87
87
|
|
|
88
|
+
.otpStep {
|
|
89
|
+
display: flex;
|
|
90
|
+
flex-direction: column;
|
|
91
|
+
align-items: center;
|
|
92
|
+
gap: 12px;
|
|
93
|
+
width: 100%;
|
|
94
|
+
min-width: 0;
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
.otpStep h3 {
|
|
98
|
+
width: 100%;
|
|
99
|
+
margin: 0;
|
|
100
|
+
font-size: clamp(24px, 3vw, 32px);
|
|
101
|
+
line-height: 1.2;
|
|
102
|
+
text-align: center;
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
.otpInput {
|
|
106
|
+
justify-content: center;
|
|
107
|
+
width: 100%;
|
|
108
|
+
max-width: 100%;
|
|
109
|
+
--otp-slot-size: clamp(34px, 7vw, 48px);
|
|
110
|
+
--otp-slot-gap: clamp(3px, 1vw, 8px);
|
|
111
|
+
}
|
|
112
|
+
|
|
88
113
|
.loading {
|
|
89
114
|
width: 32px;
|
|
90
115
|
height: 32px;
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
export declare const AMBIGUOUS_TELEPHONE_IDENTITY = "AMBIGUOUS_TELEPHONE_IDENTITY";
|
|
2
|
+
type AccountWithPerson = {
|
|
3
|
+
id?: string;
|
|
4
|
+
accountOf?: {
|
|
5
|
+
id?: string;
|
|
6
|
+
} | null;
|
|
7
|
+
};
|
|
8
|
+
export type TelephoneAccountResolution<T extends AccountWithPerson> = {
|
|
9
|
+
kind: 'none';
|
|
10
|
+
} | {
|
|
11
|
+
kind: 'one';
|
|
12
|
+
account: T;
|
|
13
|
+
} | {
|
|
14
|
+
kind: 'ambiguous';
|
|
15
|
+
accountIds: string[];
|
|
16
|
+
personIds: string[];
|
|
17
|
+
};
|
|
18
|
+
/**
|
|
19
|
+
* Resolve query rows without trusting store ordering. Duplicate rows for the
|
|
20
|
+
* same account/person pair are harmless; distinct accounts or Persons fail
|
|
21
|
+
* closed so WhatsApp never authenticates an arbitrary legacy identity.
|
|
22
|
+
*/
|
|
23
|
+
export declare function resolveTelephoneAccount<T extends AccountWithPerson>(rows: T[] | null | undefined): TelephoneAccountResolution<T>;
|
|
24
|
+
export declare class AmbiguousTelephoneIdentityError extends Error {
|
|
25
|
+
readonly resolution: Extract<TelephoneAccountResolution<any>, {
|
|
26
|
+
kind: 'ambiguous';
|
|
27
|
+
}>;
|
|
28
|
+
readonly code = "AMBIGUOUS_TELEPHONE_IDENTITY";
|
|
29
|
+
constructor(resolution: Extract<TelephoneAccountResolution<any>, {
|
|
30
|
+
kind: 'ambiguous';
|
|
31
|
+
}>);
|
|
32
|
+
}
|
|
33
|
+
export {};
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
export const AMBIGUOUS_TELEPHONE_IDENTITY = 'AMBIGUOUS_TELEPHONE_IDENTITY';
|
|
2
|
+
/**
|
|
3
|
+
* Resolve query rows without trusting store ordering. Duplicate rows for the
|
|
4
|
+
* same account/person pair are harmless; distinct accounts or Persons fail
|
|
5
|
+
* closed so WhatsApp never authenticates an arbitrary legacy identity.
|
|
6
|
+
*/
|
|
7
|
+
export function resolveTelephoneAccount(rows) {
|
|
8
|
+
const unique = new Map();
|
|
9
|
+
for (const row of rows || []) {
|
|
10
|
+
if (!(row === null || row === void 0 ? void 0 : row.accountOf))
|
|
11
|
+
continue;
|
|
12
|
+
const accountId = row.id || '';
|
|
13
|
+
const personId = row.accountOf.id || '';
|
|
14
|
+
unique.set(`${accountId}\u0000${personId}`, row);
|
|
15
|
+
}
|
|
16
|
+
if (unique.size === 0)
|
|
17
|
+
return { kind: 'none' };
|
|
18
|
+
if (unique.size === 1)
|
|
19
|
+
return { kind: 'one', account: [...unique.values()][0] };
|
|
20
|
+
return {
|
|
21
|
+
kind: 'ambiguous',
|
|
22
|
+
accountIds: [...new Set([...unique.values()].map((row) => row.id || ''))]
|
|
23
|
+
.filter(Boolean)
|
|
24
|
+
.sort(),
|
|
25
|
+
personIds: [
|
|
26
|
+
...new Set([...unique.values()].map((row) => { var _a; return ((_a = row.accountOf) === null || _a === void 0 ? void 0 : _a.id) || ''; })),
|
|
27
|
+
]
|
|
28
|
+
.filter(Boolean)
|
|
29
|
+
.sort(),
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
export class AmbiguousTelephoneIdentityError extends Error {
|
|
33
|
+
constructor(resolution) {
|
|
34
|
+
super('Multiple accounts use this phone number');
|
|
35
|
+
this.resolution = resolution;
|
|
36
|
+
this.code = AMBIGUOUS_TELEPHONE_IDENTITY;
|
|
37
|
+
this.name = 'AmbiguousTelephoneIdentityError';
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
//# sourceMappingURL=telephoneAccount.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"telephoneAccount.js","sourceRoot":"","sources":["../../../src/utils/telephoneAccount.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,4BAA4B,GAAG,8BAA8B,CAAC;AAY3E;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CACrC,IAA4B;IAE5B,MAAM,MAAM,GAAG,IAAI,GAAG,EAAa,CAAC;IAEpC,KAAK,MAAM,GAAG,IAAI,IAAI,IAAI,EAAE,EAAE,CAAC;QAC7B,IAAI,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,SAAS,CAAA;YAAE,SAAS;QAC9B,MAAM,SAAS,GAAG,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC;QACxC,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,SAAS,QAAQ,EAAE,EAAE,GAAG,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC/C,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEhF,OAAO;QACL,IAAI,EAAE,WAAW;QACjB,UAAU,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;aACtE,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,EAAE;QACT,SAAS,EAAE;YACT,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,GAAG,CAAC,SAAS,0CAAE,EAAE,KAAI,EAAE,CAAA,EAAA,CAAC,CAAC;SACvE;aACE,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,EAAE;KACV,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,+BAAgC,SAAQ,KAAK;IAGxD,YAAqB,UAA2E;QAC9F,KAAK,CAAC,yCAAyC,CAAC,CAAC;QAD9B,eAAU,GAAV,UAAU,CAAiE;QAFvF,SAAI,GAAG,4BAA4B,CAAC;QAI3C,IAAI,CAAC,IAAI,GAAG,iCAAiC,CAAC;IAChD,CAAC;CACF","sourcesContent":["export const AMBIGUOUS_TELEPHONE_IDENTITY = 'AMBIGUOUS_TELEPHONE_IDENTITY';\n\ntype AccountWithPerson = {\n id?: string;\n accountOf?: { id?: string } | null;\n};\n\nexport type TelephoneAccountResolution<T extends AccountWithPerson> =\n | { kind: 'none' }\n | { kind: 'one'; account: T }\n | { kind: 'ambiguous'; accountIds: string[]; personIds: string[] };\n\n/**\n * Resolve query rows without trusting store ordering. Duplicate rows for the\n * same account/person pair are harmless; distinct accounts or Persons fail\n * closed so WhatsApp never authenticates an arbitrary legacy identity.\n */\nexport function resolveTelephoneAccount<T extends AccountWithPerson>(\n rows: T[] | null | undefined\n): TelephoneAccountResolution<T> {\n const unique = new Map<string, T>();\n\n for (const row of rows || []) {\n if (!row?.accountOf) continue;\n const accountId = row.id || '';\n const personId = row.accountOf.id || '';\n unique.set(`${accountId}\\u0000${personId}`, row);\n }\n\n if (unique.size === 0) return { kind: 'none' };\n if (unique.size === 1) return { kind: 'one', account: [...unique.values()][0] };\n\n return {\n kind: 'ambiguous',\n accountIds: [...new Set([...unique.values()].map((row) => row.id || ''))]\n .filter(Boolean)\n .sort(),\n personIds: [\n ...new Set([...unique.values()].map((row) => row.accountOf?.id || '')),\n ]\n .filter(Boolean)\n .sort(),\n };\n}\n\nexport class AmbiguousTelephoneIdentityError extends Error {\n readonly code = AMBIGUOUS_TELEPHONE_IDENTITY;\n\n constructor(readonly resolution: Extract<TelephoneAccountResolution<any>, { kind: 'ambiguous' }>) {\n super('Multiple accounts use this phone number');\n this.name = 'AmbiguousTelephoneIdentityError';\n }\n}\n\n"]}
|
package/package.json
CHANGED
|
@@ -151,3 +151,14 @@ test('WhatsApp sign-in passes the refresh token expiry to updateAuth', async ()
|
|
|
151
151
|
assert.match(source, /refreshTokenExpiresIn:\s*response\.refreshTokenExpiresIn/);
|
|
152
152
|
assert.match(source, /refreshTokenExpiresAt:\s*response\.refreshTokenExpiresAt/);
|
|
153
153
|
});
|
|
154
|
+
|
|
155
|
+
test('WhatsApp verification uses an accessible numeric OTP field', async () => {
|
|
156
|
+
const source = await readFile(
|
|
157
|
+
new URL('../lib/esm/components/SignInWithWhatsapp.js', import.meta.url),
|
|
158
|
+
'utf8'
|
|
159
|
+
);
|
|
160
|
+
assert.match(source, /pattern:\s*REGEXP_ONLY_DIGITS/);
|
|
161
|
+
assert.match(source, /inputMode:\s*"numeric"/);
|
|
162
|
+
assert.match(source, /autoComplete:\s*"one-time-code"/);
|
|
163
|
+
assert.match(source, /"aria-label":\s*otpLabel/);
|
|
164
|
+
});
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import test from 'node:test';
|
|
3
|
+
|
|
4
|
+
import {
|
|
5
|
+
AMBIGUOUS_TELEPHONE_IDENTITY,
|
|
6
|
+
AmbiguousTelephoneIdentityError,
|
|
7
|
+
resolveTelephoneAccount,
|
|
8
|
+
} from '../lib/esm/utils/telephoneAccount.js';
|
|
9
|
+
|
|
10
|
+
const account = (id, personId) => ({ id, accountOf: { id: personId } });
|
|
11
|
+
|
|
12
|
+
test('normalized unique telephone selects exactly one Person', () => {
|
|
13
|
+
const selected = account('urn:account:1', 'urn:person:1');
|
|
14
|
+
assert.deepEqual(resolveTelephoneAccount([selected]), {
|
|
15
|
+
kind: 'one',
|
|
16
|
+
account: selected,
|
|
17
|
+
});
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
test('telephone absent selects the existing new-account path', () => {
|
|
21
|
+
assert.deepEqual(resolveTelephoneAccount([]), { kind: 'none' });
|
|
22
|
+
assert.deepEqual(resolveTelephoneAccount(null), { kind: 'none' });
|
|
23
|
+
});
|
|
24
|
+
|
|
25
|
+
test('telephone ambiguous refuses to select an arbitrary Person', () => {
|
|
26
|
+
const resolution = resolveTelephoneAccount([
|
|
27
|
+
account('urn:account:b', 'urn:person:b'),
|
|
28
|
+
account('urn:account:a', 'urn:person:a'),
|
|
29
|
+
]);
|
|
30
|
+
assert.deepEqual(resolution, {
|
|
31
|
+
kind: 'ambiguous',
|
|
32
|
+
accountIds: ['urn:account:a', 'urn:account:b'],
|
|
33
|
+
personIds: ['urn:person:a', 'urn:person:b'],
|
|
34
|
+
});
|
|
35
|
+
assert.equal('account' in resolution, false);
|
|
36
|
+
const error = new AmbiguousTelephoneIdentityError(resolution);
|
|
37
|
+
assert.equal(error.code, AMBIGUOUS_TELEPHONE_IDENTITY);
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
test('legacy placeholder telephone fails closed for multiple Persons', () => {
|
|
41
|
+
const resolution = resolveTelephoneAccount([
|
|
42
|
+
account('urn:account:placeholder-a', 'urn:person:placeholder-a'),
|
|
43
|
+
account('urn:account:placeholder-b', 'urn:person:placeholder-b'),
|
|
44
|
+
]);
|
|
45
|
+
assert.equal(resolution.kind, 'ambiguous');
|
|
46
|
+
assert.equal('account' in resolution, false);
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
test('duplicate query rows for one account and Person deduplicate', () => {
|
|
50
|
+
const selected = account('urn:account:1', 'urn:person:1');
|
|
51
|
+
const resolution = resolveTelephoneAccount([
|
|
52
|
+
selected,
|
|
53
|
+
account('urn:account:1', 'urn:person:1'),
|
|
54
|
+
]);
|
|
55
|
+
assert.equal(resolution.kind, 'one');
|
|
56
|
+
assert.equal(resolution.account.id, 'urn:account:1');
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
test('one account linked to distinct Persons is ambiguous', () => {
|
|
60
|
+
const resolution = resolveTelephoneAccount([
|
|
61
|
+
account('urn:account:1', 'urn:person:1'),
|
|
62
|
+
account('urn:account:1', 'urn:person:2'),
|
|
63
|
+
]);
|
|
64
|
+
assert.equal(resolution.kind, 'ambiguous');
|
|
65
|
+
assert.deepEqual(resolution.personIds, ['urn:person:1', 'urn:person:2']);
|
|
66
|
+
});
|
|
67
|
+
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import test from 'node:test';
|
|
3
|
+
import CapacitorBackendProvider from '../lib/esm/backend.js';
|
|
4
|
+
|
|
5
|
+
const makeProvider = () => {
|
|
6
|
+
const provider = Object.create(CapacitorBackendProvider.prototype);
|
|
7
|
+
Object.defineProperty(provider, 'request', { value: { session: {} } });
|
|
8
|
+
provider.generateOTP = () => 123456;
|
|
9
|
+
return provider;
|
|
10
|
+
};
|
|
11
|
+
|
|
12
|
+
const setEnv = (t, key, value) => {
|
|
13
|
+
const previous = process.env[key];
|
|
14
|
+
process.env[key] = value;
|
|
15
|
+
t.after(() => {
|
|
16
|
+
if (previous === undefined) delete process.env[key];
|
|
17
|
+
else process.env[key] = previous;
|
|
18
|
+
});
|
|
19
|
+
};
|
|
20
|
+
|
|
21
|
+
test('WhatsApp send uses the API key and configured authentication template', async (t) => {
|
|
22
|
+
t.mock.method(globalThis, 'fetch', async (_url, options) => {
|
|
23
|
+
const payload = JSON.parse(options.body);
|
|
24
|
+
assert.equal(options.headers['D360-API-KEY'], 'test-key');
|
|
25
|
+
assert.equal(options.headers.Authorization, undefined);
|
|
26
|
+
assert.equal(payload.template.name, 'authentication_test');
|
|
27
|
+
assert.equal(payload.to, '15551234567');
|
|
28
|
+
assert.equal(payload.template.language.code, 'en');
|
|
29
|
+
assert.equal(payload.template.components[0].parameters[0].text, 123456);
|
|
30
|
+
assert.equal(payload.template.components[1].parameters[0].text, '123456');
|
|
31
|
+
return { ok: true, json: async () => ({ messages: [{ id: 'test-message' }] }) };
|
|
32
|
+
});
|
|
33
|
+
t.mock.method(console, 'log', () => {
|
|
34
|
+
throw new Error('OTP must never be logged');
|
|
35
|
+
});
|
|
36
|
+
setEnv(t, 'WA_D360_API_KEY', 'test-key');
|
|
37
|
+
setEnv(t, 'WA_D360_TEMPLATE_NAME', 'authentication_test');
|
|
38
|
+
const provider = makeProvider();
|
|
39
|
+
assert.deepEqual(await provider.generateOTPWhatsapp('+1 555 123 4567'), { sent: true });
|
|
40
|
+
assert.equal(provider.request.session.otp, 123456);
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
test('a rejected WhatsApp request never enables an 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 }));
|
|
47
|
+
t.mock.method(console, 'error', () => {});
|
|
48
|
+
const provider = makeProvider();
|
|
49
|
+
await assert.rejects(
|
|
50
|
+
provider.generateOTPWhatsapp('15551234567'),
|
|
51
|
+
/Could not send the code/
|
|
52
|
+
);
|
|
53
|
+
assert.equal(provider.request.session.otp, undefined);
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
test('a provider response without a message id never enables an 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 () => ({}) }));
|
|
60
|
+
t.mock.method(console, 'error', () => {});
|
|
61
|
+
const provider = makeProvider();
|
|
62
|
+
await assert.rejects(
|
|
63
|
+
provider.generateOTPWhatsapp('15551234567'),
|
|
64
|
+
/Could not send the code/
|
|
65
|
+
);
|
|
66
|
+
assert.equal(provider.request.session.otp, undefined);
|
|
67
|
+
});
|