diff --git a/src/app/services/firebase.service.ts b/src/app/services/firebase.service.ts index a0a1802..a8daaab 100644 --- a/src/app/services/firebase.service.ts +++ b/src/app/services/firebase.service.ts @@ -11,15 +11,15 @@ import { } from '@angular/fire/firestore'; import { Task } from '../interfaces/task.interface'; import { User } from '../interfaces/user.interface'; -import CryptoJS from 'crypto-es'; -import { CryptoJSSecretKey } from './../environments/config'; +import CryptoES from 'crypto-es'; +import { CryptoESSecretKey } from './../environments/config'; @Injectable({ providedIn: 'root', }) export class FirebaseService implements OnDestroy { firestore: Firestore = inject(Firestore); - private secretKey: string = CryptoJSSecretKey.secretKey; + private secretKey: string = CryptoESSecretKey.secretKey; allTasks: Task[] = []; filteredTasks: Task[] = []; @@ -133,8 +133,8 @@ export class FirebaseService implements OnDestroy { getCurrentUserId() { const encryptedValue = localStorage.getItem('currentUserJOIN'); if (encryptedValue) { - const bytes = CryptoJS.AES.decrypt(encryptedValue, this.secretKey); - const decryptedValue = bytes.toString(CryptoJS.enc.Utf8); + const bytes = CryptoES.AES.decrypt(encryptedValue, this.secretKey); + const decryptedValue = bytes.toString(CryptoES.enc.Utf8); return JSON.parse(decryptedValue); } return null; diff --git a/src/app/services/login.service.ts b/src/app/services/login.service.ts index 6bdced0..3d4d935 100644 --- a/src/app/services/login.service.ts +++ b/src/app/services/login.service.ts @@ -22,8 +22,8 @@ import { import { SharedService } from './shared.service'; import { User } from '../interfaces/user.interface'; import { Router } from '@angular/router'; -import CryptoJS from 'crypto-es'; -import { CryptoJSSecretKey } from './../environments/config'; +import CryptoES from 'crypto-es'; +import { CryptoESSecretKey } from './../environments/config'; @Injectable({ providedIn: 'root', @@ -34,7 +34,7 @@ export class LoginService { passwordIcon: string = './../../../assets/img/login/close-eye.svg'; errorCode: string = ''; - private secretKey: string = CryptoJSSecretKey.secretKey; + private secretKey: string = CryptoESSecretKey.secretKey; constructor( private firebaseService: FirebaseService, @@ -188,7 +188,7 @@ export class LoginService { } getUserIdInLocalStorage(userId: string): void { - const encryptedValue = CryptoJS.AES.encrypt( + const encryptedValue = CryptoES.AES.encrypt( JSON.stringify(userId), this.secretKey ).toString();