diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache
index 773fde0201e2..df550e704840 100644
--- a/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache
@@ -205,10 +205,19 @@ export class {{classname}} {
 {{/isKeyInQuery}}
 {{/isApiKey}}
 {{#isBasic}}
+    {{^isBasicBearer}}
         if (this.configuration.username || this.configuration.password) {
             {{#useHttpClient}}headers = {{/useHttpClient}}headers.set('Authorization', 'Basic ' + btoa(this.configuration.username + ':' + this.configuration.password));
         }
-
+    {{/isBasicBearer}}
+    {{#isBasicBearer}}
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            {{#useHttpClient}}headers = {{/useHttpClient}}headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+    {{/isBasicBearer}}
 {{/isBasic}}
 {{#isOAuth}}
         if (this.configuration.accessToken) {
diff --git a/samples/client/petstore-security-test/typescript-angular/api/fake.service.ts b/samples/client/petstore-security-test/typescript-angular/api/fake.service.ts
index 9f3c101f9f66..bfb3c416d355 100644
--- a/samples/client/petstore-security-test/typescript-angular/api/fake.service.ts
+++ b/samples/client/petstore-security-test/typescript-angular/api/fake.service.ts
@@ -71,7 +71,7 @@ export class FakeService {
         let headers = this.defaultHeaders;
 
         // to determine the Accept header
-        let httpHeaderAccepts: string[] = [
+        const httpHeaderAccepts: string[] = [
         ];
         const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected !== undefined) {
diff --git a/samples/client/petstore-security-test/typescript-angular/configuration.ts b/samples/client/petstore-security-test/typescript-angular/configuration.ts
index 5dac1323937e..1132f4adc175 100644
--- a/samples/client/petstore-security-test/typescript-angular/configuration.ts
+++ b/samples/client/petstore-security-test/typescript-angular/configuration.ts
@@ -36,7 +36,7 @@ export class Configuration {
             return undefined;
         }
 
-        let type = contentTypes.find(x => this.isJsonMime(x));
+        const type = contentTypes.find((x: string) => this.isJsonMime(x));
         if (type === undefined) {
             return contentTypes[0];
         }
@@ -55,7 +55,7 @@ export class Configuration {
             return undefined;
         }
 
-        let type = accepts.find(x => this.isJsonMime(x));
+        const type = accepts.find((x: string) => this.isJsonMime(x));
         if (type === undefined) {
             return accepts[0];
         }
diff --git a/samples/client/petstore-security-test/typescript-angular/model/return.ts b/samples/client/petstore-security-test/typescript-angular/model/return.ts
index 442d1b5a1017..52f685bd0119 100644
--- a/samples/client/petstore-security-test/typescript-angular/model/return.ts
+++ b/samples/client/petstore-security-test/typescript-angular/model/return.ts
@@ -20,3 +20,4 @@ export interface Return {
      */
     _return?: number;
 }
+