Added specs and implementation for online resolver.

package.json

@@ -35,6 +35,7 @@
     "merge-stream": "^1.0.0",
     "mocha-junit-reporter": "^1.11.1",
     "mockery": "^1.6.2",
+    "node-spoauth": "^1.0.0",
     "remap-istanbul": "^0.6.3",
     "request": "^2.72.0",
     "request-promise": "^3.0.0",

src/core/SPRequest.ts

@@ -5,19 +5,17 @@ import * as requestp from 'request-promise';
 import * as Promise from 'bluebird';
 
 import {IUserCredentials} from './interfaces/IUserCredentials';
-import {IOAuthCredentials} from './interfaces/IOAuthCredentials';
 import {IEnvironment} from './interfaces/IEnvironment';
 import {AuthResolverFactory} from './auth/AuthResolverFactory';
 import {ISPRequest} from './interfaces/ISPrequest';
 
-export function create(credentials: IUserCredentials | IOAuthCredentials, environment?: IEnvironment): ISPRequest {
+export function create(credentials: IUserCredentials, environment?: IEnvironment): ISPRequest {
 
   let coreRequest: any = (options: OptionsWithUrl): Promise<IncomingMessage> => {
     let requestDeferred: Promise.Resolver<IncomingMessage> = Promise.defer<IncomingMessage>();
 
-    let requestPromiseOptions: RequestPromiseOptions = <RequestPromiseOptions>options;
-    requestPromiseOptions.resolveWithFullResponse = true;
-    requestPromiseOptions.simple = false;
+    (<RequestPromiseOptions>options).resolveWithFullResponse = true;
+    (<RequestPromiseOptions>options).simple = true;
 
     options.headers = options.headers || {};
     if (!options.headers['Accept']) {

src/core/auth/IAuthOptions.ts

@@ -1,12 +1,11 @@
 import {OptionsWithUrl} from 'request';
 
 import {IUserCredentials} from './../interfaces/IUserCredentials';
-import {IOAuthCredentials} from './../interfaces/IOAuthCredentials';
 import {IEnvironment} from './../interfaces/IEnvironment';
 
 export interface IAuthOptions {
   options: OptionsWithUrl;
-  credentials: IUserCredentials | IOAuthCredentials;
+  credentials: IUserCredentials;
   env: IEnvironment;
 }
 

src/core/auth/OnPremResolver.ts

@@ -29,6 +29,11 @@ export class OnPremResolver implements IAuthResolver {
 
     let type1msg: any = ntlm.createType1Message(ntlmOptions);
 
+    /* workaround for on premise self signed or not trusted certificates */
+    if (isHttps) {
+      process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = '0';
+    }
+
     rp({
       url: this.authOptions.options.url,
       method: 'GET',

src/core/auth/OnlineResolver.ts

@@ -1,5 +1,8 @@
 import {OptionsWithUrl} from 'request';
 import * as Promise from 'bluebird';
+import * as consts from 'constants';
+
+let sp: any = require('node-spoauth');
 
 import {IAuthResolver} from './IAuthResolver';
 import {IAuthOptions} from './IAuthOptions';
@@ -9,6 +12,25 @@ export class OnlineResolver implements IAuthResolver {
   constructor(private authOptions: IAuthOptions) { }
 
   public ApplyAuthHeaders(): Promise<OptionsWithUrl> {
-    return null;
+    let deferred: Promise.Resolver<OptionsWithUrl> = Promise.defer<OptionsWithUrl>();
+
+    let service: any = new sp.RestService(this.authOptions.options.url);
+
+    let signin: (username: string, password: string) => Promise<any> =
+      Promise.promisify<any, string, string>(service.signin, { context: service });
+
+    signin(this.authOptions.credentials.username, this.authOptions.credentials.password)
+      .then((auth) => {
+        this.authOptions.options.headers = this.authOptions.options.headers || {};
+        this.authOptions.options.headers['Cookie'] = `FedAuth=${auth.FedAuth}; rtFa=${auth.rtFa}`;
+        this.authOptions.options['secureOptions'] = consts.SSL_OP_NO_TLSv1_2;
+
+        deferred.resolve(this.authOptions.options);
+      })
+      .catch((err) => {
+        deferred.reject(err);
+      });
+
+    return deferred.promise;
   }
 }

test/unit/OnlineResolver.spec.ts

@@ -0,0 +1,90 @@
+import {expect} from 'chai';
+import * as sinon from 'sinon';
+import {SinonStub} from 'sinon';
+import * as consts from 'constants';
+
+import {IAuthOptions} from './../../src/core/auth/IAuthOptions';
+import {IUserCredentials} from './../../src/core/interfaces/IUserCredentials';
+import {OnlineResolver} from './../../src/core/auth/OnlineResolver';
+
+let creds: IUserCredentials = {
+  username: 'user',
+  password: 'pass'
+};
+
+let onlineOptions: IAuthOptions = {
+  credentials: creds,
+  options: {
+    url: 'https://sp2013dev.sharepoint.com/sites/dev/_api'
+  },
+  env: undefined
+};
+
+let authResponse: any = {
+  FedAuth: 'fedauth',
+  rtFa: 'rtfa'
+};
+
+let cookieString: string = `FedAuth=${authResponse.FedAuth}; rtFa=${authResponse.rtFa}`;
+
+describe('sp-request: OnlineResolver tests', () => {
+  let resolver: OnlineResolver;
+  let siginStup: SinonStub;
+
+  beforeEach(() => {
+    let resolverModule: any = require('./../../src/core/auth/OnlineResolver');
+    resolver = new resolverModule.OnlineResolver(onlineOptions);
+    let sp: any = require('node-spoauth');
+    siginStup = sinon.stub(sp.RestService.prototype, 'signin');
+  });
+
+  afterEach(() => {
+    siginStup.restore();
+  });
+
+  it('should set cookie header', (done) => {
+    siginStup.callsArgWith(2, null, {
+      FedAuth: 'fedauth',
+      rtFa: 'rtfa'
+    });
+
+    resolver.ApplyAuthHeaders()
+      .then((options) => {
+        expect(options.headers['Cookie']).to.equal(cookieString);
+        done();
+      })
+      .catch((err) => {
+        done(err);
+      });
+  });
+
+  it('should set secureOptions', (done) => {
+    siginStup.callsArgWith(2, null, {
+      FedAuth: 'fedauth',
+      rtFa: 'rtfa'
+    });
+
+    resolver.ApplyAuthHeaders()
+      .then((options) => {
+        expect(options['secureOptions']).to.equal(consts.SSL_OP_NO_TLSv1_2);
+        done();
+      })
+      .catch((err) => {
+        done(err);
+      });
+  });
+
+  it('should throws en error', (done) => {
+    let error: string = 'error';
+    siginStup.throws(error);
+
+    resolver.ApplyAuthHeaders()
+      .then((options) => {
+        //
+      })
+      .catch((err) => {
+        expect(err.name).to.equal(error);
+        done();
+      });
+  });
+});

test/unit/tests.ts

@@ -1,3 +1,4 @@
 import './SPRequest.spec';
 import './AuthResolverFactory.spec';
 import './OnPremResolver.spec';
+import './OnlineResolver.spec';