temporary fix for the issue with opening app lab urls from the ad section
This commit is contained in:
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<app-loading-spinner #spinner></app-loading-spinner>
|
<app-loading-spinner #spinner></app-loading-spinner>
|
||||||
<app-status-bar #status (getHelp)="getHelpModal.openModal(); helpStatus = $event; setExterHelp()"></app-status-bar>
|
<app-status-bar #status (getHelp)="getHelpModal.openModal(); helpStatus = $event; setExterHelp()"></app-status-bar>
|
||||||
<webview id="mainWebView" #webview httpreferrer="https://sdiequestvr.com" [attr.src]="webUrl" allowpopups [ngStyle]="{'left':webService.isWebviewOpen?'0':'-100%'}" class="bsaber-webview" ></webview>
|
<webview id="mainWebView" #webview httpreferrer="https://sdiequestvr.com" [attr.src]="webUrl" allowpopups [ngStyle]="{'left':webService.isWebviewOpen?'0':'-100%'}" class="bsaber-webview" partition='webview-partition'></webview>
|
||||||
|
|
||||||
<mz-modal #getHelpModal [fixedFooter]="true">
|
<mz-modal #getHelpModal [fixedFooter]="true">
|
||||||
<mz-modal-header>
|
<mz-modal-header>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { Injectable, isDevMode } from '@angular/core';
|
import { Injectable, isDevMode } from '@angular/core';
|
||||||
import { AppService } from './app.service';
|
import { AppService } from './app.service';
|
||||||
import { environment } from '../environments/environment';
|
import { environment } from '../environments/environment';
|
||||||
|
import { OPEN_IN_SYSTEM_BROWSER_DOMAINS } from '../../../electron/external-urls';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
@@ -45,12 +46,22 @@ export class WebviewService {
|
|||||||
.bsaber-tooltip.-sidequest-remove::after {
|
.bsaber-tooltip.-sidequest-remove::after {
|
||||||
content: "Remove Custom Level";
|
content: "Remove Custom Level";
|
||||||
}`;
|
}`;
|
||||||
|
let ses = this.appService.remote.session.fromPartition('webview-partition');
|
||||||
|
ses.webRequest.onBeforeRequest((details, callback) => {
|
||||||
|
let url = details.url;
|
||||||
|
const extUrl = new URL(url).host.toLowerCase();
|
||||||
|
if (OPEN_IN_SYSTEM_BROWSER_DOMAINS.includes(extUrl)) {
|
||||||
|
this.appService.electron.shell.openExternal(url);
|
||||||
|
callback({ cancel: true });
|
||||||
|
} else {
|
||||||
|
callback({});
|
||||||
|
}
|
||||||
|
});
|
||||||
this.webView.addEventListener('did-start-loading', e => {
|
this.webView.addEventListener('did-start-loading', e => {
|
||||||
//this.currentAddress = this.webView.getURL();
|
|
||||||
this.isWebviewLoading = true;
|
this.isWebviewLoading = true;
|
||||||
this.webView.insertCSS(customCss);
|
this.webView.insertCSS(customCss);
|
||||||
});
|
});
|
||||||
this.webView.addEventListener('did-navigate-in-page', () => {
|
this.webView.addEventListener('did-navigate-in-page', e => {
|
||||||
this.currentAddress = this.webView.getURL();
|
this.currentAddress = this.webView.getURL();
|
||||||
});
|
});
|
||||||
this.webView.addEventListener('did-stop-loading', async e => {
|
this.webView.addEventListener('did-stop-loading', async e => {
|
||||||
|
|||||||
+6
-9
@@ -16,16 +16,9 @@ const crypto = require('crypto');
|
|||||||
const request = require('request');
|
const request = require('request');
|
||||||
const progress = require('request-progress');
|
const progress = require('request-progress');
|
||||||
|
|
||||||
const OPEN_IN_SYSTEM_BROWSER_DOMAINS = [
|
|
||||||
'www.oculus.com',
|
|
||||||
'oculus.com',
|
|
||||||
'facebook.com',
|
|
||||||
'www.facebook.com',
|
|
||||||
'twitter.com',
|
|
||||||
'www.twitter.com',
|
|
||||||
];
|
|
||||||
// const Readable = require('stream').Readable;
|
// const Readable = require('stream').Readable;
|
||||||
import { SetPropertiesCommand } from './setproperties';
|
import { SetPropertiesCommand } from './setproperties';
|
||||||
|
import { OPEN_IN_SYSTEM_BROWSER_DOMAINS } from './external-urls';
|
||||||
let has_port = process.argv.indexOf('--port');
|
let has_port = process.argv.indexOf('--port');
|
||||||
let valid_port = has_port > -1 && process.argv[has_port + 1] && Number.isInteger(Number(process.argv[has_port + 1]));
|
let valid_port = has_port > -1 && process.argv[has_port + 1] && Number.isInteger(Number(process.argv[has_port + 1]));
|
||||||
class ADB {
|
class ADB {
|
||||||
@@ -533,6 +526,7 @@ function createWindow() {
|
|||||||
mainWindow.webContents.on('did-fail-load', () => mainWindow.loadURL(mainWindow.webContents.getURL()));
|
mainWindow.webContents.on('did-fail-load', () => mainWindow.loadURL(mainWindow.webContents.getURL()));
|
||||||
addWindowDownloadHandler(mainWindow);
|
addWindowDownloadHandler(mainWindow);
|
||||||
const handleOpenWindow: (details: HandlerDetails) => { action: 'allow' } | { action: 'deny' } = e => {
|
const handleOpenWindow: (details: HandlerDetails) => { action: 'allow' } | { action: 'deny' } = e => {
|
||||||
|
console.log(e);
|
||||||
if (!e.postBody) {
|
if (!e.postBody) {
|
||||||
try {
|
try {
|
||||||
const extUrl = new URL(e.url).host.toLowerCase();
|
const extUrl = new URL(e.url).host.toLowerCase();
|
||||||
@@ -540,7 +534,10 @@ function createWindow() {
|
|||||||
shell.openExternal(e.url);
|
shell.openExternal(e.url);
|
||||||
return { action: 'deny' };
|
return { action: 'deny' };
|
||||||
}
|
}
|
||||||
} catch {}
|
} catch (e) {
|
||||||
|
console.log(e);
|
||||||
|
return { action: 'allow' };
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return { action: 'allow' };
|
return { action: 'allow' };
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
export const OPEN_IN_SYSTEM_BROWSER_DOMAINS = [
|
||||||
|
'www.oculus.com',
|
||||||
|
'oculus.com',
|
||||||
|
'facebook.com',
|
||||||
|
'www.facebook.com',
|
||||||
|
'twitter.com',
|
||||||
|
'www.twitter.com',
|
||||||
|
];
|
||||||
Reference in New Issue
Block a user