fixing verify token redirect
This commit is contained in:
@@ -32,11 +32,15 @@ const getNotificationErrorLogByIdDb = async (id) => {
|
|||||||
const getNotificationErrorLogByNotificationErrorIdDb = async (notificationErrorId) => {
|
const getNotificationErrorLogByNotificationErrorIdDb = async (notificationErrorId) => {
|
||||||
const queryText = `
|
const queryText = `
|
||||||
SELECT
|
SELECT
|
||||||
a.*,
|
a.notification_error_log_description,
|
||||||
b.contact_name,
|
a.created_at,
|
||||||
b.contact_type
|
b.contact_type,
|
||||||
|
c.user_fullname as created_by_name,
|
||||||
|
case when a.created_by is not null then c.user_fullname else b.contact_name end as contact_name,
|
||||||
|
case when a.created_by is not null then c.user_phone else a.contact_phone end as contact_phone
|
||||||
FROM notification_error_log a
|
FROM notification_error_log a
|
||||||
LEFT JOIN contact b ON a.contact_phone = b.contact_phone
|
LEFT JOIN contact b ON a.contact_phone = b.contact_phone
|
||||||
|
LEFT JOIN m_users c ON a.created_by = c.user_id
|
||||||
WHERE a.notification_error_id = $1 AND a.deleted_at IS NULL
|
WHERE a.notification_error_id = $1 AND a.deleted_at IS NULL
|
||||||
ORDER BY a.created_at DESC
|
ORDER BY a.created_at DESC
|
||||||
`;
|
`;
|
||||||
|
|||||||
@@ -15,7 +15,8 @@ const verifyAccess = (minLevel = 1, allowUnapprovedReadOnly = false) => {
|
|||||||
// Super Admin bypass semua
|
// Super Admin bypass semua
|
||||||
if (user.is_sa) return next();
|
if (user.is_sa) return next();
|
||||||
|
|
||||||
if (!isPhoneNumberID(user.user_id)) {
|
|
||||||
|
if (!isPhoneNumberID(user.user_id) && user.user_id) {
|
||||||
const fullUser = await getUserByIdDb(user.user_id);
|
const fullUser = await getUserByIdDb(user.user_id);
|
||||||
if (!fullUser) throw new ErrorHandler(403, "Forbidden: User not found");
|
if (!fullUser) throw new ErrorHandler(403, "Forbidden: User not found");
|
||||||
|
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ class NotifikasiWaService {
|
|||||||
const tokenRedirect = await generateTokenRedirect(
|
const tokenRedirect = await generateTokenRedirect(
|
||||||
dataUser.userPhone,
|
dataUser.userPhone,
|
||||||
dataUser.userName,
|
dataUser.userName,
|
||||||
dataUser.idData
|
resultNotificationError.notification_error_id
|
||||||
);
|
);
|
||||||
|
|
||||||
const encodedToken = encodeURIComponent(tokenRedirect);
|
const encodedToken = encodeURIComponent(tokenRedirect);
|
||||||
|
|||||||
Reference in New Issue
Block a user