mokhtar/shellphone.app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make a phone call ~ not really working

Browse Source
This commit is contained in:
m5r
2022-05-24 23:13:08 +02:00
parent c9c1784dd7
commit 8ad21ae9e1
15 changed files with 794 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/utils/auth.server.ts
View File

@ -11,7 +11,7 @@ import { commitSession, destroySession, getSession } from "./session.server";
type SessionTwilioAccount = Pick<
TwilioAccount,
"accountSid" | "accountAuthToken" | "subAccountSid" | "subAccountAuthToken" | "twimlAppSid"
"accountSid" | "subAccountSid" | "subAccountAuthToken" | "apiKeySid" | "apiKeySecret" | "twimlAppSid"
>;
type SessionOrganization = Pick<Organization, "id"> & { role: MembershipRole };
type SessionPhoneNumber = Pick<PhoneNumber, "id" | "number">;
@ -106,7 +106,6 @@ export async function authenticate({
headers: request.headers,
});
const sessionData = await authenticator.authenticate("email-password", signInRequest, { failureRedirect });
console.log("sessionKey", authenticator.sessionKey);
const session = await getSession(request);
session.set(authenticator.sessionKey, sessionData);
const redirectTo = successRedirect ?? "/messages";
@ -181,9 +180,10 @@ async function buildSessionData(id: string): Promise<SessionData> {
twilioAccount: {
select: {
accountSid: true,
accountAuthToken: true,
subAccountSid: true,
subAccountAuthToken: true,
apiKeySid: true,
apiKeySecret: true,
twimlAppSid: true,
},
},

2
app/utils/twilio.server.ts
View File

@ -15,7 +15,7 @@ export default function getTwilioClient({
throw new Error("unreachable");
}
return twilio(subAccountSid, serverConfig.twilio.authToken, {
return twilio(subAccountSid, subAccountAuthToken ?? serverConfig.twilio.authToken, {
accountSid,
});
}