fix: routing exclusion cause errors

SychO9 · May 26, 2023 · c86dba4 · c86dba4
1 parent 3e9201a
commit c86dba4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/js/src/forum/index.tsx b/js/src/forum/index.tsx
@@ -85,7 +85,7 @@ app.initializers.add('sycho/flarum-private-facade', () => {
       app.forum.attribute<boolean>('sycho-private-facade.force_redirect') &&
       !app.forum.attribute<Array<string>>('sycho-private-facade.route_exclusions').includes(this.routeName)
     ) {
-      return m.route.SKIP;
+      return m.route.set(app.route('sycho-private-facade.login'));
     }
 
     return orig(args, requestedPath, route);

diff --git a/src/Api/Controller/UploadIllustrationController.php b/src/Api/Controller/UploadIllustrationController.php
@@ -29,6 +29,6 @@ protected function makeImage(UploadedFileInterface $file): Image
     {
         $manager = resolve(ImageManager::class);
 
-        return $manager->make($file->getStream())->encode('png');
+        return $manager->make($file->getStream()->getMetadata('uri'))->encode('png');
     }
 }
diff --git a/src/PrivateFacadeMiddleware.php b/src/PrivateFacadeMiddleware.php
@@ -88,7 +88,7 @@ public static function getFrontendRouteExclusions(?string $userExcludedRoutes):
     protected static function getRouteExclusions(?string $userExcludedRoutes, array $extensionExcludedRoutes): array
     {
         if (! empty($userExcludedRoutes)) {
-            $extensionExcludedRoutes = array_merge($extensionExcludedRoutes, explode(', ', $userExcludedRoutes));
+            $extensionExcludedRoutes = array_merge($extensionExcludedRoutes, explode(',', str_replace(' ', '', $userExcludedRoutes)));
         }
 
         return $extensionExcludedRoutes;