Added a button for users running the legacy app to launch like they did in V3, this button is in the user preferences area of the site

pull/3970/head
tidusjar 4 years ago
parent 39680792e9
commit b6d67b2e24

@ -25,7 +25,8 @@
<div class="col-7"> <div class="col-7">
<mat-label [translate]="'UserPreferences.MobileQRCode'"></mat-label> <mat-label [translate]="'UserPreferences.MobileQRCode'"></mat-label>
<qrcode *ngIf="qrCodeEnabled" [qrdata]="qrCode" [size]="256" [level]="'L'"></qrcode> <qrcode *ngIf="qrCodeEnabled" [qrdata]="qrCode" [size]="256" [level]="'L'"></qrcode>
<button mat-raised-button (click)="openMobileApp($event)" *ngIf="customizationSettings.applicationUrl"> {{
'UserPreferences.LegacyApp' | translate }}</button>
</div> </div>
<div class="col-4"> <div class="col-4">

@ -4,7 +4,7 @@ import { TranslateService } from "@ngx-translate/core";
import { AvailableLanguages, ILanguage } from "./user-preference.constants"; import { AvailableLanguages, ILanguage } from "./user-preference.constants";
import { StorageService } from "../../../shared/storage/storage-service"; import { StorageService } from "../../../shared/storage/storage-service";
import { IdentityService, NotificationService, SettingsService } from "../../../services"; import { IdentityService, NotificationService, SettingsService } from "../../../services";
import { IUser } from "../../../interfaces"; import { ICustomizationSettings, IUser } from "../../../interfaces";
@Component({ @Component({
templateUrl: "./user-preference.component.html", templateUrl: "./user-preference.component.html",
@ -19,6 +19,7 @@ export class UserPreferenceComponent implements OnInit {
public qrCodeEnabled: boolean; public qrCodeEnabled: boolean;
public countries: string[]; public countries: string[];
public selectedCountry: string; public selectedCountry: string;
public customizationSettings: ICustomizationSettings;
private user: IUser; private user: IUser;
@ -33,14 +34,14 @@ export class UserPreferenceComponent implements OnInit {
if (user.name) { if (user.name) {
this.username = user.name; this.username = user.name;
} }
const customization = await this.settingsService.getCustomization().toPromise(); this.customizationSettings = await this.settingsService.getCustomization().toPromise();
this.selectedLang = this.translate.currentLang; this.selectedLang = this.translate.currentLang;
const accessToken = await this.identityService.getAccessToken().toPromise(); const accessToken = await this.identityService.getAccessToken().toPromise();
this.qrCode = `${customization.applicationUrl}|${accessToken}`; this.qrCode = `${this.customizationSettings.applicationUrl}|${accessToken}`;
if(!customization.applicationUrl) { if(!this.customizationSettings.applicationUrl) {
this.qrCodeEnabled = false; this.qrCodeEnabled = false;
} else { } else {
this.qrCodeEnabled = true; this.qrCodeEnabled = true;
@ -49,6 +50,7 @@ export class UserPreferenceComponent implements OnInit {
this.user = await this.identityService.getUser().toPromise(); this.user = await this.identityService.getUser().toPromise();
this.selectedCountry = this.user.streamingCountry; this.selectedCountry = this.user.streamingCountry;
this.identityService.getSupportedStreamingCountries().subscribe(x => this.countries = x); this.identityService.getSupportedStreamingCountries().subscribe(x => this.countries = x);
this.settingsService.getCustomization().subscribe(x => this.customizationSettings = x);
} }
@ -61,4 +63,12 @@ export class UserPreferenceComponent implements OnInit {
this.identityService.updateStreamingCountry(this.selectedCountry).subscribe(x => this.notification.success(this.translate.instant("UserPreferences.Updated"))); this.identityService.updateStreamingCountry(this.selectedCountry).subscribe(x => this.notification.success(this.translate.instant("UserPreferences.Updated")));
} }
public openMobileApp(event: any) {
event.preventDefault();
this.identityService.getAccessToken().subscribe(x => {
const url = `ombi://${this.customizationSettings.applicationUrl}_${x}`;
window.location.assign(url);
});
}
} }

@ -306,6 +306,7 @@
"StreamingCountry":"Streaming Country", "StreamingCountry":"Streaming Country",
"StreamingCountryDescription": "This is the country code that we will display streaming information for. If you are in the US please select US and you will have US related streaming information.", "StreamingCountryDescription": "This is the country code that we will display streaming information for. If you are in the US please select US and you will have US related streaming information.",
"LanguageDescription": "This is the language you would like the Ombi interface to be displayed in.", "LanguageDescription": "This is the language you would like the Ombi interface to be displayed in.",
"MobileQRCode":"Mobile QR Code" "MobileQRCode":"Mobile QR Code",
"LegacyApp":"Launch Legacy App"
} }
} }
Loading…
Cancel
Save