connect on webapi (#94)

* connect on webapi

* remove commented block

* better pattern

Author: bryanmacfarlane

api/WebApi.ts

@@ -35,6 +35,10 @@ import bearm = require('./handlers/bearertoken');
 import ntlmm = require('./handlers/ntlm');
 import patm = require('./handlers/personalaccesstoken');
 
+import * as rm from 'typed-rest-client/RestClient';
+//import * as hm from 'typed-rest-client/HttpClient';
+import vsom = require('./VsoClient');
+
 /**
  * Methods to return handler objects (see handlers folder)
  */
@@ -64,6 +68,8 @@ export class WebApi {
 
     serverUrl: string;
     authHandler: VsoBaseInterfaces.IRequestHandler;
+    rest: rm.RestClient;
+    vsoClient: vsom.VsoClient;
 
     /*
      * Factory to return client apis and handlers
@@ -73,6 +79,8 @@ export class WebApi {
     constructor(defaultUrl: string, authHandler: VsoBaseInterfaces.IRequestHandler) {
         this.serverUrl = defaultUrl;
         this.authHandler = authHandler;
+        this.rest = new rm.RestClient('vsts-node-api', null, [this.authHandler]);
+        this.vsoClient = new vsom.VsoClient(defaultUrl, this.rest);        
     }
 
     /**
@@ -85,6 +93,18 @@ export class WebApi {
         return new this(defaultUrl, bearerHandler);
     } 
 
+    public async connect(): Promise<any> {		
+        return new Promise(async (resolve, reject) => {
+            try {
+                let res: rm.IRestResponse<any> = await this.rest.get<any>(this.vsoClient.resolveUrl('/_apis/connectionData'));
+                resolve(res.result);
+            }
+            catch (err) {
+                reject(err);
+            }
+        });
+    }    
+
     /**
      * Each factory method can take a serverUrl and a list of handlers
      * if these aren't provided, the default url and auth handler given to the constructor for this class will be used

samples/build.ts

@@ -4,12 +4,12 @@ import * as vm from 'vso-node-api';
 import * as ba from 'vso-node-api/BuildApi';
 import * as bi from 'vso-node-api/interfaces/BuildInterfaces';
 
-let vsts: vm.WebApi = cm.getWebApi();
-let vstsBuild: ba.IBuildApi = vsts.getBuildApi();
-
 export async function run() {
     try
     {
+        let vsts: vm.WebApi = await cm.getWebApi();
+        let vstsBuild: ba.IBuildApi = vsts.getBuildApi();
+
         cm.banner('Build Samples');
         let project = cm.getProject();
         console.log('project', project);

samples/common.ts

@@ -11,13 +11,22 @@ function getEnv(name: string): string {
     return val;
 }
 
-export function getWebApi(): vm.WebApi {
-    let serverUrl = getEnv('API_URL');
-    let token = getEnv('API_TOKEN');
-    let authHandler = vm.getPersonalAccessTokenHandler(token);
-
-    let vsts: vm.WebApi = new vm.WebApi(serverUrl, authHandler);
-    return vsts;
+export async function getWebApi(): Promise<vm.WebApi> {
+    return new Promise<vm.WebApi>(async (resolve, reject) => {
+        try {
+            let serverUrl = getEnv('API_URL');
+            let token = getEnv('API_TOKEN');
+            let authHandler = vm.getPersonalAccessTokenHandler(token);
+
+            let vsts: vm.WebApi = new vm.WebApi(serverUrl, authHandler);
+            let connData = await vsts.connect();
+            console.log('Hello ' + connData.authorizedUser.customDisplayName);
+            resolve(vsts);
+        }
+        catch (err) {
+            reject(err);
+        }
+    });    
 }
 
 export function getProject(): string {

samples/task.ts

@@ -9,14 +9,14 @@ import * as vm from 'vso-node-api';
 import * as ta from 'vso-node-api/TaskAgentApi';
 import * as ti from 'vso-node-api/interfaces/TaskAgentInterfaces';
 
-let vsts: vm.WebApi = cm.getWebApi();
-let vstsTask: ta.ITaskAgentApi = vsts.getTaskAgentApi();
-
 let sampleFilePath: string = path.join(process.cwd(), 'taskdefinition.zip');
 
 export async function run() {
     try
     {
+        let vsts: vm.WebApi = await cm.getWebApi();
+        let vstsTask: ta.ITaskAgentApi = vsts.getTaskAgentApi();
+
         cm.banner('Task Samples');
         let project = cm.getProject();
         console.log('project', project);