@ozdao/prometheus-framework 0.2.22 → 0.2.24

package/src/modules/auth/components/pages/EnterCode.vue

@@ -1,9 +1,11 @@
 <template>
 	<section class="t-center pd-medium">
 		<!-- <img src="@/assets/images/icons/message1.png" class="i-extra mn-b-small"> -->
+
 		<h3 class="mn-b-medium">
 			{{ t('verifyNumberTitle') }}
 		</h3>
+
 		<p class="mn-b-big t-transp">{{ t('instructions') }}</p>
 
 		<div class="w-100 mn-b-big flex-nowrap flex">
@@ -26,12 +28,33 @@
 				@keydown="($event) => onKeyDown($event, 1)" 
 				class="w-100 h1 pd-small t-center bg-grey radius-small mn-r-small"
 			>
-			<input type="number" v-model="state.digits[2]" maxlength="1" @input="onInput(2)" @paste="($event) => onPaste($event, 2)" @keydown="($event) => onKeyDown($event, 2)" class="w-100 h1 pd-small t-center bg-grey radius-small mn-r-small">
-			<input type="number" v-model="state.digits[3]" maxlength="1" @input="onInput(3)" @paste="($event) => onPaste($event, 3)" @keydown="($event) => onKeyDown($event, 3)" class="w-100 h1 pd-small t-center bg-grey radius-small">
+			<input 
+				type="number" 
+				v-model="state.digits[2]" 
+				maxlength="1" 
+				@input="onInput(2)" 
+				@paste="($event) => onPaste($event, 2)" 
+				@keydown="($event) => onKeyDown($event, 2)" 
+				class="w-100 h1 pd-small t-center bg-grey radius-small mn-r-small"
+			>
+			<input 
+				type="number" 
+				v-model="state.digits[3]" 
+				maxlength="1" 
+				@input="onInput(3)" 
+				@paste="($event) => onPaste($event, 3)" 
+				@keydown="($event) => onKeyDown($event, 3)" 
+				class="w-100 h1 pd-small t-center bg-grey radius-small"
+			>
     	</div>
 
-		<a v-if="resendTimer < 1" @click="sendAgain" class="t-blue">{{ t('resendCode') }}</a>
-		<span v-else>{{resendTimer}} {{ t('secondsResend') }}</span>
+		<a v-if="resendTimer < 1" @click="sendAgain" class="t-blue">
+			{{ t('resendCode') }}
+		</a>
+
+		<span v-else>
+			{{resendTimer}} {{ t('secondsResend') }}
+		</span>
 	</section>
 </template>
 
@@ -63,9 +86,6 @@
 	watch(
 	    () => state.digits[0],
 	    (newVal) => {
-	        console.log(String(newVal));
-	        console.log(String(newVal).length);
-
 	        if (newVal && String(newVal).length > 1) {
 	            let newValArray = String(newVal).split('');
 	            console.log(newValArray);
@@ -91,20 +111,24 @@
 
 	async function sendAgain () {
 		try {
-	  	await twofa.sendCode(auth.state.user, route.query.type, auth.state.user.phone ? 'phone' : 'email')
-
-	  	resendTimer.value = 30;
-
-      // Start the timer using `setInterval()`
-      const timer = setInterval(() => {
-        if (resendTimer.value > 0) {
-          // Decrement the timer by 1 second
-          resendTimer.value -= 1;
-        } else {
-          // Stop the timer when it reaches 0 seconds
-          clearInterval(timer);
-        }
-      }, 1000);
+		  	await twofa.sendCode(
+		  		auth.state.user, 
+		  		route.query.method, 
+		  		route.query.type, 
+		  	)
+
+		  	resendTimer.value = 30;
+
+	     	// Start the timer using `setInterval()`
+	      	const timer = setInterval(() => {
+		        if (resendTimer.value > 0) {
+		          // Decrement the timer by 1 second
+		          resendTimer.value -= 1;
+		        } else {
+		          // Stop the timer when it reaches 0 seconds
+		          clearInterval(timer);
+		        }
+		     }, 1000);
 	  } catch (error) {
 			setError({ response: {data: { errorCode: "CODE_NOT_SENT"}}})
 		}
@@ -141,44 +165,39 @@
 	// };
 
 	const onInput = (index) => {
-    const inputs = document.querySelectorAll('input');
-    const nextInput = inputs[index + 1];
-    const prevInput = index > 0 ? inputs[index - 1] : null;
-
-    // Переход на следующий инпут
-    if (state.digits[index] !== '' && state.digits[index] !== null && state.digits[index] !== undefined && index < 4) {
-        if (index < 3) nextInput.focus();
-        else firstInput.value.focus();
-    }
-
-    // Переход на предыдущий инпут при удалении
-    if ((state.digits[index] === null || state.digits[index] === undefined || state.digits[index] === '') && index > 0) {
-        prevInput.focus();
-    }
-
-    // Проверка введенного кода
-    if (state.digits.every(digit => digit !== '')) {
-        const enteredCode = state.digits.join('');
-        const correctCode = twofa.state.code.code.toString();
-
-        if (enteredCode === correctCode) {
-            twofa.state.code.isValid = true;
-
-            router.push({
-                path: '/auth/enter-password',
-                query: { type: twofa.state.code.type, method: route.query.method }
-            });
-
-        } else {
-            setError({ response: {data: { errorCode: "WRONG_CODE"}}})
-            firstInput.value.focus()
-            state.digits = ['', '', '', ''];
-        }
-    }
-};
-
-</script>
-
-<style lang="scss">
-
-</style>
+	    const inputs = document.querySelectorAll('input');
+	    const nextInput = inputs[index + 1];
+	    const prevInput = index > 0 ? inputs[index - 1] : null;
+
+	    // Переход на следующий инпут
+	    if (state.digits[index] !== '' && state.digits[index] !== null && state.digits[index] !== undefined && index < 4) {
+	        if (index < 3) nextInput.focus();
+	        else firstInput.value.focus();
+	    }
+
+	    // Переход на предыдущий инпут при удалении
+	    if ((state.digits[index] === null || state.digits[index] === undefined || state.digits[index] === '') && index > 0) {
+	        prevInput.focus();
+	    }
+
+	    // Проверка введенного кода
+	    if (state.digits.every(digit => digit !== '')) {
+	        const enteredCode = state.digits.join('');
+	        const correctCode = twofa.state.code.code.toString();
+
+	        if (enteredCode === correctCode) {
+	            twofa.state.code.isValid = true;
+
+	            router.push({
+	                path: '/auth/enter-password',
+	                query: { type: twofa.state.code.type, method: route.query.method }
+	            });
+
+	        } else {
+	            setError({ response: {data: { errorCode: "WRONG_CODE"}}})
+	            firstInput.value.focus()
+	            state.digits = ['', '', '', ''];
+	        }
+	    }
+	};
+</script>

package/src/modules/auth/routes/twofa.routes.js

@@ -5,7 +5,7 @@ const middlewareFactory = require('@pf/src/modules/middlewares/server');
 // Routes
 module.exports = function(app, db) {
   const controller = controllerFactory(db);
-  const { verifySignUp } = middlewareFactory(db);
+  const { verifySignUp, verifyUser } = middlewareFactory(db);
   
   app.use(function(req, res, next) {
     res.header(
@@ -23,4 +23,12 @@ module.exports = function(app, db) {
     ],
     controller.sendcode
   );
+
+  app.post(
+  "/api/twofa/sendcodereset",
+  [
+    verifyUser.checkUserExist
+  ],
+  controller.sendcode
+);
 };

package/src/modules/auth/store/twofa.js

@@ -19,8 +19,11 @@ const state = reactive({
 });
 
 async function sendCode (user, method, type) {
+  let api = '/api/twofa/sendcode'
 
-  return await $axios.post('/api/twofa/sendcode', {
+  if (method === 'reset-password') api = '/api/twofa/sendcodereset'
+
+  return await $axios.post(api, {
     phone: user.phone.number,
     email: user.email,
     method: method,

package/src/modules/globals/utils/mailing.js

@@ -32,7 +32,7 @@ async function sendEmail(to, subject, text) {
 }
 
 async function sendSms(phone, message) {
-  const sessionUrl = `https://api.sms.to/sms/send?api_key=${process.env.SMS_API_KEY}&bypass_optout=true&to=${phone}&message=${encodeURIComponent(message)}&sender_id=${process.env.APP_NAME}`;
+  const sessionUrl = `https://api.sms.to/sms/send?api_key=${process.env.SMS_API_KEY}&bypass_optout=true&to=${phone}&message=${encodeURIComponent(message)}&sender_id=${encodeURIComponent(process.env.APP_NAME)}`;
 
   console.log(`Phone:${phone} message:${message}`);
 

package/src/modules/middlewares/server/verifyUser.js

@@ -20,6 +20,7 @@ const middlewareFactory = (db) => {
       const user = await User.findOne(query).exec();
 
       if (!user) {
+        console.log(query)
         res.status(400).send({ errorCode: "USER_NOT_REGISTERED_YET" });
         return;
       }