mirror of
https://github.com/jambonz/jambonz-api-server.git
synced 2026-07-04 19:21:53 +00:00
Update register.js
This commit is contained in:
@@ -14,8 +14,8 @@ const {generateHashedPassword} = require('../../utils/password-utils');
|
||||
const sysError = require('../error');
|
||||
|
||||
const insertUserSql = `INSERT into users
|
||||
(user_sid, account_sid, name, email, provider, provider_userid, email_validated)
|
||||
values (?, ?, ?, ?, ?, ?, 1)`;
|
||||
(user_sid, account_sid, name, email, provider, provider_userid, email_validated, service_provider_sid)
|
||||
values (?, ?, ?, ?, ?, ?, 1, ?)`;
|
||||
const insertUserLocalSql = `INSERT into users
|
||||
(user_sid, account_sid, name, email, email_activation_code, email_validated, provider,
|
||||
hashed_password, service_provider_sid)
|
||||
@@ -63,7 +63,7 @@ const addLocalUser = async(logger, user_sid, account_sid,
|
||||
debug({r}, 'Result from adding user');
|
||||
};
|
||||
const addOauthUser = async(logger, user_sid, account_sid,
|
||||
name, email, provider, provider_userid) => {
|
||||
name, email, provider, provider_userid, service_provider_sid) => {
|
||||
const [r] = await promisePool.execute(insertUserSql,
|
||||
[
|
||||
user_sid,
|
||||
@@ -71,7 +71,8 @@ const addOauthUser = async(logger, user_sid, account_sid,
|
||||
name,
|
||||
email,
|
||||
provider,
|
||||
provider_userid
|
||||
provider_userid,
|
||||
service_provider_sid
|
||||
]);
|
||||
logger.debug({r}, 'Result from adding user');
|
||||
};
|
||||
@@ -301,7 +302,7 @@ router.post('/', async(req, res) => {
|
||||
else {
|
||||
await addOauthUser(logger, userProfile.user_sid, userProfile.account_sid,
|
||||
userProfile.name, userProfile.email, userProfile.provider,
|
||||
userProfile.provider_userid);
|
||||
userProfile.provider_userid, req.body.service_provider_sid);
|
||||
}
|
||||
|
||||
/* add hello-world and dial-time as starter applications */
|
||||
@@ -366,7 +367,7 @@ router.post('/', async(req, res) => {
|
||||
else {
|
||||
await addOauthUser(logger, userProfile.user_sid, userProfile.account_sid,
|
||||
userProfile.name, userProfile.email, userProfile.provider,
|
||||
userProfile.provider_userid);
|
||||
userProfile.provider_userid, req.body.service_provider_sid);
|
||||
|
||||
/* deactivate the old/replaced user */
|
||||
const [r] = await promisePool.execute('DELETE FROM users WHERE user_sid = ?', [user_sid]);
|
||||
|
||||
Reference in New Issue
Block a user