Introduce headerProvider and paramProvider to auth options

pusher · Oct 27, 2022 · b29f136 · b29f136
1 parent 6d8c139
commit b29f136
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 2 deletions.
diff --git a/src/core/auth/channel_authorizer.ts b/src/core/auth/channel_authorizer.ts
@@ -24,6 +24,17 @@ const composeChannelQuery = (
       encodeURIComponent(authOptions.params[i]);
   }
 
+  if (authOptions.paramProvider != null) {
+    let dynamicParams = authOptions.paramProvider();
+    for (var i in dynamicParams) {
+      query +=
+        '&' +
+        encodeURIComponent(i) +
+        '=' +
+        encodeURIComponent(dynamicParams[i]);
+    }
+  }
+
   return query;
 };
 

diff --git a/src/core/auth/options.ts b/src/core/auth/options.ts
@@ -56,6 +56,8 @@ export interface AuthOptionsT<AuthHandler> {
   endpoint: string;
   params?: any;
   headers?: any;
+  paramProvider?: () => any;
+  headerProvider?: () => any;
   customHandler?: AuthHandler;
 }
 
@@ -71,4 +73,6 @@ export interface InternalAuthOptions {
   endpoint: string;
   params?: any;
   headers?: any;
+  paramProvider?: () => any;
+  headerProvider?: () => any;
 }
diff --git a/src/core/auth/user_authenticator.ts b/src/core/auth/user_authenticator.ts
@@ -22,6 +22,17 @@ const composeChannelQuery = (
       encodeURIComponent(authOptions.params[i]);
   }
 
+  if (authOptions.paramProvider != null) {
+    let dynamicParams = authOptions.paramProvider();
+    for (var i in dynamicParams) {
+      query +=
+        '&' +
+        encodeURIComponent(i) +
+        '=' +
+        encodeURIComponent(dynamicParams[i]);
+    }
+  }
+
   return query;
 };
 

diff --git a/src/runtimes/isomorphic/auth/xhr_auth.ts b/src/runtimes/isomorphic/auth/xhr_auth.ts
@@ -27,6 +27,12 @@ const ajax: AuthTransport = function(
   for (var headerName in authOptions.headers) {
     xhr.setRequestHeader(headerName, authOptions.headers[headerName]);
   }
+  if (authOptions.headerProvider != null) {
+    let dynamicHeaders = authOptions.headerProvider();
+    for (var headerName in dynamicHeaders) {
+      xhr.setRequestHeader(headerName, dynamicHeaders[headerName]);
+    }
+  }
 
   xhr.onreadystatechange = function() {
     if (xhr.readyState === 4) {
@@ -60,7 +66,7 @@ const ajax: AuthTransport = function(
             suffix = UrlStore.buildLogSuffix('authenticationEndpoint');
             break;
           case AuthRequestType.ChannelAuthorization:
-            suffix = `Clients must be authenticated to join private or presence channels. ${UrlStore.buildLogSuffix(
+            suffix = `Clients must be authorized to join private or presence channels. ${UrlStore.buildLogSuffix(
               'authorizationEndpoint'
             )}`;
             break;

diff --git a/src/runtimes/web/dom/sockjs b/src/runtimes/web/dom/sockjs
diff --git a/types/src/core/auth/options.d.ts b/types/src/core/auth/options.d.ts
@@ -32,6 +32,8 @@ export interface AuthOptionsT<AuthHandler> {
     endpoint: string;
     params?: any;
     headers?: any;
+    paramProvider?: () => any;
+    headerProvider?: () => any;
     customHandler?: AuthHandler;
 }
 export declare type UserAuthenticationOptions = AuthOptionsT<UserAuthenticationHandler>;
@@ -41,4 +43,6 @@ export interface InternalAuthOptions {
     endpoint: string;
     params?: any;
     headers?: any;
+    paramProvider?: () => any;
+    headerProvider?: () => any;
 }