updated config to also include Norwegian

[bookstack] / app / Auth / UserRepo.php

diff --git a/app/Auth/UserRepo.php b/app/Auth/UserRepo.php
index a903e2c38324e27c1d646655d9758d8e1febb471..fdb8c0923882cabe08e03f4db68e6b89609e1468 100644 (file)
--- a/app/Auth/UserRepo.php
+++ b/app/Auth/UserRepo.php
@@ -29,10 +29,9 @@ class UserRepo
     }
 
     /**
     }
 
     /**

-     * @param string $email
-     * @return User|null
+     * Get a user by their email address.

      */
      */

-    public function getByEmail($email)
+    public function getByEmail(string $email): ?User

     {
         return $this->user->where('email', '=', $email)->first();
     }
     {
         return $this->user->where('email', '=', $email)->first();
     }


@@ -78,31 +77,16 @@ class UserRepo
 
      /**
      * Creates a new user and attaches a role to them.
 
      /**
      * Creates a new user and attaches a role to them.

-     * @param array $data
-     * @param boolean $verifyEmail
-     * @return User

      */
      */

-    public function registerNew(array $data, $verifyEmail = false)
+    public function registerNew(array $data, bool $emailConfirmed = false): User

     {
     {

-        $user = $this->create($data, $verifyEmail);
-        $this->attachDefaultRole($user);
+        $user = $this->create($data, $emailConfirmed);
+        $user->attachDefaultRole();

         $this->downloadAndAssignUserAvatar($user);
 
         return $user;
     }
 
         $this->downloadAndAssignUserAvatar($user);
 
         return $user;
     }
 

-    /**
-     * Give a user the default role. Used when creating a new user.
-     * @param User $user
-     */
-    public function attachDefaultRole(User $user)
-    {
-        $roleId = setting('registration-role');
-        if ($roleId !== false && $user->roles()->where('id', '=', $roleId)->count() === 0) {
-            $user->attachRoleId($roleId);
-        }
-    }
-

     /**
      * Assign a user to a system-level role.
      * @param User $user
     /**
      * Assign a user to a system-level role.
      * @param User $user


@@ -172,17 +156,15 @@ class UserRepo
 
     /**
      * Create a new basic instance of user.
 
     /**
      * Create a new basic instance of user.

-     * @param array $data
-     * @param boolean $verifyEmail
-     * @return User

      */
      */

-    public function create(array $data, $verifyEmail = false)
+    public function create(array $data, bool $emailConfirmed = false): User

     {
         return $this->user->forceCreate([
             'name'     => $data['name'],
             'email'    => $data['email'],
             'password' => bcrypt($data['password']),
     {
         return $this->user->forceCreate([
             'name'     => $data['name'],
             'email'    => $data['email'],
             'password' => bcrypt($data['password']),

-            'email_confirmed' => $verifyEmail
+            'email_confirmed' => $emailConfirmed,
+            'external_auth_id' => $data['external_auth_id'] ?? '',

         ]);
     }
 
         ]);
     }
 


@@ -194,6 +176,7 @@ class UserRepo
     public function destroy(User $user)
     {
         $user->socialAccounts()->delete();
     public function destroy(User $user)
     {
         $user->socialAccounts()->delete();

+        $user->apiTokens()->delete();

         $user->delete();
         
         // Delete user profile images
         $user->delete();
         
         // Delete user profile images


@@ -255,7 +238,7 @@ class UserRepo
      */
     public function getAllRoles()
     {
      */
     public function getAllRoles()
     {

-        return $this->role->newQuery()->orderBy('name', 'asc')->get();
+        return $this->role->newQuery()->orderBy('display_name', 'asc')->get();

     }
 
     /**
     }
 
     /**