Add allowCrossOriginAuthentication boolean

microsoft · Apr 1, 2020 · 31e7e62 · 31e7e62
1 parent eca7d5d
commit 31e7e62
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/lib/handlers/basiccreds.ts b/lib/handlers/basiccreds.ts
@@ -6,20 +6,24 @@ import ifm = require('../Interfaces');
 export class BasicCredentialHandler implements ifm.IRequestHandler {
     username: string;
     password: string;
-    host: string;
+    allowCrossOriginAuthentication: boolean;
+    origin: string;
 
-    constructor(username: string, password: string) {
+    constructor(username: string, password: string, allowCrossOriginAuthentication?: boolean) {
         this.username = username;
         this.password = password;
+        this.allowCrossOriginAuthentication = allowCrossOriginAuthentication;
     }
 
     // currently implements pre-authorization
     // TODO: support preAuth = false where it hooks on 401
     prepareRequest(options:any): void {
+        if (!this.origin) {
+            this.origin = options.host;
+        }
         // If this is a redirection, don't set the Authorization header
-        if (!this.host || this.host === options.host) {
+        if (this.origin === options.host || this.allowCrossOriginAuthentication) {
             options.headers['Authorization'] = `Basic ${Buffer.from(`${this.username}:${this.password}`).toString('base64')}`;
-            this.host = options.host;
         }
         options.headers['X-TFS-FedAuthRedirect'] = 'Suppress';
     }

diff --git a/lib/handlers/bearertoken.ts b/lib/handlers/bearertoken.ts
@@ -5,19 +5,23 @@ import ifm = require('../Interfaces');
 
 export class BearerCredentialHandler implements ifm.IRequestHandler {
     token: string;
-    host: string;
+    allowCrossOriginAuthentication: boolean;
+    origin: string;
 
-    constructor(token: string) {
+    constructor(token: string, allowCrossOriginAuthentication?: boolean) {
         this.token = token;
+        this.allowCrossOriginAuthentication = allowCrossOriginAuthentication;
     }
 
     // currently implements pre-authorization
     // TODO: support preAuth = false where it hooks on 401
     prepareRequest(options:any): void {
+        if (!this.origin) {
+            this.origin = options.host;
+        }
         // If this is a redirection, don't set the Authorization header
-        if (!this.host || this.host === options.host) {
+        if (this.origin === options.host || this.allowCrossOriginAuthentication) {
             options.headers['Authorization'] = `Bearer ${this.token}`;
-            this.host = options.host;
         }
         options.headers['X-TFS-FedAuthRedirect'] = 'Suppress';
     }

diff --git a/lib/handlers/personalaccesstoken.ts b/lib/handlers/personalaccesstoken.ts
@@ -5,19 +5,23 @@ import ifm = require('../Interfaces');
 
 export class PersonalAccessTokenCredentialHandler implements ifm.IRequestHandler {
     token: string;
-    host: string;
+    allowCrossOriginAuthentication: boolean;
+    origin: string;
 
-    constructor(token: string) {
+    constructor(token: string, allowCrossOriginAuthentication?: boolean) {
         this.token = token;
+        this.allowCrossOriginAuthentication = allowCrossOriginAuthentication;
     }
 
     // currently implements pre-authorization
     // TODO: support preAuth = false where it hooks on 401
     prepareRequest(options:any): void {
+        if (!this.origin) {
+            this.origin = options.host;
+        }
         // If this is a redirection, don't set the Authorization header
-        if (!this.host || this.host === options.host) {
+        if (this.origin === options.host || this.allowCrossOriginAuthentication) {
             options.headers['Authorization'] = `Basic ${Buffer.from(`PAT:${this.token}`).toString('base64')}`;
-            this.host = options.host;
         }
         options.headers['X-TFS-FedAuthRedirect'] = 'Suppress';
     }