(will be reverted) explicitly await for license to be ready in the au…

…th hook
pgayvallet · Jan 29, 2021 · fdf73fe · fdf73fe
1 parent d3a24d0
commit fdf73fe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/x-pack/plugins/security/common/licensing/index.mock.ts b/x-pack/plugins/security/common/licensing/index.mock.ts
@@ -9,6 +9,7 @@ import { SecurityLicense, SecurityLicenseFeatures } from '.';
 
 export const licenseMock = {
   create: (features?: Partial<SecurityLicenseFeatures>): jest.Mocked<SecurityLicense> => ({
+    license$: {} as any,
     isLicenseAvailable: jest.fn().mockReturnValue(true),
     isEnabled: jest.fn().mockReturnValue(true),
     getType: jest.fn().mockReturnValue('basic'),

diff --git a/x-pack/plugins/security/common/licensing/license_service.ts b/x-pack/plugins/security/common/licensing/license_service.ts
@@ -14,6 +14,7 @@ export interface SecurityLicense {
   isEnabled(): boolean;
   getType(): LicenseType | undefined;
   getFeatures(): SecurityLicenseFeatures;
+  license$: Observable<ILicense>;
   features$: Observable<SecurityLicenseFeatures>;
 }
 
@@ -28,11 +29,15 @@ export class SecurityLicenseService {
     let rawLicense: Readonly<ILicense> | undefined;
 
     this.licenseSubscription = license$.subscribe((nextRawLicense) => {
+      // eslint-disable-next-line no-console
+      console.log('***** NEXT RAW LICENSE');
       rawLicense = nextRawLicense;
     });
 
     return {
       license: Object.freeze({
+        license$,
+
         isLicenseAvailable: () => rawLicense?.isAvailable ?? false,
 
         isEnabled: () => this.isSecurityEnabledFromRawLicense(rawLicense),

diff --git a/x-pack/plugins/security/server/authentication/authentication_service.ts b/x-pack/plugins/security/server/authentication/authentication_service.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { take } from 'rxjs/operators';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import type {
   LoggerFactory,
@@ -66,6 +67,10 @@ export class AuthenticationService {
     this.license = license;
 
     http.registerAuth(async (request, response, t) => {
+      await license.license$.pipe(take(1)).toPromise();
+      // eslint-disable-next-line no-console
+      console.log('***** AWAIT REGISTER AUTH COMPLETE');
+
       if (!license.isLicenseAvailable()) {
         this.logger.error('License is not available, authentication is not possible.');
         return response.customError({