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

Fixed Plex OAuth, should no longer show Insecure warning

Browse source
This commit is contained in:
Jamie Rees 2018-07-01 22:16:12 +01:00
parent fe590004d2
commit c55fc32c63
4 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ombi.Api.Plex/PlexApi.cs
View file

@ -214,7 +214,7 @@ namespace Ombi.Api.Plex
? new Request($"Wizard/OAuth/{pinId}", applicationUrl, HttpMethod.Get)
: new Request($"Login/OAuth/{pinId}", applicationUrl, HttpMethod.Get);
request.AddQueryString("forwardUrl", forwardUrl.FullUri.ToString());
//request.AddQueryString("forwardUrl", forwardUrl.FullUri.ToString());
request.AddQueryString("pinID", pinId.ToString());
request.AddQueryString("code", code);
request.AddQueryString("context[device][product]", "Ombi");

13
src/Ombi.Core/Authentication/PlexOAuthManager.cs
View file

@ -34,19 +34,6 @@ namespace Ombi.Core.Authentication
return string.Empty;
}
if (pin.authToken.IsNullOrEmpty())
{
// Looks like we do not have a pin yet, we should retry a few times.
var retryCount = 0;
var retryMax = 5;
var retryWaitMs = 1000;
while (pin.authToken.IsNullOrEmpty() && retryCount < retryMax)
{
retryCount++;
await Task.Delay(retryWaitMs);
pin = await _api.GetPin(pinId);
}
}
return pin.authToken;
}

30
src/Ombi/ClientApp/app/login/login.component.ts
View file

@ -40,6 +40,7 @@ export class LoginComponent implements OnDestroy, OnInit {
}
private timer: any;
private pinTimer: any;
private errorBody: string;
private errorValidation: string;
@ -124,18 +125,35 @@ export class LoginComponent implements OnDestroy, OnInit {
public oauth() {
this.authService.login({usePlexOAuth: true, password:"",rememberMe:true,username:""}).subscribe(x => {
if (window.frameElement) {
// in frame
window.open(x.url, "_blank");
} else {
// not in frame
window.location.href = x.url;
this.pinTimer = setInterval(() => {
this.getPinResult(x.pinId);
}, 10000);
});
}
public getPinResult(pinId: number) {
this.authService.oAuth(pinId).subscribe(x => {
if(x.access_token) {
localStorage.setItem("id_token", x.access_token);
if (this.authService.loggedIn()) {
this.router.navigate(["search"]);
return;
}
});
}
}, err => {
this.notify.error(err.statusText);
this.router.navigate(["login"]);
});
}
public ngOnDestroy() {
clearInterval(this.timer);
clearInterval(this.pinTimer);
}
private cycleBackground() {

2
src/Ombi/Controllers/TokenController.cs
View file

@ -93,7 +93,7 @@ namespace Ombi.Controllers
error = "Application URL has not been set"
});
}
return new JsonResult(new { url = url.ToString() });
return new JsonResult(new { url = url.ToString(), pinId = pin.id });
}
return new UnauthorizedResult();