EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3658 from dpalou/MOBILE-4270 

MOBILE-4303 iframe: Fix auto-login applied in H5P local URLs
main
Noel De Martin 2023-05-04 12:38:43 +02:00 committed by GitHub
parent deb6be243a f8d3c023cc
commit 90603c022a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/components/iframe/iframe.ts
View File

@ -156,8 +156,14 @@ export class CoreIframeComponent implements OnChanges, OnDestroy {
* Detect changes on input properties. * Detect changes on input properties.
*/ */
async ngOnChanges(changes: {[name: string]: SimpleChange }): Promise<void> { async ngOnChanges(changes: {[name: string]: SimpleChange }): Promise<void> {
if (changes.src) { if (!changes.src) {
let url = CoreUrlUtils.getYoutubeEmbedUrl(changes.src.currentValue) || changes.src.currentValue; return;
}
let url = changes.src.currentValue;
if (!CoreUrlUtils.isLocalFileUrl(url)) {
url = CoreUrlUtils.getYoutubeEmbedUrl(changes.src.currentValue) || changes.src.currentValue;
this.displayHelp = CoreIframeUtils.shouldDisplayHelpForUrl(url); this.displayHelp = CoreIframeUtils.shouldDisplayHelpForUrl(url);
const currentSite = CoreSites.getCurrentSite(); const currentSite = CoreSites.getCurrentSite();
@ -173,14 +179,14 @@ export class CoreIframeComponent implements OnChanges, OnDestroy {
} }
await CoreIframeUtils.fixIframeCookies(url); await CoreIframeUtils.fixIframeCookies(url);
this.safeUrl = DomSanitizer.bypassSecurityTrustResourceUrl(CoreFile.convertFileSrc(url));
// Now that the URL has been set, initialize the iframe. Wait for the iframe to the added to the DOM.
setTimeout(() => {
this.init();
});
} }
this.safeUrl = DomSanitizer.bypassSecurityTrustResourceUrl(CoreFile.convertFileSrc(url));
// Now that the URL has been set, initialize the iframe. Wait for the iframe to the added to the DOM.
setTimeout(() => {
this.init();
});
} }
/** /**

2
src/core/services/utils/url.ts
View File

@ -504,7 +504,7 @@ export class CoreUrlUtilsProvider {
*/ */
removeProtocolAndWWW(url: string): string { removeProtocolAndWWW(url: string): string {
// Remove protocol. // Remove protocol.
url = url.replace(/.*?:\/\//g, ''); url = url.replace(/^.*?:\/\//, '');
// Remove www. // Remove www.
url = url.replace(/^www./, ''); url = url.replace(/^www./, '');