fix(channel-web): externalAuth token http headers

botpress · Jul 30, 2019 · 41997df · 41997df
1 parent 7e8f590
commit 41997df
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/docs/guide/docs/advanced/authentication.md b/docs/guide/docs/advanced/authentication.md
@@ -154,7 +154,7 @@ Here is an example configuration, [check the full configuration for more details
 
 #### How to configure the Public Key
 
-The public key can be added directly in the `botpress.config.json` file (on the same line). If you prefer to add the key in a file, remove the property `certificate`, and Botpress will load the key from `data/global/end_users_auth.key`
+The public key can be added directly in the `botpress.config.json` file (on the same line). If you prefer to add the key in a file, remove the property `certificate`, and Botpress will load the key from `data/global/end_users_auth.pub`
 
 #### How to create a new Key Pair
 

diff --git a/modules/channel-web/src/views/lite/core/api.tsx b/modules/channel-web/src/views/lite/core/api.tsx
@@ -37,7 +37,8 @@ export default class WebchatApi {
       this.axiosConfig = {
         ...this.axiosConfig,
         headers: {
-          ExternalAuth: `Bearer ${externalAuthToken}`
+          ExternalAuth: `Bearer ${externalAuthToken}`,
+          'X-BP-ExternalAuth': `Bearer ${externalAuthToken}`
         }
       }
     }

diff --git a/src/bp/core/server.ts b/src/bp/core/server.ts
@@ -375,7 +375,7 @@ export default class HTTPServer {
     })
   }
 
-  @Memoize
+  @Memoize()
   private async _getExternalAuthConfig(): Promise<ExternalAuthConfig | undefined> {
     const botpressConfig = await this.configProvider.getBotpressConfig()
     const config = botpressConfig.pro.externalAuth
@@ -394,8 +394,8 @@ export default class HTTPServer {
             .error(`External User Auth: Couldn't open public key file /data/global/end_users_auth.pub`)
           return undefined
         }
-      } else if (config.publicKey.length < 256) {
-        this.logger.error(`External User Auth: The provided publicKey is invalid (too short)`)
+      } else if (config.publicKey.length < 128) {
+        this.logger.error(`External User Auth: The provided publicKey is invalid (too short). Min length is 128 chars.`)
         return undefined
       }
     }

diff --git a/src/bp/core/services/dialog/janitor.ts b/src/bp/core/services/dialog/janitor.ts
@@ -33,7 +33,7 @@ export class DialogJanitor extends Janitor {
     super(logger)
   }
 
-  @Memoize
+  @Memoize()
   private async getBotpresConfig(): Promise<BotpressConfig> {
     return this.configProvider.getBotpressConfig()
   }

diff --git a/src/bp/core/services/logs/janitor.ts b/src/bp/core/services/logs/janitor.ts
@@ -26,7 +26,7 @@ export class LogsJanitor extends Janitor {
     super(logger)
   }
 
-  @Memoize
+  @Memoize()
   private async getBotpresConfig(): Promise<BotpressConfig> {
     return this.configProvider.getBotpressConfig()
   }

diff --git a/src/bp/core/services/middleware/state-manager.ts b/src/bp/core/services/middleware/state-manager.ts
@@ -69,7 +69,7 @@ export class StateManager {
     await this.sessionRepo.update(dialogSession)
   }
 
-  @Memoize
+  @Memoize()
   private async getBotpresConfig(): Promise<BotpressConfig> {
     return this.configProvider.getBotpressConfig()
   }