From 76fbdce3be2f8f64ce2d4e319735a39fc905fbeb Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 1 Apr 2020 02:57:26 +0200 Subject: [PATCH] Implementing authorization on the video player --- src/app/app.module.ts | 2 +- src/app/player/player.component.ts | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index e7e88f55..edbb022d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -130,7 +130,7 @@ export class AppModule client_id: 'kyoo.webapp', response_type: "code", trigger_authorization_result_event: true, - scope: "openid profile kyoo.read offline_access", + scope: "openid profile offline_access kyoo.read kyoo.play", silent_renew: false, silent_renew_url: "/silent", use_refresh_token: false, diff --git a/src/app/player/player.component.ts b/src/app/player/player.component.ts index 8bae0b72..bce38e01 100644 --- a/src/app/player/player.component.ts +++ b/src/app/player/player.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import {Component, Inject, Injector, OnInit, ViewEncapsulation} from '@angular/core'; import { MatSnackBar } from "@angular/material/snack-bar"; import { DomSanitizer, Title } from "@angular/platform-browser"; import { ActivatedRoute, Event, NavigationCancel, NavigationEnd, NavigationStart, Router } from "@angular/router"; @@ -6,6 +6,7 @@ import { Track, WatchItem } from "../../models/watch-item"; import { Location } from "@angular/common"; import * as Hls from "hls.js" import { getPlaybackMethod, method, getWhatIsSupported, SupportList } from "../../videoSupport/playbackMethodDetector"; +import {OidcSecurityService} from "angular-auth-oidc-client"; declare var SubtitleManager: any; @@ -51,8 +52,11 @@ export class PlayerComponent implements OnInit private thumb: HTMLElement; private progress: HTMLElement; private buffered: HTMLElement; + + + private oidcSecurity: OidcSecurityService; - constructor(private route: ActivatedRoute, private sanitizer: DomSanitizer, private snackBar: MatSnackBar, private title: Title, private router: Router, private location: Location) { } + constructor(private route: ActivatedRoute, private sanitizer: DomSanitizer, private snackBar: MatSnackBar, private title: Title, private router: Router, private location: Location, private injector: Injector) { } ngOnInit() { @@ -399,6 +403,16 @@ export class PlayerComponent implements OnInit selectPlayMethod(playMethod: method) { this.playMethod = playMethod; + + if (this.oidcSecurity === undefined) + this.oidcSecurity = this.injector.get(OidcSecurityService); + this.hlsPlayer.config.xhrSetup = (xhr, url) => + { + const token = this.oidcSecurity.getToken(); + if (token) + xhr.setRequestHeader("Authorization", "Bearer " + token); + }; + if (this.playMethod == method.direct) { this.player.src = "/video/" + this.item.link;