From 4351dd5f097f9b66a58dbec1f44d59af6812e781 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Thu, 17 Sep 2020 08:53:28 +0100
Subject: [PATCH] Fixed #3735

---
 .../ClientApp/src/app/auth/auth.service.ts    |  4 ++--
 .../src/app/login/login.component.html        |  6 +++---
 .../src/app/my-nav/my-nav.component.html      |  2 +-
 .../src/app/my-nav/nav-search.component.html  |  3 +--
 .../app/settings/lidarr/lidarr.component.html |  6 +++---
 .../app/settings/lidarr/lidarr.component.ts   | 20 +++++++++----------
 6 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/Ombi/ClientApp/src/app/auth/auth.service.ts b/src/Ombi/ClientApp/src/app/auth/auth.service.ts
index 8f3c6af29..73e4388ec 100644
--- a/src/Ombi/ClientApp/src/app/auth/auth.service.ts
+++ b/src/Ombi/ClientApp/src/app/auth/auth.service.ts
@@ -67,8 +67,8 @@ export class AuthService extends ServiceHelpers {
     public hasRole(role: string): boolean {
         const claims = this.claims();
 
-        if (claims && claims.roles && role) {
-            return claims.roles.some(r => r.toUpperCase() === role.toUpperCase());
+        if (claims && claims.roles && role && claims.roles.length > 0) {
+            return claims.roles.some(r => r != undefined && r.toUpperCase() === role.toUpperCase());
         }
         return false;
     }
diff --git a/src/Ombi/ClientApp/src/app/login/login.component.html b/src/Ombi/ClientApp/src/app/login/login.component.html
index d481e9cfe..a54a70006 100644
--- a/src/Ombi/ClientApp/src/app/login/login.component.html
+++ b/src/Ombi/ClientApp/src/app/login/login.component.html
@@ -12,14 +12,14 @@
 
                     <mat-form-field class="dark full-width" appearance="outline">
                         <mat-label>{{'Login.UsernamePlaceholder' | translate}}</mat-label>
-                        <input type="text" matInput formControlName="username" />
-                        <mat-error *ngIf="form.get('username').hasError('required')">
+                        <input id="username-field" type="text" matInput formControlName="username" />
+                        <mat-error id="username-error" *ngIf="form.get('username').hasError('required')">
                             {{'Login.UsernamePlaceholder' | translate}} is <strong>required</strong></mat-error>
                     </mat-form-field>
 
                     <mat-form-field class="full-width" appearance="outline">
                         <mat-label>{{'Login.PasswordPlaceholder' | translate}}</mat-label>
-                        <input color="black" type="password" matInput formControlName="password" />
+                        <input id="password-field" color="black" type="password" matInput formControlName="password" />
                     </mat-form-field>
 
                     <mat-checkbox formControlName="rememberMe">{{'Login.RememberMe' | translate}}</mat-checkbox>
diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html
index 5ee98056c..aa077202a 100644
--- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html
+++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html
@@ -21,7 +21,7 @@
             </div>
             </span>
 
-            <a class="bottom-nav-link" mat-list-item [routerLinkActive]="getTheme()" aria-label="Toggle sidenav" (click)="logOut();">
+            <a id="nav-logout" class="bottom-nav-link" mat-list-item [routerLinkActive]="getTheme()" aria-label="Toggle sidenav" (click)="logOut();">
                 <mat-icon aria-label="Side nav toggle icon">exit_to_app</mat-icon>
                 {{ 'NavigationBar.Logout' | translate }}
             </a>
diff --git a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html
index 2c9064174..a83b7e6c8 100644
--- a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html
+++ b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html
@@ -2,12 +2,11 @@
 aria-label="Search" [ngbTypeahead]="searchModel" [resultFormatter]="formatter" [inputFormatter]="formatter" [resultTemplate]="template" (selectItem)="selected($event)">
 
 <ng-template #template let-result="result">
-   
 </ng-template> -->
 
 <form [formGroup]='searchForm'>
     <mat-form-field floatLabel="never" style="width: 100%;">
-        <input matInput placeholder="{{'NavigationBar.Search' | translate}}" [matAutocomplete]="auto" formControlName='input'>
+        <input id="nav-search" matInput placeholder="{{'NavigationBar.Search' | translate}}" [matAutocomplete]="auto" formControlName='input'>
     </mat-form-field>
 
     <mat-autocomplete #auto="matAutocomplete" (optionSelected)="selected($event)" [displayWith]="displayFn">
diff --git a/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.html b/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.html
index 9643ee2a1..e5949e670 100644
--- a/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.html
+++ b/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.html
@@ -61,7 +61,7 @@
                 </mat-select>
               </mat-form-field>
               <div class="md-form-field" style="display:inline;margin-left:20px;">
-                <button mat-raised-button (click)="getProfiles(form)" color="primary">Load Profiles <span
+                <button mat-raised-button type="button" (click)="getProfiles(form)" color="primary">Load Profiles <span
                     *ngIf="profilesRunning" class="fa fa-spinner fa-spin"></span></button>
               </div>
             </div>
@@ -76,7 +76,7 @@
                 </mat-select>
               </mat-form-field>
               <div class="md-form-field" style="display:inline;margin-left:20px;">
-                <button mat-raised-button (click)="getRootFolders(form)" color="primary">Load Root Folders <span
+                <button mat-raised-button type="button" (click)="getRootFolders(form)" color="primary">Load Root Folders <span
                     *ngIf="rootFoldersRunning" class="fa fa-spinner fa-spin"></span></button>
               </div>
             </div>
@@ -91,7 +91,7 @@
                 </mat-select>
               </mat-form-field>
               <div class="md-form-field" style="display:inline;margin-left:20px;">
-                <button mat-raised-button (click)="getMetadataProfiles(form)" color="primary">Load Metadata <span
+                <button mat-raised-button type="button" (click)="getMetadataProfiles(form)" color="primary">Load Metadata <span
                     *ngIf="metadataRunning" class="fa fa-spinner fa-spin"></span></button></div>
             </div>
 
diff --git a/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.ts b/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.ts
index c85b65c4d..7ff770c4c 100644
--- a/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.ts
+++ b/src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.ts
@@ -35,7 +35,7 @@ export class LidarrComponent implements OnInit {
                 this.form = this.fb.group({
                     enabled: [x.enabled],
                     apiKey: [x.apiKey, [Validators.required]],
-                    defaultQualityProfile: [x.defaultQualityProfile, [Validators.required]],
+                    defaultQualityProfile: [+x.defaultQualityProfile, [Validators.required]],
                     defaultRootPath: [x.defaultRootPath, [Validators.required]],
                     ssl: [x.ssl],
                     subDir: [x.subDir],
@@ -45,6 +45,15 @@ export class LidarrComponent implements OnInit {
                     metadataProfileId: [x.metadataProfileId, [Validators.required]],
                     addOnly: [x.addOnly],
                 });
+                
+                this.qualities = [];
+                this.qualities.push({ name: "Please Select", id: -1 });
+
+                this.rootFolders = [];
+                this.rootFolders.push({ path: "Please Select", id: -1 });
+
+                this.metadataProfiles = [];
+                this.metadataProfiles.push({ name: "Please Select", id: -1 });
 
                 if (x.defaultQualityProfile) {
                     this.getProfiles(this.form);
@@ -56,15 +65,6 @@ export class LidarrComponent implements OnInit {
                     this.getMetadataProfiles(this.form);
                 }
             });
-
-        this.qualities = [];
-        this.qualities.push({ name: "Please Select", id: -1 });
-
-        this.rootFolders = [];
-        this.rootFolders.push({ path: "Please Select", id: -1 });
-
-        this.metadataProfiles = [];
-        this.metadataProfiles.push({ name: "Please Select", id: -1 });
     }
 
     public getProfiles(form: FormGroup) {