Updates for file handeling and urls

Author: pingevt

src/AssetApiServiceBase.php

@@ -42,7 +42,7 @@ public function getFileData($file) {
   public function getRelativePath(string $path) {
     $replaced_relative_path = '';
     if ($path !== '') {
-      $transformed = $this->fileUrlGenerator->transformRelative($file_url);
+      $transformed = $this->fileUrlGenerator->transformRelative($path);
       $relative_path = urldecode($transformed);
       // TODO: replace with actual public files path.
       $replaced_relative_path = str_replace('/sites/default/files/', '', $relative_path);

src/ImageApiService.php

@@ -64,10 +64,12 @@ public function getImageData($file, $image_styles = []) {
       if ($crop) {
         $anchor = $this->focalPointManager->absoluteToRelative($crop->x->value, $crop->y->value, $image_file->getWidth(), $image_file->getHeight());
       }
+      $uri = $file->getFileUri();
+      $url = $this->fileUrlGenerator->generateAbsoluteString($uri);
       $data = [
-        'uri' => $file->getFileUri(),
-        'url' => $file->url(),
-        'relativePath' => $this->getRelativePath($file->url()),
+        'uri' => $uri,
+        'url' => $url,
+        'relativePath' => $this->getRelativePath($url),
         'origSize' => [
           'width' => $image_file->getWidth(),
           'height' => $image_file->getHeight(),
@@ -78,6 +80,7 @@ public function getImageData($file, $image_styles = []) {
       foreach ($image_styles as $style_name) {
         $style = ImageStyle::load($style_name);
 
+        // todo: check style exists
         $url = $style->buildUrl($file->getFileUri());
 
         // Remove an h query param.