19758484373

Committed 28 Nov 2025 08:39AM UTC coverage: 85.451% (+0.2%) from 85.287%

Build # 19758484373

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #2867 from rajeshuchil/fix/nested-conditionals

feat/Replaced deeply nested if/else statements with flat guard clause…

Run Details

1239 of 1669 branches covered (74.24%)

Branch coverage included in aggregate %.

6 of 7 new or added lines in 1 file covered. (85.71%)

1 existing line in 1 file now uncovered.

5292 of 5974 relevant lines covered (88.58%)

40.26 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

88.89

/frontend/src/app/data-export/data-export.component.ts

/*
 * Copyright (c) 2014-2026 Bjoern Kimminich & the OWASP Juice Shop contributors.
 * SPDX-License-Identifier: MIT
 */

import { Component, type OnInit, inject } from '@angular/core'
import { UntypedFormControl, Validators, FormsModule, ReactiveFormsModule } from '@angular/forms'
import { ImageCaptchaService } from '../Services/image-captcha.service'
import { DataSubjectService } from '../Services/data-subject.service'
import { DomSanitizer } from '@angular/platform-browser'
import { MatButtonModule } from '@angular/material/button'
import { MatInputModule } from '@angular/material/input'
import { MatLabel, MatFormFieldModule, MatHint, MatError } from '@angular/material/form-field'
import { MatRadioGroup, MatRadioButton } from '@angular/material/radio'

import { TranslateModule } from '@ngx-translate/core'
import { MatCardModule } from '@angular/material/card'

import { MatIconModule } from '@angular/material/icon'

@Component({
  selector: 'app-data-export',
  templateUrl: './data-export.component.html',
  styleUrls: ['./data-export.component.scss'],
  imports: [MatCardModule, TranslateModule, MatRadioGroup, FormsModule, ReactiveFormsModule, MatLabel, MatRadioButton, MatFormFieldModule, MatInputModule, MatHint, MatError, MatButtonModule, MatIconModule]
})
export class DataExportComponent implements OnInit {
  sanitizer = inject(DomSanitizer);
  private readonly imageCaptchaService = inject(ImageCaptchaService);
  private readonly dataSubjectService = inject(DataSubjectService);

  public captchaControl: UntypedFormControl = new UntypedFormControl('', [Validators.required, Validators.minLength(5)])
  public formatControl: UntypedFormControl = new UntypedFormControl('', [Validators.required])
  public captcha: any
  private dataRequest: any = undefined
  public confirmation: any
  public error: any
  public lastSuccessfulTry: any
  public presenceOfCaptcha = false
  public userData: any
  ngOnInit (): void {
    this.needCaptcha()
    this.dataRequest = {}
  }

  needCaptcha () {
    const nowTime = new Date()
    const timeOfCaptcha = localStorage.getItem('lstdtxprt') ? new Date(JSON.parse(String(localStorage.getItem('lstdtxprt')))) : new Date(0)
    if (nowTime.getTime() - timeOfCaptcha.getTime() < 300000) {
      this.getNewCaptcha()
      this.presenceOfCaptcha = true
    }
  }

  getNewCaptcha () {
    this.imageCaptchaService.getCaptcha().subscribe((data: any) => {
      this.captcha = this.sanitizer.bypassSecurityTrustHtml(data.image)
    })
  }

  save () {
    if (this.presenceOfCaptcha) {
      this.dataRequest.answer = this.captchaControl.value
    }
    this.dataRequest.format = this.formatControl.value
    this.dataSubjectService.dataExport(this.dataRequest).subscribe({
      next: (data: any) => {
        this.error = null
        this.confirmation = data.confirmation
        this.userData = data.userData
        window.open('', '_blank', 'width=500')?.document.write(this.userData)
        this.lastSuccessfulTry = new Date()
        localStorage.setItem('lstdtxprt', JSON.stringify(this.lastSuccessfulTry))
        this.ngOnInit()
        this.resetForm()
      },
      error: (error) => {
        this.error = error.error
        this.confirmation = null
        this.resetFormError()
      }
    })
  }

  resetForm () {
    this.captchaControl.markAsUntouched()
    this.captchaControl.markAsPristine()
    this.captchaControl.setValue('')
    this.formatControl.markAsUntouched()
    this.formatControl.markAsPristine()
    this.formatControl.setValue('')
  }

  resetFormError () {
    this.captchaControl.markAsUntouched()
    this.captchaControl.markAsPristine()
    this.captchaControl.setValue('')
  }
}

1	/*
2	* Copyright (c) 2014-2026 Bjoern Kimminich & the OWASP Juice Shop contributors.
3	* SPDX-License-Identifier: MIT
4	*/
5
6	import { Component, type OnInit, inject } from '@angular/core'
7	import { UntypedFormControl, Validators, FormsModule, ReactiveFormsModule } from '@angular/forms'
8	import { ImageCaptchaService } from '../Services/image-captcha.service'
9	import { DataSubjectService } from '../Services/data-subject.service'
10	import { DomSanitizer } from '@angular/platform-browser'
11	import { MatButtonModule } from '@angular/material/button'
12	import { MatInputModule } from '@angular/material/input'
13	import { MatLabel, MatFormFieldModule, MatHint, MatError } from '@angular/material/form-field'
14	import { MatRadioGroup, MatRadioButton } from '@angular/material/radio'
15
16	import { TranslateModule } from '@ngx-translate/core'
17	import { MatCardModule } from '@angular/material/card'
18
19	import { MatIconModule } from '@angular/material/icon'
20
21	@Component({
22	selector: 'app-data-export',
23	templateUrl: './data-export.component.html',
24	styleUrls: ['./data-export.component.scss'],
25	imports: [MatCardModule, TranslateModule, MatRadioGroup, FormsModule, ReactiveFormsModule, MatLabel, MatRadioButton, MatFormFieldModule, MatInputModule, MatHint, MatError, MatButtonModule, MatIconModule]
26	})
27	export class DataExportComponent implements OnInit {	1✔
28	sanitizer = inject(DomSanitizer);	7✔
29	private readonly imageCaptchaService = inject(ImageCaptchaService);	7✔
30	private readonly dataSubjectService = inject(DataSubjectService);	7✔
31
32	public captchaControl: UntypedFormControl = new UntypedFormControl('', [Validators.required, Validators.minLength(5)])	7✔
33	public formatControl: UntypedFormControl = new UntypedFormControl('', [Validators.required])	7✔
34	public captcha: any
35	private dataRequest: any = undefined	7✔
36	public confirmation: any
37	public error: any
38	public lastSuccessfulTry: any
39	public presenceOfCaptcha = false	7✔
40	public userData: any
41	ngOnInit (): void {
42	this.needCaptcha()	7✔
43	this.dataRequest = {}	7✔
44	}
45
46	needCaptcha () {
47	const nowTime = new Date()	7✔
48	const timeOfCaptcha = localStorage.getItem('lstdtxprt') ? new Date(JSON.parse(String(localStorage.getItem('lstdtxprt')))) : new Date(0)	7✔
49	if (nowTime.getTime() - timeOfCaptcha.getTime() < 300000) {	7✔
50	this.getNewCaptcha()	1✔
51	this.presenceOfCaptcha = true	1✔
52	}
53	}
54
55	getNewCaptcha () {
56	this.imageCaptchaService.getCaptcha().subscribe((data: any) => {	2✔
57	this.captcha = this.sanitizer.bypassSecurityTrustHtml(data.image)	2✔
58	})
59	}
60
61	save () {
62	if (this.presenceOfCaptcha) {	2!
UNCOV 63	this.dataRequest.answer = this.captchaControl.value	×
64	}
65	this.dataRequest.format = this.formatControl.value	2✔
66	this.dataSubjectService.dataExport(this.dataRequest).subscribe({	2✔
67	next: (data: any) => {
68	this.error = null	1✔
69	this.confirmation = data.confirmation	1✔
70	this.userData = data.userData	1✔
71	window.open('', '_blank', 'width=500')?.document.write(this.userData)	1✔
72	this.lastSuccessfulTry = new Date()	1✔
73	localStorage.setItem('lstdtxprt', JSON.stringify(this.lastSuccessfulTry))	1✔
74	this.ngOnInit()	1✔
75	this.resetForm()	1✔
76	},
77	error: (error) => {
78	this.error = error.error	1✔
79	this.confirmation = null	1✔
80	this.resetFormError()	1✔
81	}
82	})
83	}
84
85	resetForm () {
86	this.captchaControl.markAsUntouched()	1✔
87	this.captchaControl.markAsPristine()	1✔
88	this.captchaControl.setValue('')	1✔
89	this.formatControl.markAsUntouched()	1✔
90	this.formatControl.markAsPristine()	1✔
91	this.formatControl.setValue('')	1✔
92	}
93
94	resetFormError () {
95	this.captchaControl.markAsUntouched()	×
96	this.captchaControl.markAsPristine()	×
97	this.captchaControl.setValue('')	×
98	}
99	}

juice-shop / juice-shop / 19758484373

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous