From 23eee6efb8a700669cbc86b30852914ba47db940 Mon Sep 17 00:00:00 2001 From: Dobromir Popov Date: Wed, 29 May 2024 01:50:54 +0300 Subject: [PATCH 1/2] todos --- _doc/ToDo.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/_doc/ToDo.md b/_doc/ToDo.md index 9333d0b..59fc75d 100644 --- a/_doc/ToDo.md +++ b/_doc/ToDo.md @@ -254,3 +254,10 @@ in schedule admin - if a publisher is always pair & family is not in the shift - [] improve reports page(s) + +[] fix transport UI +[] revise import/export to word +[] allow keyman/scheduler role +[] allow blocking of inputs (different from publishing) + + From e07fd5f02a18b96c7e763ee1291da868d79d75f8 Mon Sep 17 00:00:00 2001 From: Dobromir Popov Date: Wed, 29 May 2024 12:26:04 +0300 Subject: [PATCH 2/2] fix local user email confirmation emails --- pages/api/auth/[...nextauth].ts | 4 ++++ src/helpers/email.js | 1 + 2 files changed, 5 insertions(+) diff --git a/pages/api/auth/[...nextauth].ts b/pages/api/auth/[...nextauth].ts index 44dbc53..428f78e 100644 --- a/pages/api/auth/[...nextauth].ts +++ b/pages/api/auth/[...nextauth].ts @@ -19,6 +19,7 @@ import AzureADProvider from "next-auth/providers/azure-ad"; const common = require("../../../src/helpers/common"); import { isLoggedIn, setAuthTokens, clearAuthTokens, getAccessToken, getRefreshToken } from 'axios-jwt' import { create } from "domain" +import { logger } from "src/helpers/common" //console.log("appleID:", process.env.APPLE_APP_ID); @@ -96,6 +97,8 @@ export const authOptions: NextAuthOptions = { where: { email: credentials.username }, data: { emailVerifyToken: emailVerifyToken } }); + console.log("resending email verification token to ", credentials.username); + logger.info("resending email verification token to ", credentials.username); emailHelper.SendEmail_ValidateTemplate(credentials.username, emailVerifyToken); throw new Error('Моля потвърди имейла си преди да влезеш в системата.'); } @@ -130,6 +133,7 @@ export const authOptions: NextAuthOptions = { } }); console.log("New local credential user created for publisher ", pub.firstName, " ", pub.lastName, " (", pub.email, ")"); + logger.info("New local credential user created for publisher ", pub.firstName, " ", pub.lastName, " (", pub.email, ")"); emailHelper.SendEmail_ValidateTemplate(pub.email, emailVerifyToken, pub.firstName, pub.lastName); //return newUser; throw new Error("Моля проверете вашия имейл '" + credentials?.username + "' за да потвърдите регистрацията си."); diff --git a/src/helpers/email.js b/src/helpers/email.js index 3d8f658..1ae49ce 100644 --- a/src/helpers/email.js +++ b/src/helpers/email.js @@ -6,6 +6,7 @@ const { MailtrapClient } = require("mailtrap"); const nodemailer = require("nodemailer"); const CON = require("./const"); const CAL = require("./calendar"); +const common = require("./common"); const Handlebars = require('handlebars'); // const { google } = require("googleapis");