init

src/app/modules/auth/pages/login/login.component.ts

@@ -14,7 +14,6 @@ import { InputText } from 'primeng/inputtext';
 import { Password } from 'primeng/password';
 import { ProgressSpinnerModule } from 'primeng/progressspinner';
 import { RadioButtonModule } from 'primeng/radiobutton';
-import { CaptchaService } from 'src/app/core/services/captcha.service';
 // import { CENTRAL_AUTH_ROLES } from '../../constants/central-auth-roles.const';
 
 @Component({
@@ -45,48 +44,47 @@ export class LoginComponent {
   private readonly authService = inject(AuthService);
   private readonly router = inject(Router);
   private readonly fb = inject(FormBuilder);
-  private readonly captchaService = inject(CaptchaService);
   private readonly toastService = inject(ToastService);
 
   readonly isLoading = computed(() => this.authService.isLoading());
   readonly errorMessage = signal<string>('');
   readonly hidePassword = signal<boolean>(true);
-  readonly isCaptchaExpired = this.captchaService.captchaIsExpired;
-  readonly isCaptchaLoading = this.captchaService.loading;
-  readonly captchaImageSrc = this.captchaService.captchaImageSrc;
+  // readonly isCaptchaExpired = this.captchaService.captchaIsExpired;
+  // readonly isCaptchaLoading = this.captchaService.loading;
+  // readonly captchaImageSrc = this.captchaService.captchaImageSrc;
   // readonly centralAuthRoles = CENTRAL_AUTH_ROLES;
 
   readonly loginForm = this.fb.group({
     username: ['', [Validators.required]],
     password: ['', [Validators.required]],
     rememberMe: [false],
-    captcha: ['', [Validators.required]],
-    role: [this.defaultRole, [Validators.required]],
+    // captcha: ['', [Validators.required]],
+    // role: [this.defaultRole, [Validators.required]],
   });
 
-  selectedRole = signal<TRoles>('SCHOOL');
+  selectedRole = signal<TRoles>('SUPERADMIN');
   ngOnInit() {
-    this.captchaService.requestNewCaptcha();
+    // this.captchaService.requestNewCaptcha();
   }
 
   togglePasswordVisibility(): void {
     this.hidePassword.set(!this.hidePassword());
   }
 
-  resetCaptcha(): void {
-    this.fb.control('captcha').setValue('');
-    this.captchaService.renewCaptcha();
-  }
+  // resetCaptcha(): void {
+  //   this.fb.control('captcha').setValue('');
+  //   this.captchaService.renewCaptcha();
+  // }
 
-  onRefreshCaptcha(): void {
-    this.resetCaptcha();
-  }
-  onRefreshCaptchaImage(): void {
-    this.resetCaptcha();
-    // document
-    //   .getElementById('captchaImage')
-    //   ?.setAttribute('src', this.captchaService.captchaImageSrc()! + `&${new Date().getTime()}`);
-  }
+  // onRefreshCaptcha(): void {
+  //   this.resetCaptcha();
+  // }
+  // onRefreshCaptchaImage(): void {
+  //   this.resetCaptcha();
+  //   // document
+  //   //   .getElementById('captchaImage')
+  //   //   ?.setAttribute('src', this.captchaService.captchaImageSrc()! + `&${new Date().getTime()}`);
+  // }
 
   toSignup() {
     this.onToSignup.emit();
@@ -95,27 +93,25 @@ export class LoginComponent {
   submit(): void {
     this.loginForm.markAllAsTouched();
     if (this.loginForm.invalid) return;
-    if (!this.captchaService.captchaId()) {
-      this.toastService.error({ text: 'مقدار کپچا را وارد کنید' });
-    }
+    // if (!this.captchaService.captchaId()) {
+    //   this.toastService.error({ text: 'مقدار کپچا را وارد کنید' });
+    // }
     const credentials: LoginCredentials = this.loginForm.value as LoginCredentials;
 
-    this.authService
-      .login(credentials, (this.defaultRole || this.loginForm.value.role)!)
-      .subscribe({
-        next: (data) => {
-          this.errorMessage.set('');
-          if (this.redirectUrl) {
-            this.router.navigateByUrl(this.redirectUrl.replace(/\/[^/]*$/, ''));
-          } else {
-            this.onSuccessfullySubmit.emit(data);
-          }
-        },
-        error: (error) => {
-          this.resetCaptcha();
-          this.errorMessage.set('نام کاربری یا رمز عبور اشتباه است');
-          console.error('Login failed:', error);
-        },
-      });
+    this.authService.login(credentials).subscribe({
+      next: (data) => {
+        this.errorMessage.set('');
+        if (this.redirectUrl) {
+          this.router.navigateByUrl(this.redirectUrl.replace(/\/[^/]*$/, ''));
+        } else {
+          this.onSuccessfullySubmit.emit(data);
+        }
+      },
+      error: (error) => {
+        // this.resetCaptcha();
+        this.errorMessage.set('نام کاربری یا رمز عبور اشتباه است');
+        console.error('Login failed:', error);
+      },
+    });
   }
 }