merging develop

Author: rishikunnath2747

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 1.4.0
+
+### Added
+- Support technical user flow.
+- Support codelist for custom properties.
+
+### Fixed
+- An issue where attachments uploaded with one repository was visible when application is redeployed with another repository.
+
 ## Version 1.3.1
 
 ### Fixed

README.md

@@ -15,6 +15,7 @@ This plugin can be consumed by the CAP application deployed on BTP to store thei
 - Display attachments specific to repository: Lists attachments contained in the repository that is configured with the CAP application.
 - Maximum allowed uploads: Provides the capability to define the maximum number of uploads allowed for the user.
 - Multiple attachment facets: Provides the capability to define multiple attachment facets/sections in the CAP Entity.
+- Technical user support: Provides the capability to consume the plugin using technical user.
 
 ## Table of Contents
 
@@ -26,6 +27,7 @@ This plugin can be consumed by the CAP application deployed on BTP to store thei
 - [Support for Custom Properties](#support-for-custom-properties)
 - [Support for Maximum allowed uploads](#support-for-maximum-allowed-uploads)
 - [Support for Multiple attachment facets](#support-for-multiple-attachment-facets)
+- [Support for Technical user](#support-for-technical-user)
 - [Known Restrictions](#known-restrictions)
 - [Support, Feedback, Contributing](#support-feedback-contributing)
 - [Code of Conduct](#code-of-conduct)
@@ -465,6 +467,24 @@ Add the following facet in _fiori-service.cds_ in the _app_ folder. Refer the fo
    >
    > Once a facet or section name is defined in the CDS file, it is strongly recommended not to modify it. For instance, in the example provided, section names such as attachments, references, and footnotes should remain unchanged after initial configuration. Renaming these sections will result in the creation of new tables, causing any data associated with the original sections to become inaccessible in the UI.
 
+## Support for technical user
+The CAP OData operations can be performed on attachments using a technical user. This flow can be used for machine-to-machine (M2M) interactions, where user involvement is not necessary.
+
+A leading CAP application's service should add the requires with annotation "system-user". For more detailed information on "system-user" within the SAP CAP framework, refer to the [Capire documentation](https://cap.cloud.sap/docs/guides/security/authorization#pseudo-roles). Here is an [example](https://github.com/cap-java/sdm/blob/develop_deploy/cap-notebook/demoapp/srv/admin-service.cds) from a sample Bookshop app demonstrating the implementation.
+```cds
+service AdminService @(requires: ['admin', 'system-user'])
+```
+
+The plugin supports technical users using oAuth 2.0 client credentials flow. Refer the following [example](https://github.com/cap-java/sdm/blob/a1bd1a0d829e6f25e4db349143b621757e0274d1/sdm/src/test/java/integration/com/sap/cds/sdm/IntegrationTest_SingleFacet.java#L80) of an OData call.
+```java
+request =
+   new Request.Builder()
+      .url(authUrl + "/oauth/token?grant_type=client_credentials")
+      .method("POST", body)
+      .addHeader("Authorization", basicAuth)
+      .build();
+```
+
 ## Known Restrictions
 
 - UI5 Version 1.135.0: This version causes error in upload of attachments.

pom.xml

@@ -23,7 +23,7 @@
     </developers>
 
     <properties>
-        <revision>1.3.2-SNAPSHOT</revision>
+        <revision>1.4.1-SNAPSHOT</revision>
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>

sdm/pom.xml

@@ -114,6 +114,12 @@
     <groupId>org.apache.httpcomponents</groupId>
     <artifactId>httpasyncclient</artifactId>
     <version>${httpasyncclient-version}</version>
+    <exclusions>
+        <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </exclusion>
+    </exclusions>
 </dependency>
 <!-- Log4j dependencies -->
 <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->

sdm/src/test/java/integration/com/sap/cds/sdm/Api.java

@@ -139,6 +139,10 @@ public String saveEntityDraft(
             System.out.println("Save entity failed. Error : " + draftResponseBodyString);
             return (draftResponseBodyString);
           }
+          String sapMessages = draftResponse.header("sap-messages");
+          if (sapMessages != null && !sapMessages.isEmpty()) {
+            return sapMessages;
+          }
           return "Saved";
         } catch (IOException e) {
           System.out.println("Could not save entity : " + e);
@@ -387,11 +391,11 @@ public String readAttachment(
       Response response = httpClient.newCall(request).execute();
       if (!response.isSuccessful()) {
         System.out.println(
-            "Read Attachnent failed in the"
+            "Read Attachment failed in the"
                 + facetName
                 + " section. Error :"
                 + response.body().string());
-        throw new IOException("Read Attachnent failed in the" + facetName + " section");
+        throw new IOException("Read Attachment failed in the" + facetName + " section");
       }
       return "OK";
     } catch (IOException e) {

sdm/src/test/java/integration/com/sap/cds/sdm/ApiMT.java

@@ -134,6 +134,11 @@ public String saveEntityDraft(
             System.out.println("Save entity failed. Error : " + draftResponseBodyString);
             return (draftResponseBodyString);
           }
+          String sapMessages = draftResponse.header("sap-messages");
+          if (sapMessages != null && !sapMessages.isEmpty()) {
+            System.out.println("Save entity failed. SAP Messages: " + sapMessages);
+            return sapMessages;
+          }
           return "Saved";
         } catch (IOException e) {
           System.out.println("Could not save entity : " + e);
@@ -328,10 +333,10 @@ public List<String> createAttachment(
         createResponse.add(ID);
         return createResponse;
       } catch (IOException e) {
-        System.out.println("Attachment was not created in section: " + facetName + " : " + e);
+        System.out.println("Attachment was not created in section1: " + facetName + " : " + e);
       }
     } catch (IOException e) {
-      System.out.println("Attachment was not created in section: " + facetName + " : " + e);
+      System.out.println("Attachment was not created in section2: " + facetName + " : " + e);
     }
     List<String> createResponse = new ArrayList<>();
     createResponse.add("Attachment was not created in section: " + facetName);
@@ -374,7 +379,7 @@ public String readAttachment(
                 + facetName
                 + " section. Error :"
                 + response.body().string());
-        throw new IOException("Read Attachnent failed in the" + facetName + " section");
+        throw new IOException("Read Attachment failed in the" + facetName + " section");
       }
       return "OK";
     } catch (IOException e) {