Merge branch 'master' into ref-theme-config-logo

Author: liannab

datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/files/GetPresignedUploadUrlResolver.java

@@ -85,13 +85,24 @@ private void validateInput(final QueryContext context, final GetPresignedUploadU
   private void validateInputForAssetDocumentationScenario(
       final QueryContext context, final GetPresignedUploadUrlInput input) {
     String assetUrn = input.getAssetUrn();
+    String schemaFieldUrn = input.getSchemaFieldUrn();
 
     if (assetUrn == null) {
       throw new IllegalArgumentException("assetUrn is required for ASSET_DOCUMENTATION scenario");
     }
 
-    if (!DescriptionUtils.isAuthorizedToUpdateDescription(context, UrnUtils.getUrn(assetUrn))) {
-      throw new AuthorizationException("Unauthorized to edit documentation for asset: " + assetUrn);
+    // FYI: for schema field we have to apply another rules to check permissions
+    if (schemaFieldUrn != null) {
+      if (!DescriptionUtils.isAuthorizedToUpdateFieldDescription(
+          context, UrnUtils.getUrn(assetUrn))) {
+        throw new AuthorizationException(
+            "Unauthorized to edit documentation for schema field: " + schemaFieldUrn);
+      }
+    } else {
+      if (!DescriptionUtils.isAuthorizedToUpdateDescription(context, UrnUtils.getUrn(assetUrn))) {
+        throw new AuthorizationException(
+            "Unauthorized to edit documentation for asset: " + assetUrn);
+      }
     }
   }
 

datahub-graphql-core/src/main/resources/files.graphql

@@ -27,11 +27,17 @@ input GetPresignedUploadUrlInput {
   The scenario for the upload (e.g., ASSET_DOCUMENTATION, PROFILE_IMAGE).
   """
   scenario: UploadDownloadScenario!
+
   """
   The URN of the asset associated with the upload (required when scenario is ASSET_DOCUMENTATION).
   """
   assetUrn: String
 
+  """
+  The dataset schema field this file is referenced by
+  """
+  schemaFieldUrn: String
+
   """
   Optional content type of file e.g. "application/pdf"
   """