Merge pull request #143 from NativeScript/tnikolov/kinvey-auth

 Allow Kinvey Studio users to perform cloud builds

Author: TomaNikolov

lib/bootstrap.ts

@@ -9,6 +9,8 @@ $injector.require("nsCloudOptionsProvider", path.join(__dirname, "cloud-options-
 $injector.require("nsCloudBuildHelper", path.join(__dirname, "cloud-build-helper"));
 $injector.require("nsCloudBuildCommandHelper", path.join(__dirname, "commands", "build-command-helper"));
 $injector.require("nsCloudEulaCommandHelper", path.join(__dirname, "commands", "eula-command-helper"));
+$injector.require("nsCloudKinveyUserService", path.join(__dirname, "services", "kinvey-user-service"));
+$injector.require("nsCloudTelerikUserService", path.join(__dirname, "services", "telerik-user-service"));
 
 // Mobile.
 $injector.require("nsCloudEmulatorDeviceDiscovery", path.join(__dirname, "mobile", "mobile-core", "cloud-emulator-device-discovery"));

lib/cloud-options-provider.ts

@@ -7,6 +7,7 @@ export class CloudOptionsProvider implements ICloudOptionsProvider {
 			apiVersion: { type: OptionType.String },
 			local: { type: OptionType.Boolean },
 			serverProto: { type: OptionType.String },
+			namespace: { type: OptionType.String },
 			sharedCloud: { type: OptionType.Boolean },
 			workflow: { type: OptionType.Object },
 			vmTemplateName: { type: OptionType.String },

lib/commands/config/config-apply.ts

@@ -12,7 +12,7 @@ export class ConfigApplyCommand implements ICommand {
 
 	public async execute(args: string[]): Promise<void> {
 		const configurationName = args[0];
-		const globalServerConfig: IServerConfigBase = { apiVersion: this.$options.apiVersion, serverProto: this.$options.serverProto };
+		const globalServerConfig: IServerConfigBase = { apiVersion: this.$options.apiVersion, serverProto: this.$options.serverProto, namespace: this.$options.namespace };
 		this.$nsCloudServerConfigManager.applyConfig(configurationName, null, globalServerConfig);
 		this.$nsCloudServerConfigManager.printConfigData();
 	}

lib/constants.ts

@@ -76,7 +76,8 @@ export const HTTP_HEADERS = {
 	AUTHORIZATION: "Authorization",
 	CONNECTION: "Connection",
 	CONTENT_TYPE: "Content-Type",
-	LOCATION: "Location"
+	LOCATION: "Location",
+	X_NS_NAMESPACE: "X-NS-Namespace"
 };
 
 export const HTTP_STATUS_CODES = {

lib/definitions/authentication-service.d.ts

@@ -83,3 +83,17 @@ interface IUserInfo {
 	isProfilePublic: boolean;
 	twitterName: String;
 }
+
+interface IKinveyUserData {
+	email: string;
+	firstName: string;
+	lastName: string
+	lastLoginTime?: Date;
+	name?: string;
+	token: string;
+	twoFactorAuth?: IKinveyTwoFactorAuth
+}
+
+interface IKinveyTwoFactorAuth {
+	enabled: boolean;
+}

lib/definitions/cloud-options.d.ts

@@ -6,6 +6,7 @@ interface ICloudOptions extends IOptions, ISharedCloud {
 	apiVersion: string;
 	local: boolean;
 	serverProto: string;
+	namespace: string;
 	track: string;
 	workflow: IWorkflowPropertyOptions;
 	vmTemplateName: string;

lib/definitions/server-config-manager.d.ts

@@ -23,6 +23,7 @@ interface IServerConfigManager {
 interface IServerConfigBase {
 	apiVersion?: string;
 	serverProto?: string;
+	namespace?: string;
 }
 
 interface IServerConfig extends IServerConfigBase {

lib/services/kinvey-user-service.ts

@@ -0,0 +1,47 @@
+import { join } from "path";
+import { home } from "osenv";
+
+import { UserServiceBase } from "./user-service-base";
+
+export class KinveyUserService extends UserServiceBase implements IUserService {
+	constructor(private $hostInfo: IHostInfo,
+		$injector: IInjector,
+		$logger: ILogger,
+		$fs: IFileSystem,
+		$errors: IErrors) {
+		super($injector, $logger, $fs, $errors);
+		this.userFilePath = this.getUserFilePath();
+	}
+
+	public getUserData(): IUserData {
+		const userData: IKinveyUserData = super.getUserData();
+		return {
+			accessToken: userData.token,
+			refreshToken: "",
+			userInfo: {
+				email: userData.email,
+				firstName: userData.firstName,
+				lastName: userData.lastName
+			}
+		};
+	}
+
+	public setUserData(userData: IUserData): void {
+		const kinveyUserData: IKinveyUserData = {
+			email: userData.userInfo.email,
+			firstName: userData.userInfo.firstName,
+			lastName: userData.userInfo.lastName,
+			token: userData.accessToken
+		};
+
+		super.setUserData(kinveyUserData);
+	}
+
+	private getUserFilePath(): string {
+		return join(this.$hostInfo.isWindows ? join(process.env.AppData) : join(home(), ".local", "share"),
+			"KinveyStudio",
+			"kinveyUser.json");
+	}
+}
+
+$injector.register("nsCloudKinveyUserService", KinveyUserService);

lib/services/server/server-services-proxy.ts

@@ -22,6 +22,11 @@ export class ServerServicesProxy implements IServerServicesProxy {
 			headers[HTTP_HEADERS.AUTHORIZATION] = `${authScheme} ${this.$nsCloudUserService.getUserData().accessToken}`;
 		}
 
+		const namespace = this.getServiceValueOrDefault(options.serviceName, "namespace");
+		if (namespace) {
+			headers[HTTP_HEADERS.X_NS_NAMESPACE] = namespace;
+		}
+
 		if (options.accept) {
 			headers[HTTP_HEADERS.ACCEPT] = options.accept;
 		}

lib/services/telerik-user-service.ts

@@ -0,0 +1,24 @@
+import { join } from "path";
+import { home } from "osenv";
+
+import { UserServiceBase } from "./user-service-base";
+
+export class TelerikUserService extends UserServiceBase implements IUserService {
+	constructor(private $hostInfo: IHostInfo,
+		$injector: IInjector,
+		$logger: ILogger,
+		$fs: IFileSystem,
+		$errors: IErrors) {
+		super($injector, $logger, $fs, $errors);
+		this.userFilePath = this.getUserFilePath();
+	}
+
+	private getUserFilePath(): string {
+		return join(this.$hostInfo.isWindows ? process.env.LocalAppData : join(home(), ".local", "share"),
+		"Telerik",
+		"NativeScript",
+		".nativescript-user");
+	}
+}
+
+$injector.register("nsCloudTelerikUserService", TelerikUserService);

lib/services/user-service-base.ts

@@ -0,0 +1,67 @@
+export abstract class UserServiceBase {
+	protected userFilePath: string;
+
+	private get $nsCloudServerAccountsService(): IServerAccountsService {
+		return this.$injector.resolve<IServerAccountsService>("nsCloudServerAccountsService");
+	}
+
+	constructor(private $injector: IInjector,
+		private $logger: ILogger,
+		private $fs: IFileSystem,
+		private $errors: IErrors) { }
+
+	public hasUser(): boolean {
+		try {
+			const user = this.getUser();
+			return !!user;
+		} catch (err) {
+			return false;
+		}
+	}
+
+	public getUser(): IUser {
+		const userData = this.getUserData();
+
+		return userData.userInfo;
+	}
+
+	public getUserData(): any {
+		try {
+			return this.$fs.readJson(this.userFilePath);
+		} catch (err) {
+			this.$logger.trace("Error while getting current user info:");
+			this.$logger.trace(err);
+			this.$errors.failWithoutHelp("Not logged in.");
+		}
+	}
+
+	public setToken(token: ITokenData): void {
+		if (token) {
+			const newUserData = _.extend(this.getUserData(), token);
+			this.setUserData(newUserData);
+		} else {
+			this.clearUserData();
+		}
+	}
+
+	public setUserData(userData: any): void {
+		if (userData) {
+			this.$fs.writeJson(this.userFilePath, userData);
+		} else {
+			this.$fs.deleteFile(this.userFilePath);
+		}
+	}
+
+	public clearUserData(): void {
+		this.$fs.deleteFile(this.userFilePath);
+	}
+
+	public async getUserAvatar(): Promise<string> {
+		if (!this.hasUser()) {
+			return null;
+		}
+
+		const userInfo = await this.$nsCloudServerAccountsService.getUserInfo();
+		return userInfo.externalAvatarUrl;
+	}
+}

lib/services/user-service.ts

@@ -1,89 +1,47 @@
-import { join } from "path";
-import { home } from "osenv";
-
 export class UserService implements IUserService {
-	private userData: IUserData;
-	private userInfoDirectory: string;
-
-	private get $nsCloudServerAccountsService(): IServerAccountsService {
-		return this.$injector.resolve("nsCloudServerAccountsService");
-	}
+	private userService: IUserService;
 
 	constructor(private $injector: IInjector,
-		private $errors: IErrors,
-		private $fs: IFileSystem,
-		private $hostInfo: IHostInfo,
-		private $logger: ILogger) {
-		this.userInfoDirectory = join(this.$hostInfo.isWindows ? process.env.LocalAppData : join(home(), ".local", "share"),
-			"Telerik",
-			"NativeScript");
+		private $nsCloudServerConfigManager: IServerConfigManager) {
+		this.userService = this.determineUserService();
 	}
 
 	public hasUser(): boolean {
-		try {
-			const user = this.getUser();
-			return !!user;
-		} catch (err) {
-			return false;
-		}
+		return this.userService.hasUser();
 	}
 
 	public getUser(): IUser {
-		const userData = this.getUserData();
-
-		return userData.userInfo;
+		return this.userService.getUser();
 	}
 
 	public getUserData(): IUserData {
-		const filePath = this.getUserFilePath();
-		let data: IUserData;
-
-		try {
-			data = this.$fs.readJson(filePath);
-		} catch (err) {
-			this.$logger.trace("Error while getting current user info:");
-			this.$logger.trace(err);
-			this.$errors.failWithoutHelp("Not logged in.");
-		}
-
-		return data;
+		return this.userService.getUserData();
 	}
 
 	public setToken(token: ITokenData): void {
-		if (token) {
-			const newUserData = _.extend(this.getUserData(), token);
-			this.setUserData(newUserData);
-		} else {
-			this.clearUserData();
-		}
+		return this.userService.setToken(token);
 	}
 
 	public setUserData(userData: IUserData): void {
-		if (userData) {
-			this.userData = userData;
-			this.$fs.writeJson(this.getUserFilePath(), userData);
-		} else {
-			this.userData = null;
-			this.$fs.deleteFile(this.getUserFilePath());
-		}
+		return this.userService.setUserData(userData);
 	}
 
 	public clearUserData(): void {
-		this.userData = null;
-		this.$fs.deleteFile(this.getUserFilePath());
+		this.userService.clearUserData();
 	}
 
 	public async getUserAvatar(): Promise<string> {
-		if (!this.hasUser()) {
-			return null;
-		}
-
-		const userInfo = await this.$nsCloudServerAccountsService.getUserInfo();
-		return userInfo.externalAvatarUrl;
+		return this.userService.getUserAvatar();
 	}
 
-	private getUserFilePath(): string {
-		return join(this.userInfoDirectory, ".nativescript-user");
+	private determineUserService(): IUserService {
+		const serverConfig = this.$nsCloudServerConfigManager.getCurrentConfigData();
+		const namespace: string = serverConfig["namespace"];
+		if (namespace && namespace.toLowerCase() === "kinvey") {
+			return this.$injector.resolve<IUserService>("nsCloudKinveyUserService");
+		}
+
+		return this.$injector.resolve<IUserService>("nsCloudTelerikUserService");
 	}
 }