Merge pull request #24 from NativeScript/milanov/move-static-login-page-to-cloud

Move the login complete page in the server

Author: TsvetanMilanov

README.md

@@ -9,7 +9,7 @@ const tns = require("nativescript");
 
 ### Module cloudBuildService
 The `cloudBuildService` allows build of applications in the cloud. You can call the following methods:
-* `build` method - it validates passed arguments and tries to build the application in the cloud. In case of successful build, the build result (.apk, .ipa or .zip) is downloaded. The result contains information about the whole build process, path to the downloaded build result and information used to generate a QR code, pointing to the latest build result (in S3). </br>
+* `build` method - it validates passed arguments and tries to build the application in the cloud. In case of successful build, the build result (.apk, .ipa or .zip) is downloaded. The result contains information about the whole build process, path to the downloaded build result and information used to generate a QR code, pointing to the latest build result (in S3). During the build the cloudBuildService will emit buildOutput event which will contain parts of the current build output.</br>
 Definition:
 
 ```TypeScript
@@ -51,6 +51,17 @@ const androidReleaseConfigurationData = {
 const platform = "android";
 const buildConfiguration = "release";
 
+tns.cloudBuildService.on("buildOutput", (data) => {
+	console.log(data);
+	/*
+		Sample data object:
+		{
+			"pipe": "stdout",
+			"data": "Add platform ios with runtime version 2.5.*"
+		}
+	*/
+});
+
 tns.cloudBuildService
 	.build(projectSettings, platform, buildConfiguration, androidReleaseConfigurationData)
 	.then(buildResult => console.log(buildResult))

lib/constants.ts

@@ -24,7 +24,7 @@ export const BUILD_SERVICE_NAME = "build";
 export const EMULATORS_SERVICE_NAME = "emulators";
 
 export const CLOUD_BUILD_EVENT_NAMES = {
-	OUTPUT: "output"
+	BUILD_OUTPUT: "buildOutput"
 };
 
 export const DEVICE_DISCOVERY_EVENTS = {
@@ -58,11 +58,13 @@ export const HTTP_HEADERS = {
 	ACCEPT: "Accept",
 	AUTHORIZATION: "Authorization",
 	CONNECTION: "Connection",
-	CONTENT_TYPE: "Content-Type"
+	CONTENT_TYPE: "Content-Type",
+	LOCATION: "Location"
 };
 
 export const HTTP_STATUS_CODES = {
 	SUCCESS: 200,
+	FOUND: 302,
 	UNAUTHORIZED: 401,
 	PAYMENT_REQUIRED: 402
 };

lib/services/authentication-service.ts

@@ -1,7 +1,7 @@
 import { ServerRequest, ServerResponse, Server } from "http";
 import { parse } from "url";
-import { join } from "path";
 import { isInteractive } from "../helpers";
+import { HTTP_HEADERS, HTTP_STATUS_CODES } from "../constants";
 
 export class AuthenticationService implements IAuthenticationService {
 	private static DEFAULT_NONINTERACTIVE_LOGIN_TIMEOUT_MS: number = 15 * 60 * 1000;
@@ -32,19 +32,21 @@ export class AuthenticationService implements IAuthenticationService {
 		let loginUrl: string;
 		this.localhostServer = this.$httpServer.createServer({
 			routes: {
-				"/": async (request: ServerRequest, response: ServerResponse) => {
+				"/": (request: ServerRequest, response: ServerResponse) => {
 					this.$logger.debug("Login complete: " + request.url);
 					const parsedUrl = parse(request.url, true);
 					const loginResponse = parsedUrl.query.response;
 					if (loginResponse) {
-						await this.serveLoginFile("end.html")(request, response);
+						response.statusCode = HTTP_STATUS_CODES.FOUND;
+						response.setHeader(HTTP_HEADERS.LOCATION, parsedUrl.query.loginCompleteUrl);
 						this.killLocalhostServer();
 
 						isResolved = true;
 
 						const decodedResponse = new Buffer(loginResponse, "base64").toString();
 						this.rejectLoginPromiseAction = null;
 						authCompleteResolveAction(decodedResponse);
+						response.end();
 					} else {
 						this.$httpServer.redirect(response, loginUrl);
 					}
@@ -172,10 +174,6 @@ export class AuthenticationService implements IAuthenticationService {
 		return tokenState;
 	}
 
-	private serveLoginFile(relPath: string): (request: ServerRequest, response: ServerResponse) => Promise<void> {
-		return this.$httpServer.serveFile(join(__dirname, "..", "..", "resources", "login", relPath));
-	}
-
 	private killLocalhostServer(): void {
 		this.localhostServer.close();
 		this.localhostServer = null;

lib/services/cloud-build-service.ts

@@ -74,10 +74,12 @@ export class CloudBuildService extends EventEmitter implements ICloudBuildServic
 			url: buildResultUrl
 		};
 
+		const fullOutput = await this.getContentOfS3File(buildResponse.outputUrl);
+
 		const result = {
 			stderr: buildResult.stderr,
 			stdout: buildResult.stdout,
-			fullOutput: buildResult.stdout,
+			fullOutput: fullOutput,
 			outputFilePath: localBuildResult,
 			qrData: {
 				originalUrl: buildResultUrl,
@@ -221,7 +223,8 @@ export class CloudBuildService extends EventEmitter implements ICloudBuildServic
 						// The logs variable will contain the full build log and we need to log only the logs that we don't have.
 						const contentToLog = this.$cloudBuildOutputFilter.filter(logs.substr(outputCursorPosition));
 						if (contentToLog) {
-							this.emit(constants.CLOUD_BUILD_EVENT_NAMES.OUTPUT, contentToLog);
+							const data = { data: contentToLog, pipe: "stdout" };
+							this.emit(constants.CLOUD_BUILD_EVENT_NAMES.BUILD_OUTPUT, data);
 							this.$logger.info(contentToLog);
 						}