@ozdao/martyrs 0.2.584 → 0.2.586

package/src/modules/auth/controllers/services/twofa.service.js

@@ -1,30 +0,0 @@
-import mailing from '@martyrs/src/modules/core/controllers/utils/mailing.js';
-const { sendEmail, sendSms } = mailing;
-const controllerFactory = db => {
-  const sendcode = async (req, res) => {
-    const code = Math.floor(1000 + Math.random() * 9000);
-    const type = req.body.type;
-    const method = req.body.method;
-    if (type === 'email') {
-      const emailSent = await sendEmail(req.body.email, `${process.env.APP_NAME} Verification Code`, `Your ${process.env.APP_NAME} verification code is ${code}`);
-      if (emailSent) {
-        res.send({ code, type, method });
-      } else {
-        console.log(emailSent);
-        res.status(500).send('Failed to send email');
-      }
-    }
-    else if (type === 'phone') {
-      const smsSent = await sendSms(req.body.phone, `Your ${process.env.APP_NAME} verification code: ${code}`);
-      if (smsSent) {
-        res.send({ code, type, method });
-      } else {
-        res.status(500).send('Failed to send SMS');
-      }
-    }
-  };
-  return {
-    sendcode,
-  };
-};
-export default controllerFactory;

package/src/modules/auth/models/request.model.js

@@ -1,14 +0,0 @@
-export default db => {
-  const RequestSchema = new db.mongoose.Schema({
-    visitor: {
-      type: db.mongoose.Schema.Types.ObjectId,
-      ref: 'Visitor',
-    },
-    path: String,
-    method: String,
-    timestamp: { type: Date, default: Date.now },
-  });
-  RequestSchema.index({ visitor: 1 });
-  const Request = db.mongoose.model('Request', RequestSchema);
-  return Request;
-};

package/src/modules/auth/models/visitor.model.js

@@ -1,11 +0,0 @@
-export default db => {
-  const VisitorSchema = new db.mongoose.Schema({
-    ip: String,
-    userAgent: String,
-    acceptLanguage: String,
-    fingerprint: { type: String, unique: true },
-  });
-  // VisitorSchema.index({ fingerprint: 1 });
-  const Visitor = db.mongoose.model('Visitor', VisitorSchema);
-  return Visitor;
-};

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

@@ -1,204 +0,0 @@
-<template>
-	<section class="t-center pd-medium">
-		<!-- <img loading="lazy" src="@/assets/icons/message1.png" class="i-extra mn-b-small"> -->
-
-		<h3 class="mn-b-medium">
-			{{ route.query.type === 'email' ? t('auth.enterCode.verifyEmailTitle') : t('auth.enterCode.verifyNumberTitle') }}
-		</h3>
-
-		<p class="mn-b-big t-transp">{{ route.query.type === 'email' ? t('auth.enterCode.instructionsEmail') : t('auth.enterCode.instructions') }}</p>
-
-		<div class="w-100 mn-b-big flex-nowrap flex">
-      		<input 
-      			type="number" 
-      			v-model="state.digits[0]" 
-      			ref="firstInput" 
-      			maxlength="1" 
-      			@input="onInput(0)" 
-      			@paste="($event) => onPaste($event, 0)" 
-      			@keydown="($event) => onKeyDown($event, 0)" 
-      			class="w-100 h1 pd-small t-center bg-light radius-small mn-r-small"
-      		>
-			<input 
-				type="number" 
-				v-model="state.digits[1]" 
-				maxlength="1" 
-				@input="onInput(1)" 
-				@paste="($event) => onPaste($event, 1)" 
-				@keydown="($event) => onKeyDown($event, 1)" 
-				class="w-100 h1 pd-small t-center bg-light 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-light 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-light radius-small"
-			>
-    	</div>
-
-		<a v-if="resendTimer < 1" @click="sendAgain" class="t-blue">
-			{{ t('auth.enterCode.resendCode') }}
-		</a>
-
-		<span v-else>
-			{{resendTimer}} {{ t('auth.enterCode.secondsResend') }}
-		</span>
-	</section>
-</template>
-
-<script setup>
-	// Import components
-	import Field from '@martyrs/src/components/Field/Field.vue'
-	// Import libs
-	import { computed,reactive,ref, onMounted, onBeforeMount, watch } from 'vue'
-	import { useRoute,useRouter } from 'vue-router'
-	import { useI18n } from 'vue-i18n'
-	// Import state
-	import * as auth 	from '@martyrs/src/modules/auth/views/store/auth.js'
-	import * as twofa 	from '@martyrs/src/modules/auth/views/store/twofa.js'
-	import { setError } from '@martyrs/src/modules/core/views/store/core.store.js'
-	
-	const route = useRoute()
-	const router = useRouter()
-
-	// Localization
-	// Localization
-	const { t } = useI18n({
-		useScope: 'global', 
-	})
-	
-	const state = reactive({
-	  digits: ['', '', '', ''],
-	  error: null,
-	});
-
-	watch(
-	    () => state.digits[0],
-	    (newVal) => {
-	        if (newVal && String(newVal).length > 1) {
-	            let newValArray = String(newVal).split('');
-	            console.log(newValArray);
-
-	            let newDigits = [...state.digits];
-	            newValArray.forEach((digit, i) => {
-	                console.log(i);
-	                console.log(newDigits[i]);
-	                console.log(digit);
-	                newDigits[i] = digit;
-	            });
-
-	            state.digits = newDigits;
-
-	            onInput(3);
-	        }
-	    }
-	);
-
-	const firstInput = ref(null);
-
-	const resendTimer = ref(0);
-
-	async function sendAgain () {
-		try {
-		  	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"}}})
-		}
-	}
-
-
-	const onKeyDown = (event, index) => {
-	    if (event.key === "Backspace" && (state.digits[index] === null || state.digits[index] === undefined || state.digits[index] === '')) {
-	        event.preventDefault();
-
-	        const inputs = document.querySelectorAll('input');
-	        const prevInput = index > 0 ? inputs[index - 1] : null;
-
-	        if (prevInput) {
-	            prevInput.focus();
-	            prevInput.setSelectionRange(prevInput.value.length, prevInput.value.length);
-	        }
-	    }
-	};
-
-	// const onPaste = (event, index) => {
-	//   event.preventDefault();
-	//   const pastedData = event.clipboardData.getData('text/plain');
-	  
-	//   // Проверим, что вставленный текст состоит только из 4 цифр
-	//   if (/^\d{4}$/.test(pastedData)) {
-	//     for (let i = 0; i < 4; i++) {
-	//       state.digits[index + i] = pastedData[i];
-	//     }
-	//     onInput(index + 3); // Вызываем обработчик onInput для последнего инпута, чтобы обработать логику ввода
-	//   } else {
-	//    	setError({ response: {data: { errorCode: "INPUT_ERROR"}}})
-	//   }
-	// };
-
-	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, returnUrl: route.query.returnUrl }
-	            });
-
-	        } else {
-	            setError({ response: {data: { errorCode: "WRONG_CODE"}}})
-	            firstInput.value.focus()
-	            state.digits = ['', '', '', ''];
-	        }
-	    }
-	};
-</script>

package/src/modules/auth/views/components/pages/EnterPassword.vue

@@ -1,123 +0,0 @@
-<template>
-	<section class="t-left pd-medium">
-		<!-- Header -->
-		<!-- <img loading="lazy" src="@/assets/icons/password.png" class="i-extra mn-b-small"> -->
-		<h3 class="mn-b-small">{{ t('auth.enterPassword.almostDone') }}</h3>
-		<p v-if="route.query.method === 'reset-password'" class="mn-b-semi t-transp">{{ t('auth.enterPassword.newPasswordPrompt') }}</p>
-		<p v-else class="mn-b-semi t-transp">{{ t('auth.enterPassword.registrationPasswordPrompt') }}</p>
-	
-		<!-- Form -->
-		<div class="mn-b-semi radius-small o-hidden">
-			<Field 
-				v-model:field="auth.state.user.password"
-				type="password" 	
-				:validation="passswordValidation" 
-				:placeholder="t('auth.enterPassword.passwordPlaceholder')"		
-				class="bg-light pd-small radius-small mn-b-thin"
-			/>
-			<Field 
-				v-model:field="auth.state.user.passwordRepeat"
-				type="password" 	
-				:placeholder="t('auth.enterPassword.repeatPasswordPlaceholder')"
-				class="bg-light pd-small radius-small mn-b-thin"
-			/>
-		</div>
-		<div
-			 v-if="route.query.method !== 'reset-password'" 
-			 class="p-regular fw-semi mn-b-semi "
-		>
-			 By registering, you agree to our <a class="t-grey" href="/legal/eula" target="_blank" rel="noopener noreferrer">End User License Agreement (EULA)</a>
-		</div>
-		<!-- Button -->
-		<Button :submit="onSubmit" :callback="redirectTo" class="w-100 bg-main mn-b-big">
-			<span  v-if="route.query.method === 'reset-password'">{{ t('auth.enterPassword.changePasswordBtn') }}</span>
-			<span v-else>{{ t('auth.enterPassword.registerBtn') }}</span>
-		</Button>
-	</section> 
-</template>
-
-<script setup>
-// Import components
-import Tab           from '@martyrs/src/components/Tab/Tab.vue'
-import Field         from '@martyrs/src/components/Field/Field.vue'
-import Button        from '@martyrs/src/components/Button/Button.vue'
-// Import libs
-import { computed, onMounted, ref, onBeforeMount } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-import { useI18n } from 'vue-i18n'
-// Import state
-import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
-// Import validation
-import * as inputsValidation from '@martyrs/src/modules/auth/views/validations/inputs.validation'
-const passswordValidation = ref(null)
-// Localization
-const { t } = useI18n({
-	useScope: 'global', 
-})
-// Accessing router
-const route = useRoute()
-const router = useRouter()
-// Accessing state
-const tabAuth = ref('phone')
-// Methods
-async function onSubmit() {
-	try {
-		await inputsValidation.validateInputs(
-			passswordValidation, 
-			inputsValidation.validatePassword, 
-			auth.state.user.password, 
-			'Некорректный пароль'
-		)
-	} catch (error) {
-		throw new Error
-	}
-
-	if (route.query.method === 'reset-password') await auth.actions.updatePassword(auth.state.user, route.query.type)
-	if (route.query.method !== 'reset-password') await auth.actions.signup(auth.state.user, route.query.type)
-}
-
-function redirectTo () {
-	if (route.query.returnUrl) {
-		router.push({ 
-			path: route.query.returnUrl,
-			query: { 
-				afterAuth: 'true' 
-			}
-		})
-	} else { 
-		router.push({ 
-			name: 'User Profile', 
-			params: { 
-				_id: auth.state.user._id 
-			},
-			query: { 
-				afterAuth: 'true' 
-			}
-		})
-	}
-}
-</script>
-
-<style lang="scss">
-	.slide-fade-enter-active {
-	  transition: all  0.3s cubic-bezier(0.4, 0, 0.2, 1);
-	}
-
-	.slide-fade-leave-active {
-	  transition: all  0.3s cubic-bezier(0.4, 0, 0.2, 1);
-
-	}
-
-	.slide-fade-enter-from,
-	.slide-fade-leave-to {
-		position: absolute;
-	  transform: translateX(20px);
-	  opacity: 0;
-	  left: 0;
-	  top: 0;
-	}
-
-	.slide-fade-leave-to {
-
-	}
-</style>