mirror of
https://github.com/sasjs/server.git
synced 2026-01-12 00:30:06 +00:00
feat: replace ID with UID
BREAKING CHANGE: remove auto incremental ids from user, group and permissions and add a virtual uid property that returns string value of documents object id
This commit is contained in:
@@ -22,7 +22,7 @@ export const getPreProgramVariables = (req: Request): PreProgramVars => {
|
||||
//So this is workaround.
|
||||
return {
|
||||
username: user ? user.username : 'demo',
|
||||
userId: user ? user.userId : 0,
|
||||
userId: user ? user.userId : 'demoId',
|
||||
displayName: user ? user.displayName : 'demo',
|
||||
serverUrl: protocol + host,
|
||||
httpHeaders
|
||||
|
||||
@@ -4,7 +4,7 @@ import User from '../model/User'
|
||||
const isValidToken = async (
|
||||
token: string,
|
||||
key: string,
|
||||
userId: number,
|
||||
userId: string,
|
||||
clientId: string
|
||||
) => {
|
||||
const promise = new Promise<boolean>((resolve, reject) =>
|
||||
@@ -22,8 +22,8 @@ const isValidToken = async (
|
||||
return await promise.then(() => true).catch(() => false)
|
||||
}
|
||||
|
||||
export const getTokensFromDB = async (userId: number, clientId: string) => {
|
||||
const user = await User.findOne({ id: userId })
|
||||
export const getTokensFromDB = async (userId: string, clientId: string) => {
|
||||
const user = await User.findOne({ _id: userId })
|
||||
if (!user) return
|
||||
|
||||
const currentTokenObj = user.tokens.find(
|
||||
|
||||
@@ -22,7 +22,7 @@ export const isPublicRoute = async (req: Request): Promise<boolean> => {
|
||||
}
|
||||
|
||||
export const publicUser: RequestUser = {
|
||||
userId: 0,
|
||||
userId: 'public_user_id',
|
||||
clientId: 'public_app',
|
||||
username: 'publicUser',
|
||||
displayName: 'Public User',
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import User from '../model/User'
|
||||
|
||||
export const removeTokensInDB = async (userId: number, clientId: string) => {
|
||||
const user = await User.findOne({ id: userId })
|
||||
export const removeTokensInDB = async (userId: string, clientId: string) => {
|
||||
const user = await User.findOne({ _id: userId })
|
||||
if (!user) return
|
||||
|
||||
const tokenObjIndex = user.tokens.findIndex(
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import User from '../model/User'
|
||||
|
||||
export const saveTokensInDB = async (
|
||||
userId: number,
|
||||
userId: string,
|
||||
clientId: string,
|
||||
accessToken: string,
|
||||
refreshToken: string
|
||||
) => {
|
||||
const user = await User.findOne({ id: userId })
|
||||
const user = await User.findOne({ _id: userId })
|
||||
if (!user) return
|
||||
|
||||
const currentTokenObj = user.tokens.find(
|
||||
|
||||
@@ -82,7 +82,7 @@ export const seedDB = async (): Promise<ConfigurationType> => {
|
||||
}
|
||||
|
||||
export const ALL_USERS_GROUP = {
|
||||
name: 'AllUsers',
|
||||
name: 'all-users',
|
||||
description: 'Group contains all users'
|
||||
}
|
||||
|
||||
|
||||
@@ -113,7 +113,7 @@ export const registerPermissionValidation = (data: any): Joi.ValidationResult =>
|
||||
principalType: Joi.string()
|
||||
.required()
|
||||
.valid(...Object.values(PrincipalType)),
|
||||
principalId: Joi.number().required()
|
||||
principalId: Joi.string().required()
|
||||
}).validate(data)
|
||||
|
||||
export const updatePermissionValidation = (data: any): Joi.ValidationResult =>
|
||||
|
||||
@@ -4,7 +4,7 @@ import { RequestUser } from '../types'
|
||||
export const fetchLatestAutoExec = async (
|
||||
reqUser: RequestUser
|
||||
): Promise<RequestUser | undefined> => {
|
||||
const dbUser = await User.findOne({ id: reqUser.userId })
|
||||
const dbUser = await User.findOne({ _id: reqUser.userId })
|
||||
|
||||
if (!dbUser) return undefined
|
||||
|
||||
@@ -26,7 +26,7 @@ export const verifyTokenInDB = async (
|
||||
token: string,
|
||||
tokenType: 'accessToken' | 'refreshToken'
|
||||
): Promise<RequestUser | undefined> => {
|
||||
const dbUser = await User.findOne({ id: userId })
|
||||
const dbUser = await User.findOne({ _id: userId })
|
||||
|
||||
if (!dbUser) return undefined
|
||||
|
||||
|
||||
Reference in New Issue
Block a user