github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-14 02:26:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(wizard): 🐛 Fixed the issue where the Application Url wasn't validated in the wizard

Browse source 
#4417
This commit is contained in:
tidusjar 2022-01-14 10:49:52 +00:00
commit 33b8d1111a
3 changed files with 43 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Ombi.Core/Senders/TvSender.cs
View file

@ -310,15 +310,17 @@ namespace Ombi.Core.Senders
private async Task SendToSonarr(ChildRequests model, SonarrSeries result, SonarrSettings s)
{
// Check to ensure we have the all the seasons, ensure the Sonarr metadata has grabbed all the data
Season existingSeason = null;
foreach (var season in model.SeasonRequests)
{
var attempt = 0;
var existingSeason = result.seasons.FirstOrDefault(x => x.seasonNumber == season.SeasonNumber);
existingSeason = result.seasons.FirstOrDefault(x => x.seasonNumber == season.SeasonNumber);
while (existingSeason == null && attempt < 5)
{
attempt++;
Logger.LogInformation("There was no season numer {0} in Sonarr for title {1}. Will try again as the metadata did not get created", season.SeasonNumber, model.ParentRequest.Title);
result = await SonarrApi.GetSeriesById(result.id, s.ApiKey, s.FullUri);
existingSeason = result.seasons.FirstOrDefault(x => x.seasonNumber == season.SeasonNumber);
await Task.Delay(500);
}
}
@ -348,7 +350,7 @@ namespace Ombi.Core.Senders
foreach (var ep in season.Episodes)
{
var sonarrEp = sonarrEpList.FirstOrDefault(x =>
x.episodeNumber == ep.EpisodeNumber && x.seasonNumber == req.SeasonNumber);
x.episodeNumber == ep.EpisodeNumber && x.seasonNumber == season.SeasonNumber);
if (sonarrEp != null && !sonarrEp.monitored)
{
sonarrEp.monitored = true;
@ -366,9 +368,7 @@ namespace Ombi.Core.Senders
//// NOTE, not sure if needed since ombi ui displays future episodes anyway...
//ourEpisodes.AddRange(unairedEpisodes);
//var distinctEpisodes = ourEpisodes.Distinct().ToList();
//var missingEpisodes = Enumerable.Range(distinctEpisodes.Min(), distinctEpisodes.Count).Except(distinctEpisodes);
//var missingEpisodes = Enumerable.Range(distinctEpisodes.Min(), distinctEpisodes.Count).Except(distinctEpisodes);
if (sonarrEpCount == ourRequestCount /*|| !missingEpisodes.Any()*/)

54
src/Ombi/ClientApp/src/app/wizard/welcome/welcome.component.ts
View file

@ -1,11 +1,11 @@
import { AfterViewInit, Component, OnInit, ViewChild } from "@angular/core";
import { Router } from "@angular/router";
import { IdentityService, NotificationService, SettingsService } from "../../services";
import { ICreateWizardUser } from "../../interfaces";
import { IdentityService, NotificationService } from "../../services";
import { IOmbiConfigModel } from "../models/OmbiConfigModel";
import { WizardService } from "../services/wizard.service";
import { MatHorizontalStepper } from'@angular/material/stepper';
import { StepperSelectionEvent } from "@angular/cdk/stepper";
import { Router } from "@angular/router";
import { WizardService } from "../services/wizard.service";
@Component({
templateUrl: "./welcome.component.html",
@ -18,7 +18,8 @@ export class WelcomeComponent implements OnInit {
public config: IOmbiConfigModel;
constructor(private router: Router, private identityService: IdentityService,
private notificationService: NotificationService, private WizardService: WizardService) { }
private notificationService: NotificationService, private WizardService: WizardService,
private settingsService: SettingsService) { }
public ngOnInit(): void {
this.localUser = {
@ -34,20 +35,39 @@ export class WelcomeComponent implements OnInit {
}
public createUser() {
this.WizardService.addOmbiConfig(this.config).subscribe(config => {
if(config != null) {
this.identityService.createWizardUser(this.localUser).subscribe(x => {
if (x.result) {
// save the config
this.router.navigate(["login"]);
if (this.config.applicationUrl) {
this.settingsService.verifyUrl(this.config.applicationUrl).subscribe(x => {
if (!x) {
this.notificationService.error(`The URL "${this.config.applicationUrl}" is not valid. Please format it correctly e.g. http://www.google.com/`);
this.stepper.selectedIndex = 3;
return;
}
this.saveConfig();
});
} else {
if (x.errors.length > 0) {
this.notificationService.error(x.errors[0]);
this.stepper.previous();
}
this.saveConfig();
}
});
}
}, configErr => this.notificationService.error(configErr));
private saveConfig() {
this.WizardService.addOmbiConfig(this.config).subscribe({
next: (config) => {
if(config != null) {
this.identityService.createWizardUser(this.localUser).subscribe(x => {
if (x.result) {
// save the config
this.router.navigate(["login"]);
} else {
if (x.errors.length > 0) {
this.notificationService.error(x.errors[0]);
this.stepper.previous();
}
}
});
}
},
error: (configErr) => this.notificationService.error(configErr)
});
}
}

1
src/Ombi/Controllers/V1/SettingsController.cs
View file

@ -334,6 +334,7 @@ namespace Ombi.Controllers.V1
[ApiExplorerSettings(IgnoreApi = true)]
[HttpPost("customization/urlverify")]
[AllowAnonymous]
public bool VerifyUrl([FromBody]UrlVerifyModel url)
{
return Uri.TryCreate(url.Url, UriKind.Absolute, out var __);