Skip to content

Commit e7da750

Browse files
peter-isgfundsISGPete
andauthored
More complete support for custom passwordless connections (#2105)
* Better support custom passwordless connections Update passwordless actions so that `login` can use custom passwordless connection * Pass in required param Co-authored-by: ISGPete <peter@isgfunds.com.au>
1 parent df60350 commit e7da750

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

src/connection/passwordless/actions.js

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,17 @@ function resendEmailError(id, error) {
6767
swap(updateEntity, 'lock', id, setResendFailed);
6868
}
6969

70-
function sendEmail(m, successFn, errorFn) {
71-
const connections = l.connections(m, 'passwordless', 'email');
72-
const connectionName =
73-
connections.size > 0 && l.useCustomPasswordlessConnection(m)
74-
? connections.first().get('name')
75-
: 'email';
70+
function getPasswordlessConnectionName(m, defaultPasswordlessConnection) {
71+
const connections = l.connections(m, 'passwordless', defaultPasswordlessConnection);
72+
73+
return connections.size > 0 && l.useCustomPasswordlessConnection(m)
74+
? connections.first().get('name')
75+
: defaultPasswordlessConnection;
76+
}
7677

78+
function sendEmail(m, successFn, errorFn) {
7779
const params = {
78-
connection: connectionName,
80+
connection: getPasswordlessConnectionName(m, 'email'),
7981
email: c.getFieldValue(m, 'email'),
8082
send: send(m)
8183
};
@@ -95,14 +97,8 @@ function sendEmail(m, successFn, errorFn) {
9597

9698
export function sendSMS(id) {
9799
validateAndSubmit(id, ['phoneNumber'], m => {
98-
const connections = l.connections(m, 'passwordless', 'sms');
99-
const connectionName =
100-
connections.size > 0 && l.useCustomPasswordlessConnection(m)
101-
? connections.first().get('name')
102-
: 'sms';
103-
104100
const params = {
105-
connection: connectionName,
101+
connection: getPasswordlessConnectionName(m, 'sms'),
106102
phoneNumber: phoneNumberWithDiallingCode(m),
107103
send: send(m)
108104
};
@@ -139,10 +135,10 @@ export function logIn(id) {
139135
...authParams
140136
};
141137
if (isEmail(m)) {
142-
params.connection = 'email';
138+
params.connection = getPasswordlessConnectionName(m, 'email');
143139
params.email = c.getFieldValue(m, 'email');
144140
} else {
145-
params.connection = 'sms';
141+
params.connection = getPasswordlessConnectionName(m, 'sms');
146142
params.phoneNumber = phoneNumberWithDiallingCode(m);
147143
}
148144
swap(updateEntity, 'lock', id, l.setSubmitting, true);

0 commit comments

Comments
 (0)