Minor changes

forkbb · Oct 10, 2023 · 9cfd336 · 9cfd336
1 parent 427e679
commit 9cfd336
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/app/Controllers/Routing.php b/app/Controllers/Routing.php
@@ -97,25 +97,22 @@ public function routing(): Page
         }
 
         // OAuth
-        if (
-            $user->isAdmin
-            || 1 === $config->b_oauth_allow
-        ) {
-            $r->add(
-                $r::GET,
-                '/reglog/callback/{name}',
-                'RegLog:callback',
-                'RegLogCallback'
-            );
-        }
-
         if (1 === $config->b_oauth_allow) {
             $r->add(
                 $r::PST,
                 '/reglog/redirect/{type}',
                 'RegLog:redirect',
                 'RegLogRedirect'
             );
+
+            if ($user->isAdmin) {
+                $r->add(
+                    $r::GET,
+                    '/reglog/callback/{name}',
+                    'RegLog:callback',
+                    'RegLogCallback'
+                );
+            }
         }
 
         // просмотр разрешен

diff --git a/app/Models/Pages/Auth.php b/app/Models/Pages/Auth.php
@@ -206,7 +206,7 @@ protected function formLogin(string $username, bool $save, string $redirect): ar
     /**
      * Проверка пользователя по базе
      */
-    public function vLoginCheck(Validator $v, #[SensitiveParameter] string $password ): string
+    public function vLoginCheck(Validator $v, #[SensitiveParameter] string $password): string
     {
         if (empty($v->getErrors())) {
             if ($this->loginWithForm) {