Updates
This commit is contained in:
+2
-2
@@ -60,7 +60,7 @@ export default async function loginUser({
|
||||
dbUserId,
|
||||
debug,
|
||||
}: Param): Promise<APILoginFunctionReturn> {
|
||||
const grabedHostNames = grabHostNames();
|
||||
const grabedHostNames = grabHostNames({ userId: user_id || apiUserID });
|
||||
const { host, port, scheme } = grabedHostNames;
|
||||
|
||||
const defaultTempLoginFieldName = "temp_login_code";
|
||||
@@ -231,7 +231,7 @@ export default async function loginUser({
|
||||
|
||||
const cookieNames = getAuthCookieNames({
|
||||
database,
|
||||
userId: apiUserID || user_id || grabedHostNames.user_id,
|
||||
userId: grabedHostNames.user_id,
|
||||
});
|
||||
|
||||
if (httpResponse.csrf && !skipWriteAuthFile) {
|
||||
|
||||
+4
-1
@@ -5,6 +5,7 @@ import { checkAuthFile } from "../package-shared/functions/backend/auth/write-au
|
||||
import parseCookies from "../package-shared/utils/backend/parseCookies";
|
||||
import { AuthenticatedUser } from "../package-shared/types";
|
||||
import getCsrfHeaderName from "../utils/get-csrf-header-name";
|
||||
import grabHostNames from "../package-shared/utils/grab-host-names";
|
||||
|
||||
const minuteInMilliseconds = 60000;
|
||||
const hourInMilliseconds = minuteInMilliseconds * 60;
|
||||
@@ -51,6 +52,8 @@ export default function userAuth({
|
||||
try {
|
||||
const finalRequest = req || request;
|
||||
|
||||
const { user_id } = grabHostNames({ userId: dsqlUserId });
|
||||
|
||||
const cookies = parseCookies({
|
||||
request: finalRequest,
|
||||
cookieString,
|
||||
@@ -61,7 +64,7 @@ export default function userAuth({
|
||||
}
|
||||
|
||||
const keyNames = getAuthCookieNames({
|
||||
userId: dsqlUserId || process.env.DSQL_API_USER_ID,
|
||||
userId: user_id,
|
||||
database: database || process.env.DSQL_DB_NAME,
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user