-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5634 from deNBI/fix/comment_validity_plus_sensitive
Fix/comment validity plus sensitive
- Loading branch information
Showing
6 changed files
with
149 additions
and
114 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
209 changes: 104 additions & 105 deletions
209
src/app/shared/shared_modules/public-key/public-key.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,128 +1,127 @@ | ||
| import { | ||
| Component, EventEmitter, Input, OnInit, Output, | ||
| Component, EventEmitter, Input, OnInit, Output, | ||
| } from '@angular/core'; | ||
| import {ClipboardService} from 'ngx-clipboard'; | ||
| import {saveAs} from 'file-saver'; | ||
| import {BsModalService} from 'ngx-bootstrap/modal'; | ||
| import {KeyService} from '../../../api-connector/key.service'; | ||
| import {ApiSettings} from '../../../api-connector/api-settings.service'; | ||
| import {Userinfo} from '../../../userinfo/userinfo.model'; | ||
| import {IResponseTemplate} from '../../../api-connector/response-template'; | ||
| import {AbstractBaseClass} from '../baseClass/abstract-base-class'; | ||
| import {WIKI_GENERATE_KEYS} from '../../../../links/links'; | ||
| import {NotificationModalComponent} from '../../modal/notification-modal'; | ||
| import {BlacklistedResponse} from '../../../api-connector/response-interfaces'; | ||
| import {CLOUD_PORTAL_SUPPORT_MAIL} from '../../../../links/links' | ||
| import { ClipboardService } from 'ngx-clipboard'; | ||
| import { saveAs } from 'file-saver'; | ||
| import { BsModalService } from 'ngx-bootstrap/modal'; | ||
| import { KeyService } from '../../../api-connector/key.service'; | ||
| import { ApiSettings } from '../../../api-connector/api-settings.service'; | ||
| import { Userinfo } from '../../../userinfo/userinfo.model'; | ||
| import { IResponseTemplate } from '../../../api-connector/response-template'; | ||
| import { AbstractBaseClass } from '../baseClass/abstract-base-class'; | ||
| import { WIKI_GENERATE_KEYS, CLOUD_PORTAL_SUPPORT_MAIL } from '../../../../links/links'; | ||
| import { NotificationModalComponent } from '../../modal/notification-modal'; | ||
| import { BlacklistedResponse } from '../../../api-connector/response-interfaces'; | ||
|
|
||
| /** | ||
| * Public Key component. | ||
| */ | ||
| @Component({ | ||
| // eslint-disable-next-line @angular-eslint/component-selector | ||
| selector: '[app-public-key]', | ||
| templateUrl: './public-key.component.html', | ||
| styleUrls: ['./public-key.component.scss'], | ||
| providers: [ApiSettings, KeyService], | ||
| // eslint-disable-next-line @angular-eslint/component-selector | ||
| selector: '[app-public-key]', | ||
| templateUrl: './public-key.component.html', | ||
| styleUrls: ['./public-key.component.scss'], | ||
| providers: [ApiSettings, KeyService], | ||
| }) | ||
| export class PublicKeyComponent extends AbstractBaseClass implements OnInit { | ||
| WIKI_GENERATE_KEYS: string = WIKI_GENERATE_KEYS; | ||
| public_key: string; | ||
| validated_key: boolean = false; | ||
| blocked_key: boolean = false; | ||
| current_key_blocked: boolean = false; | ||
| acknowledgement_given: boolean = false; | ||
| @Input() userinfo: Userinfo; | ||
| @Output() readonly currentKeyBlockedChanged: EventEmitter<boolean> = new EventEmitter(); | ||
| CLOUD_PORTAL_SUPPORT_MAIL: string= CLOUD_PORTAL_SUPPORT_MAIL | ||
| WIKI_GENERATE_KEYS: string = WIKI_GENERATE_KEYS; | ||
| public_key: string; | ||
| validated_key: boolean = false; | ||
| blocked_key: boolean = false; | ||
| current_key_blocked: boolean = false; | ||
| acknowledgement_given: boolean = false; | ||
| @Input() userinfo: Userinfo; | ||
| @Output() readonly currentKeyBlockedChanged: EventEmitter<boolean> = new EventEmitter(); | ||
| CLOUD_PORTAL_SUPPORT_MAIL: string = CLOUD_PORTAL_SUPPORT_MAIL; | ||
|
|
||
| constructor( | ||
| private keyService: KeyService, | ||
| private clipboardService: ClipboardService, | ||
| private modalService: BsModalService, | ||
| ) { | ||
| super(); | ||
| } | ||
| constructor( | ||
| private keyService: KeyService, | ||
| private clipboardService: ClipboardService, | ||
| private modalService: BsModalService, | ||
| ) { | ||
| super(); | ||
| } | ||
|
|
||
| ngOnInit() { | ||
| if (this.userinfo?.PublicKey) { | ||
| this.isCurrentKeyBlocked(); | ||
| } | ||
| ngOnInit() { | ||
| if (this.userinfo?.PublicKey) { | ||
| this.isCurrentKeyBlocked(); | ||
| } | ||
| } | ||
|
|
||
| downloadPem(data: string): void { | ||
| const blob: Blob = new Blob([data], {type: 'pem'}); | ||
| const url: string = window.URL.createObjectURL(blob); | ||
| saveAs(url, `${this.userinfo.UserLogin}_ecdsa`); | ||
| } | ||
| downloadPem(data: string): void { | ||
| const blob: Blob = new Blob([data], { type: 'pem' }); | ||
| const url: string = window.URL.createObjectURL(blob); | ||
| saveAs(url, `${this.userinfo.UserLogin}_ecdsa`); | ||
| } | ||
|
|
||
| generateKey(): void { | ||
| this.keyService.generateKey().subscribe((res: any): void => { | ||
| this.getUserPublicKey(); | ||
| this.downloadPem(res['private_key']); | ||
| }); | ||
| } | ||
| generateKey(): void { | ||
| this.keyService.generateKey().subscribe((res: any): void => { | ||
| this.getUserPublicKey(); | ||
| this.downloadPem(res['private_key']); | ||
| }); | ||
| } | ||
|
|
||
| isKeyBlocked(): void { | ||
| this.keyService.isBlocked(this.public_key.trim()).subscribe((res: BlacklistedResponse) => { | ||
| this.blocked_key = res.blacklisted; | ||
| }); | ||
| } | ||
| isKeyBlocked(): void { | ||
| this.keyService.isBlocked(this.public_key.trim()).subscribe((res: BlacklistedResponse) => { | ||
| this.blocked_key = res.blacklisted; | ||
| }); | ||
| } | ||
|
|
||
| isCurrentKeyBlocked(): void { | ||
| this.keyService.isBlocked(this.userinfo.PublicKey).subscribe((res: BlacklistedResponse) => { | ||
| this.current_key_blocked = res.blacklisted; | ||
| this.currentKeyBlockedChanged.emit(this.current_key_blocked); | ||
| }); | ||
| } | ||
| isCurrentKeyBlocked(): void { | ||
| this.keyService.isBlocked(this.userinfo.PublicKey).subscribe((res: BlacklistedResponse) => { | ||
| this.current_key_blocked = res.blacklisted; | ||
| this.currentKeyBlockedChanged.emit(this.current_key_blocked); | ||
| }); | ||
| } | ||
|
|
||
| validateKey(): void { | ||
| this.keyService.validateKey(this.public_key.trim()).subscribe( | ||
| (res: any) => { | ||
| this.validated_key = res['status'] === 'valid'; | ||
| }, | ||
| () => { | ||
| this.validated_key = false; | ||
| }, | ||
| ); | ||
| } | ||
| validateKey(): void { | ||
| this.keyService.validateKey(this.public_key.trim()).subscribe( | ||
| (res: any) => { | ||
| this.validated_key = res['status'] === 'valid'; | ||
| }, | ||
| () => { | ||
| this.validated_key = false; | ||
| }, | ||
| ); | ||
| } | ||
|
|
||
| importKey(): void { | ||
| const re: RegExp = /\+/gi; | ||
| importKey(): void { | ||
| const re: RegExp = /\+/gi; | ||
|
|
||
| this.keyService.postKey(this.public_key.replace(re, '%2B').trim()).subscribe({ | ||
| next: (): void => { | ||
| this.getUserPublicKey(); | ||
| const initialState = { | ||
| notificationModalTitle: 'Success', | ||
| notificationModalType: 'info', | ||
| notificationModalMessage: 'The new public key got successfully set', | ||
| }; | ||
| this.modalService.show(NotificationModalComponent, {initialState}); | ||
| }, | ||
| error: (): any => { | ||
| const initialState = { | ||
| notificationModalTitle: 'Error', | ||
| notificationModalType: 'danger', | ||
| notificationModalMessage: | ||
| 'We were not able successfully set a new public key. Please enter a valid public key!', | ||
| }; | ||
| this.modalService.show(NotificationModalComponent, {initialState}); | ||
| }, | ||
| }); | ||
| } | ||
| this.keyService.postKey(this.public_key.replace(re, '%2B').trim()).subscribe({ | ||
| next: (): void => { | ||
| this.getUserPublicKey(); | ||
| const initialState = { | ||
| notificationModalTitle: 'Success', | ||
| notificationModalType: 'info', | ||
| notificationModalMessage: 'The new public key got successfully set', | ||
| }; | ||
| this.modalService.show(NotificationModalComponent, { initialState }); | ||
| }, | ||
| error: (): any => { | ||
| const initialState = { | ||
| notificationModalTitle: 'Error', | ||
| notificationModalType: 'danger', | ||
| notificationModalMessage: | ||
| 'We were not able successfully set a new public key. Please enter a valid public key!', | ||
| }; | ||
| this.modalService.show(NotificationModalComponent, { initialState }); | ||
| }, | ||
| }); | ||
| } | ||
|
|
||
| copyToClipboard(text: string): void { | ||
| if (this.clipboardService.isSupported) { | ||
| this.clipboardService.copy(text); | ||
| } else { | ||
| super.copyToClipboard(text); | ||
| } | ||
| copyToClipboard(text: string): void { | ||
| if (this.clipboardService.isSupported) { | ||
| this.clipboardService.copy(text); | ||
| } else { | ||
| super.copyToClipboard(text); | ||
| } | ||
| } | ||
|
|
||
| getUserPublicKey(): void { | ||
| this.keyService.getKey().subscribe((key: IResponseTemplate): void => { | ||
| this.userinfo.PublicKey = key.value as string; | ||
| this.isKeyBlocked(); | ||
| }); | ||
| } | ||
| getUserPublicKey(): void { | ||
| this.keyService.getKey().subscribe((key: IResponseTemplate): void => { | ||
| this.userinfo.PublicKey = key.value as string; | ||
| this.isKeyBlocked(); | ||
| }); | ||
| } | ||
| } |