@sap-ux/cf-deploy-config-writer 1.0.21 → 1.1.0

package/dist/mta-config/mta.d.ts

@@ -87,12 +87,6 @@ export declare class MtaConfig {
      * @param appendSrvApi If `srv-api` should be appended, typically used for CAP flows (default: true)
      */
     private updateServerModule;
-    /**
-     * Add a managed XSUAA service to the MTA.
-     *
-     * @private
-     */
-    private addManagedUAAWithSecurity;
     /**
      * Verify if the destination is valid and if WebIDEUsage is set to ODATA_GENERIC or ODATA_ABAP.
      *

package/dist/mta-config/mta.js

@@ -153,7 +153,7 @@ export class MtaConfig {
     }
     async addUaa() {
         const resource = {
-            name: `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-uaa`,
+            name: `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-auth`,
             type: 'org.cloudfoundry.managed-service',
             parameters: {
                 service: 'xsuaa',
@@ -162,12 +162,15 @@ export class MtaConfig {
                 'service-name': `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-xsuaa-service`,
                 config: {
                     xsappname: `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-\${org}-\${space}`,
-                    'tenant-mode': 'dedicated'
+                    'tenant-mode': 'dedicated',
+                    'oauth2-configuration': {
+                        'credential-types': ['binding-secret', 'x509']
+                    }
                 }
             }
         };
         await this.mta?.addResource(resource);
-        this.resources.set('xsuaa', resource);
+        this.resources.set(ManagedXSUAA, resource);
         this.dirty = true;
     }
     async addHtml5Runtime() {
@@ -323,31 +326,6 @@ export class MtaConfig {
             this.dirty = true;
         }
     }
-    /**
-     * Add a managed XSUAA service to the MTA.
-     *
-     * @private
-     */
-    async addManagedUAAWithSecurity() {
-        this.log?.debug(t('debug.addXsuaaService'));
-        const resource = {
-            name: `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-uaa`,
-            type: 'org.cloudfoundry.managed-service',
-            parameters: {
-                path: './xs-security.json',
-                service: 'xsuaa',
-                'service-name': `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-xsuaa-service`,
-                'service-plan': 'application',
-                config: {
-                    xsappname: `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-\${org}-\${space}`,
-                    'tenant-mode': 'dedicated'
-                }
-            }
-        };
-        await this.mta?.addResource(resource);
-        this.resources.set(ManagedXSUAA, resource);
-        this.dirty = true;
-    }
     /**
      * Verify if the destination is valid and if WebIDEUsage is set to ODATA_GENERIC or ODATA_ABAP.
      *
@@ -689,7 +667,7 @@ export class MtaConfig {
      */
     async addStandaloneRouter(fromServerGenerator = false) {
         this.log?.debug(t('debug.addingRouter', { routerType: RouterModuleType.Standard }));
-        if (!this.resources.has('xsuaa')) {
+        if (!this.resources.has(ManagedXSUAA)) {
             await this.addUaa();
         }
         if (!this.resources.has('html5-apps-repo:app-runtime')) {
@@ -699,7 +677,7 @@ export class MtaConfig {
             await this.addDestinationResource();
         }
         const appRuntimeName = this.resources.get('html5-apps-repo:app-runtime')?.name;
-        const xsuaaName = this.resources.get('xsuaa')?.name;
+        const xsuaaName = this.resources.get(ManagedXSUAA)?.name;
         const destinationName = this.resources.get('destination')?.name;
         if (destinationName && xsuaaName && appRuntimeName) {
             const router = {
@@ -913,7 +891,7 @@ export class MtaConfig {
      */
     async addAppFrontAppRouter() {
         if (!this.resources.has(ManagedXSUAA)) {
-            await this.addManagedUAAWithSecurity();
+            await this.addUaa();
         }
         await this.updateServiceName('xsuaa', ManagedXSUAA);
         if (!this.resources.has(ManagedAppFront)) {
@@ -964,7 +942,7 @@ export class MtaConfig {
             await this.addDestinationResource(true);
         }
         if (!this.resources.has(ManagedXSUAA)) {
-            await this.addManagedUAAWithSecurity();
+            await this.addUaa();
         }
         if (!this.resources.has(HTML5RepoHost)) {
             await this.addHtml5Host();
@@ -1021,7 +999,7 @@ export class MtaConfig {
                                     },
                                     {
                                         Authentication: 'OAuth2UserTokenExchange',
-                                        Name: `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}_uaa`,
+                                        Name: `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}_auth`,
                                         ServiceInstanceName: managedXSUAAServiceName,
                                         ServiceKeyName: `${managedXSUAAName}-key`,
                                         'sap.cloud.service': `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}`

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/cf-deploy-config-writer",
   "description": "Add or amend Cloud Foundry and ABAP deployment configuration for SAP projects",
-  "version": "1.0.21",
+  "version": "1.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,10 +30,10 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "hasbin": "1.2.3",
-    "@sap-ux/project-access": "2.1.10",
     "@sap-ux/yaml": "1.0.2",
     "@sap-ux/btp-utils": "2.0.6",
     "@sap-ux/logger": "1.0.3",
+    "@sap-ux/project-access": "2.1.10",
     "@sap-ux/ui5-config": "1.0.7",
     "@sap-ux/nodejs-utils": "1.0.9"
   },