fix(api): return correct store urls based on the schema from getPlaygroundAppQrCode method

Author: Fatme

lib/definitions/preview-app-livesync.d.ts

@@ -45,7 +45,7 @@ declare global {
 		printLiveSyncQrCode(options: IPrintLiveSyncOptions): Promise<void>;
 	}
 
-	interface IPlaygroundAppQrCodeOptions {
+	interface IPlaygroundAppQrCodeOptions extends IProjectDir {
 		platform?: string;
 	}
 
@@ -71,8 +71,10 @@ declare global {
 
 	interface IPreviewSchemaData {
 		name: string;
-		previewAppId: string;
 		scannerAppId: string;
+		scannerAppStoreId: string;
+		previewAppId: string;
+		previewAppStoreId: string;
 		msvKey: string;
 		publishKey: string;
 		subscribeKey: string;

lib/services/livesync/playground/preview-app-constants.ts

@@ -8,11 +8,6 @@ export class PubnubKeys {
 	public static SUBSCRIBE_KEY = "sub-c-3dad1ebe-aaa3-11e8-8027-363023237e0b";
 }
 
-export class PlaygroundStoreUrls {
-	public static GOOGLE_PLAY_URL = "https://play.google.com/store/apps/details?id=org.nativescript.play";
-	public static APP_STORE_URL = "https://itunes.apple.com/us/app/nativescript-playground/id1263543946?mt=8&ls=1";
-}
-
 export class PluginComparisonMessages {
 	public static PLUGIN_NOT_INCLUDED_IN_PREVIEW_APP = "Plugin %s is not included in preview app on device %s and will not work.";
 	public static LOCAL_PLUGIN_WITH_DIFFERENCE_IN_MAJOR_VERSION = "Local plugin %s differs in major version from plugin in preview app. The local plugin has version %s and the plugin in preview app has version %s. Some features might not work as expected.";

lib/services/livesync/playground/preview-qr-code-service.ts

@@ -1,6 +1,5 @@
 import * as util from "util";
 import { EOL } from "os";
-import { PlaygroundStoreUrls } from "./preview-app-constants";
 import { exported } from "../../../common/decorators";
 
 export class PreviewQrCodeService implements IPreviewQrCodeService {
@@ -10,20 +9,22 @@ export class PreviewQrCodeService implements IPreviewQrCodeService {
 		private $logger: ILogger,
 		private $mobileHelper: Mobile.IMobileHelper,
 		private $previewSdkService: IPreviewSdkService,
+		private $previewSchemaService: IPreviewSchemaService,
 		private $qrCodeTerminalService: IQrCodeTerminalService,
 		private $qr: IQrCodeGenerator
 	) { }
 
 	@exported("previewQrCodeService")
 	public async getPlaygroundAppQrCode(options?: IPlaygroundAppQrCodeOptions): Promise<IDictionary<IQrCodeImageData>> {
+		const { projectDir } = options;
 		const result = Object.create(null);
 
 		if (!options || !options.platform || this.$mobileHelper.isAndroidPlatform(options.platform)) {
-			result.android = await this.getLiveSyncQrCode(PlaygroundStoreUrls.GOOGLE_PLAY_URL);
+			result.android = await this.getLiveSyncQrCode(this.getGooglePlayUrl(projectDir));
 		}
 
 		if (!options || !options.platform || this.$mobileHelper.isiOSPlatform(options.platform)) {
-			result.ios = await this.getLiveSyncQrCode(PlaygroundStoreUrls.APP_STORE_URL);
+			result.ios = await this.getLiveSyncQrCode(this.getAppStoreUrl(projectDir));
 		}
 
 		return result;
@@ -56,8 +57,8 @@ export class PreviewQrCodeService implements IPreviewQrCodeService {
 			this.$logger.printMarkdown(`# Use \`NativeScript Playground app\` and scan the \`QR code\` above to preview the application on your device.`);
 			this.$logger.printMarkdown(`
 To scan the QR code and deploy your app on a device, you need to have the \`NativeScript Playground app\`:
-	App Store (iOS): ${PlaygroundStoreUrls.APP_STORE_URL}
-	Google Play (Android): ${PlaygroundStoreUrls.GOOGLE_PLAY_URL}`);
+	App Store (iOS): ${this.getAppStoreUrl(options.projectDir)}
+	Google Play (Android): ${this.getGooglePlayUrl(options.projectDir)}`);
 		}
 	}
 
@@ -73,5 +74,15 @@ To scan the QR code and deploy your app on a device, you need to have the \`Nati
 
 		return url;
 	}
+
+	private getGooglePlayUrl(projectDir: string): string {
+		const schema = this.$previewSchemaService.getSchemaData(projectDir);
+		return `https://play.google.com/store/apps/details?id=${schema.scannerAppId}`;
+	}
+
+	private getAppStoreUrl(projectDir: string): string {
+		const schema = this.$previewSchemaService.getSchemaData(projectDir);
+		return `https://itunes.apple.com/us/app/nativescript-playground/id${schema.scannerAppStoreId}?mt=8&ls=1`;
+	}
 }
 $injector.register("previewQrCodeService", PreviewQrCodeService);

lib/services/livesync/playground/preview-schema-service.ts

@@ -4,17 +4,21 @@ export class PreviewSchemaService implements IPreviewSchemaService {
 	private previewSchemas: IDictionary<IPreviewSchemaData> = {
 		"nsplay": {
 			name: "nsplay",
-			previewAppId: "org.nativescript.preview",
 			scannerAppId: "org.nativescript.play",
+			scannerAppStoreId: "1263543946",
+			previewAppId: "org.nativescript.preview",
+			previewAppStoreId: "1264484702",
 			msvKey: "cli",
 			publishKey: PubnubKeys.PUBLISH_KEY,
 			subscribeKey: PubnubKeys.SUBSCRIBE_KEY,
 			default: true
 		},
 		"ksplay": {
 			name: "ksplay",
-			previewAppId: "com.kinvey.preview",
 			scannerAppId: "com.kinvey.scanner",
+			scannerAppStoreId: "1263543946",
+			previewAppId: "com.kinvey.preview",
+			previewAppStoreId: "1264484702",
 			msvKey: "kinveyStudio",
 			publishKey: PubnubKeys.PUBLISH_KEY,
 			subscribeKey: PubnubKeys.SUBSCRIBE_KEY
@@ -25,9 +29,7 @@ export class PreviewSchemaService implements IPreviewSchemaService {
 		private $projectDataService: IProjectDataService) { }
 
 	public getSchemaData(projectDir: string): IPreviewSchemaData {
-		const projectData = this.$projectDataService.getProjectData(projectDir);
-
-		let schemaName = projectData.previewAppSchema;
+		let schemaName = this.getSchemaNameFromProject(projectDir);
 		if (!schemaName) {
 			schemaName = _.findKey(this.previewSchemas, previewSchema => previewSchema.default);
 		}
@@ -39,5 +41,14 @@ export class PreviewSchemaService implements IPreviewSchemaService {
 
 		return result;
 	}
+
+	private getSchemaNameFromProject(projectDir: string): string {
+		try {
+			const projectData = this.$projectDataService.getProjectData(projectDir);
+			return projectData.previewAppSchema;
+		} catch (err) { /* ignore the error */ }
+
+		return null;
+	}
 }
 $injector.register("previewSchemaService", PreviewSchemaService);