tidy up
This commit is contained in:
parent
af7bddcf22
commit
11e64b0ffe
|
@ -19,10 +19,7 @@ const accounts = require("./cloud/accounts")
|
||||||
const { hash } = require("./hashing")
|
const { hash } = require("./hashing")
|
||||||
const userCache = require("./cache/user")
|
const userCache = require("./cache/user")
|
||||||
const env = require("./environment")
|
const env = require("./environment")
|
||||||
const {
|
const { getUserSessions, invalidateSessions } = require("./security/sessions")
|
||||||
getSessionsForUser,
|
|
||||||
invalidateSessions,
|
|
||||||
} = require("./security/sessions")
|
|
||||||
|
|
||||||
const APP_PREFIX = DocumentTypes.APP + SEPARATOR
|
const APP_PREFIX = DocumentTypes.APP + SEPARATOR
|
||||||
|
|
||||||
|
@ -249,7 +246,7 @@ exports.platformLogout = async ({
|
||||||
sessionId,
|
sessionId,
|
||||||
keepActiveSession,
|
keepActiveSession,
|
||||||
}) => {
|
}) => {
|
||||||
let sessions = await getSessionsForUser(userId)
|
let sessions = await getUserSessions(userId)
|
||||||
|
|
||||||
if (keepActiveSession) {
|
if (keepActiveSession) {
|
||||||
sessions = sessions.filter(session => session.sessionId !== sessionId)
|
sessions = sessions.filter(session => session.sessionId !== sessionId)
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
const FORMULA_TYPE = FIELDS.FORMULA.type
|
const FORMULA_TYPE = FIELDS.FORMULA.type
|
||||||
const LINK_TYPE = FIELDS.LINK.type
|
const LINK_TYPE = FIELDS.LINK.type
|
||||||
const dispatch = createEventDispatcher()
|
const dispatch = createEventDispatcher()
|
||||||
const PROHIBITED_COLUMN_NAMES = ["type", "_id", "_rev"]
|
const PROHIBITED_COLUMN_NAMES = ["type", "_id", "_rev", "tableId"]
|
||||||
const { hide } = getContext(Context.Modal)
|
const { hide } = getContext(Context.Modal)
|
||||||
let fieldDefinitions = cloneDeep(FIELDS)
|
let fieldDefinitions = cloneDeep(FIELDS)
|
||||||
|
|
||||||
|
@ -206,7 +206,7 @@
|
||||||
bind:value={field.name}
|
bind:value={field.name}
|
||||||
disabled={uneditable || (linkEditDisabled && field.type === LINK_TYPE)}
|
disabled={uneditable || (linkEditDisabled && field.type === LINK_TYPE)}
|
||||||
error={columnNameInvalid
|
error={columnNameInvalid
|
||||||
? "type, _id and _rev are disallowed as column names"
|
? `${PROHIBITED_COLUMN_NAMES.join(", ")} are not allowed as column names`
|
||||||
: ""}
|
: ""}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
|
@ -156,7 +156,6 @@ module PostgresModule {
|
||||||
|
|
||||||
let newConfig = {
|
let newConfig = {
|
||||||
...this.config,
|
...this.config,
|
||||||
// ssl: this.config.ssl ? { rejectUnauthorized: true } : undefined,
|
|
||||||
ssl: this.config.ssl
|
ssl: this.config.ssl
|
||||||
? {
|
? {
|
||||||
rejectUnauthorized: this.config.rejectUnauthorized,
|
rejectUnauthorized: this.config.rejectUnauthorized,
|
||||||
|
|
Loading…
Reference in New Issue