Skip intermediate login page with single provider

[bookstack] / app / Uploads / UserAvatars.php

diff --git a/app/Uploads/UserAvatars.php b/app/Uploads/UserAvatars.php
index e98c1cfcaf5fa19488415f9237b00d4b46d12afc..f5b085a35d5cf802a45de6710034421f4c653716 100644 (file)
--- a/app/Uploads/UserAvatars.php
+++ b/app/Uploads/UserAvatars.php
@@ -1,4 +1,6 @@
-<?php namespace BookStack\Uploads;
+<?php
+
+namespace BookStack\Uploads;

 
 use BookStack\Auth\User;
 use BookStack\Exceptions\HttpFetchException;
 
 use BookStack\Auth\User;
 use BookStack\Exceptions\HttpFetchException;


@@ -66,6 +68,7 @@ class UserAvatars
 
     /**
      * Save an avatar image from an external service.
 
     /**
      * Save an avatar image from an external service.

+     *

      * @throws Exception
      */
     protected function saveAvatarImage(User $user, int $size = 500): Image
      * @throws Exception
      */
     protected function saveAvatarImage(User $user, int $size = 500): Image


@@ -74,13 +77,14 @@ class UserAvatars
         $email = strtolower(trim($user->email));
 
         $replacements = [
         $email = strtolower(trim($user->email));
 
         $replacements = [

-            '${hash}' => md5($email),
-            '${size}' => $size,
+            '${hash}'  => md5($email),
+            '${size}'  => $size,

             '${email}' => urlencode($email),
         ];
 
         $userAvatarUrl = strtr($avatarUrl, $replacements);
         $imageData = $this->getAvatarImageData($userAvatarUrl);
             '${email}' => urlencode($email),
         ];
 
         $userAvatarUrl = strtr($avatarUrl, $replacements);
         $imageData = $this->getAvatarImageData($userAvatarUrl);

+

         return $this->createAvatarImageFromData($user, $imageData, 'png');
     }
 
         return $this->createAvatarImageFromData($user, $imageData, 'png');
     }
 


@@ -101,6 +105,7 @@ class UserAvatars
 
     /**
      * Gets an image from url and returns it as a string of image data.
 
     /**
      * Gets an image from url and returns it as a string of image data.

+     *

      * @throws Exception
      */
     protected function getAvatarImageData(string $url): string
      * @throws Exception
      */
     protected function getAvatarImageData(string $url): string


@@ -110,6 +115,7 @@ class UserAvatars
         } catch (HttpFetchException $exception) {
             throw new Exception(trans('errors.cannot_get_image_from_url', ['url' => $url]));
         }
         } catch (HttpFetchException $exception) {
             throw new Exception(trans('errors.cannot_get_image_from_url', ['url' => $url]));
         }

+

         return $imageData;
     }
 
         return $imageData;
     }
 


@@ -119,6 +125,7 @@ class UserAvatars
     protected function avatarFetchEnabled(): bool
     {
         $fetchUrl = $this->getAvatarUrl();
     protected function avatarFetchEnabled(): bool
     {
         $fetchUrl = $this->getAvatarUrl();

+

         return is_string($fetchUrl) && strpos($fetchUrl, 'http') === 0;
     }
 
         return is_string($fetchUrl) && strpos($fetchUrl, 'http') === 0;
     }