mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-16 16:30:15 +01:00
🚩 feat: Add --provider flag to create-user script (#10572)
As we're using google authentication without automatic sign-up, we need a way to pass the provider to the user creation.
This commit is contained in:
parent
69c6d023e1
commit
e1fdd5b7e8
2 changed files with 18 additions and 18 deletions
|
|
@ -176,7 +176,7 @@ const registerUser = async (user, additionalData = {}) => {
|
||||||
return { status: 404, message: errorMessage };
|
return { status: 404, message: errorMessage };
|
||||||
}
|
}
|
||||||
|
|
||||||
const { email, password, name, username } = user;
|
const { email, password, name, username, provider } = user;
|
||||||
|
|
||||||
let newUserId;
|
let newUserId;
|
||||||
try {
|
try {
|
||||||
|
|
@ -207,7 +207,7 @@ const registerUser = async (user, additionalData = {}) => {
|
||||||
|
|
||||||
const salt = bcrypt.genSaltSync(10);
|
const salt = bcrypt.genSaltSync(10);
|
||||||
const newUserData = {
|
const newUserData = {
|
||||||
provider: 'local',
|
provider: provider ?? 'local',
|
||||||
email,
|
email,
|
||||||
username,
|
username,
|
||||||
name,
|
name,
|
||||||
|
|
|
||||||
|
|
@ -23,32 +23,32 @@ const connect = require('./connect');
|
||||||
console.purple('--------------------------');
|
console.purple('--------------------------');
|
||||||
}
|
}
|
||||||
|
|
||||||
let email = '';
|
|
||||||
let password = '';
|
|
||||||
let name = '';
|
|
||||||
let username = '';
|
|
||||||
let emailVerified = true;
|
|
||||||
|
|
||||||
// Parse command line arguments
|
// Parse command line arguments
|
||||||
|
let email, password, name, username, emailVerified, provider;
|
||||||
for (let i = 2; i < process.argv.length; i++) {
|
for (let i = 2; i < process.argv.length; i++) {
|
||||||
if (process.argv[i].startsWith('--email-verified=')) {
|
if (process.argv[i].startsWith('--email-verified=')) {
|
||||||
emailVerified = process.argv[i].split('=')[1].toLowerCase() !== 'false';
|
emailVerified = process.argv[i].split('=')[1].toLowerCase() !== 'false';
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!email) {
|
if (process.argv[i].startsWith('--provider=')) {
|
||||||
|
provider = process.argv[i].split('=')[1];
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (email === undefined) {
|
||||||
email = process.argv[i];
|
email = process.argv[i];
|
||||||
} else if (!name) {
|
} else if (name === undefined) {
|
||||||
name = process.argv[i];
|
name = process.argv[i];
|
||||||
} else if (!username) {
|
} else if (username === undefined) {
|
||||||
username = process.argv[i];
|
username = process.argv[i];
|
||||||
} else if (!password) {
|
} else if (password === undefined) {
|
||||||
console.red('Warning: password passed in as argument, this is not secure!');
|
console.red('Warning: password passed in as argument, this is not secure!');
|
||||||
password = process.argv[i];
|
password = process.argv[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!email) {
|
if (email === undefined) {
|
||||||
email = await askQuestion('Email:');
|
email = await askQuestion('Email:');
|
||||||
}
|
}
|
||||||
if (!email.includes('@')) {
|
if (!email.includes('@')) {
|
||||||
|
|
@ -57,19 +57,19 @@ const connect = require('./connect');
|
||||||
}
|
}
|
||||||
|
|
||||||
const defaultName = email.split('@')[0];
|
const defaultName = email.split('@')[0];
|
||||||
if (!name) {
|
if (name === undefined) {
|
||||||
name = await askQuestion('Name: (default is: ' + defaultName + ')');
|
name = await askQuestion('Name: (default is: ' + defaultName + ')');
|
||||||
if (!name) {
|
if (!name) {
|
||||||
name = defaultName;
|
name = defaultName;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!username) {
|
if (username === undefined) {
|
||||||
username = await askQuestion('Username: (default is: ' + defaultName + ')');
|
username = await askQuestion('Username: (default is: ' + defaultName + ')');
|
||||||
if (!username) {
|
if (!username) {
|
||||||
username = defaultName;
|
username = defaultName;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!password) {
|
if (password === undefined) {
|
||||||
password = await askQuestion('Password: (leave blank, to generate one)');
|
password = await askQuestion('Password: (leave blank, to generate one)');
|
||||||
if (!password) {
|
if (!password) {
|
||||||
password = Math.random().toString(36).slice(-18);
|
password = Math.random().toString(36).slice(-18);
|
||||||
|
|
@ -78,7 +78,7 @@ const connect = require('./connect');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only prompt for emailVerified if it wasn't set via CLI
|
// Only prompt for emailVerified if it wasn't set via CLI
|
||||||
if (!process.argv.some((arg) => arg.startsWith('--email-verified='))) {
|
if (emailVerified === undefined){
|
||||||
const emailVerifiedInput = await askQuestion(`Email verified? (Y/n, default is Y):
|
const emailVerifiedInput = await askQuestion(`Email verified? (Y/n, default is Y):
|
||||||
|
|
||||||
If \`y\`, the user's email will be considered verified.
|
If \`y\`, the user's email will be considered verified.
|
||||||
|
|
@ -99,7 +99,7 @@ or the user will need to attempt logging in to have a verification link sent to
|
||||||
silentExit(1);
|
silentExit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
const user = { email, password, name, username, confirm_password: password };
|
const user = { email, password, name, username, confirm_password: password, provider };
|
||||||
let result;
|
let result;
|
||||||
try {
|
try {
|
||||||
result = await registerUser(user, { emailVerified });
|
result = await registerUser(user, { emailVerified });
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue