Skip to content

Commit

Permalink
👤 fix: Create User with timestamps (#3070)
Browse files Browse the repository at this point in the history
* 👤 fix: Create User with timestamps

* chore: fix lint script to ignore venv

* chore: linting
  • Loading branch information
danny-avila authored Jun 15, 2024
1 parent bcaa7d5 commit 04502e9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
6 changes: 3 additions & 3 deletions api/models/userMethods.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@ const updateUser = async function (userId, updateData) {
const createUser = async (data, disableTTL = true) => {
const userData = {
...data,
expiresAt: new Date(Date.now() + 604800 * 1000), // 1 week in milliseconds
expiresAt: disableTTL ? null : new Date(Date.now() + 604800 * 1000), // 1 week in milliseconds
};

if (disableTTL) {
delete userData.expiresAt;
}

try {
const result = await User.collection.insertOne(userData);
return result.insertedId;
const user = await User.create(userData);
return user._id;
} catch (error) {
if (error.code === 11000) {
// Duplicate key error code
Expand Down
10 changes: 5 additions & 5 deletions api/strategies/openidStrategy.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ function convertToUsername(input, defaultValue = '') {
async function setupOpenId() {
try {
if (process.env.PROXY) {
const proxyAgent = new HttpsProxyAgent(process.env.PROXY);
custom.setHttpOptionsDefaults({
agent: proxyAgent
});
logger.info(`[openidStrategy] proxy agent added: ${process.env.PROXY}`);
const proxyAgent = new HttpsProxyAgent(process.env.PROXY);
custom.setHttpOptionsDefaults({
agent: proxyAgent,
});
logger.info(`[openidStrategy] proxy agent added: ${process.env.PROXY}`);
}
const issuer = await Issuer.discover(process.env.OPENID_ISSUER);
const client = new issuer.Client({
Expand Down
1 change: 0 additions & 1 deletion client/src/components/Chat/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { Constants } from 'librechat-data-provider';
import { useGetStartupConfig } from 'librechat-data-provider/react-query';
import { useLocalize } from '~/hooks';


export default function Footer({ className }: { className?: string }) {
const { data: config } = useGetStartupConfig();
const localize = useLocalize();
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
"e2e:update": "playwright test --config=e2e/playwright.config.js --update-snapshots",
"e2e:report": "npx playwright show-report e2e/playwright-report",
"prepare": "node config/prepare.js",
"lint:fix": "eslint --fix \"{,!(node_modules)/**/}*.{js,jsx,ts,tsx}\"",
"lint": "eslint \"{,!(node_modules)/**/}*.{js,jsx,ts,tsx}\"",
"format": "prettier-eslint --write \"{,!(node_modules)/**/}*.{js,jsx,ts,tsx}\"",
"lint:fix": "eslint --fix \"{,!(node_modules|venv)/**/}*.{js,jsx,ts,tsx}\"",
"lint": "eslint \"{,!(node_modules|venv)/**/}*.{js,jsx,ts,tsx}\"",
"format": "prettier-eslint --write \"{,!(node_modules|venv)/**/}*.{js,jsx,ts,tsx}\"",
"b:api": "NODE_ENV=production bun run api/server/index.js",
"b:api-inspect": "NODE_ENV=production bun --inspect run api/server/index.js",
"b:api:dev": "NODE_ENV=production bun run --watch api/server/index.js",
Expand Down

0 comments on commit 04502e9

Please sign in to comment.