Increased LDAP testing and fixed any Auth-based bugs found

[bookstack] / app / Repos / UserRepo.php

diff --git a/app/Repos/UserRepo.php b/app/Repos/UserRepo.php
index 43b3cf4ca7f60a0575a93850940ce292676ae593..d02ffe9290551ae685ca713fe5d3697074b1ca15 100644 (file)
--- a/app/Repos/UserRepo.php
+++ b/app/Repos/UserRepo.php
@@ -1,29 +1,115 @@
-<?php namespace Oxbow\Repos;
+<?php namespace BookStack\Repos;
 
 
-use Oxbow\User;
+use BookStack\Role;
+use BookStack\User;
+use Setting;
 
 class UserRepo
 {
 
     protected $user;
+    protected $role;
 
     /**
      * UserRepo constructor.
      * @param $user
      */
-    public function __construct(User $user)
+    public function __construct(User $user, Role $role)
     {
         $this->user = $user;
+        $this->role = $role;
     }
 
-
-    public function getByEmail($email) {
+    /**
+     * @param string $email
+     * @return User|null
+     */
+    public function getByEmail($email)
+    {
         return $this->user->where('email', '=', $email)->first();
     }
 
+    /**
+     * @param int $id
+     * @return User
+     */
     public function getById($id)
     {
         return $this->user->findOrFail($id);
     }
+
+    /**
+     * Creates a new user and attaches a role to them.
+     * @param array $data
+     * @return User
+     */
+    public function registerNew(array $data)
+    {
+        $user = $this->create($data);
+        $this->attachDefaultRole($user);
+
+        // Get avatar from gravatar and save
+        if (!config('services.disable_services')) {
+            $avatar = \Images::saveUserGravatar($user);
+            $user->avatar()->associate($avatar);
+            $user->save();
+        }
+
+        return $user;
+    }
+
+    /**
+     * Give a user the default role. Used when creating a new user.
+     * @param $user
+     */
+    public function attachDefaultRole($user)
+    {
+        $roleId = Setting::get('registration-role');
+        if ($roleId === false) $roleId = $this->role->getDefault()->id;
+        $user->attachRoleId($roleId);
+    }
+
+    /**
+     * Checks if the give user is the only admin.
+     * @param User $user
+     * @return bool
+     */
+    public function isOnlyAdmin(User $user)
+    {
+        if ($user->role->name != 'admin') {
+            return false;
+        }
+
+        $adminRole = $this->role->where('name', '=', 'admin')->first();
+        if (count($adminRole->users) > 1) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Create a new basic instance of user.
+     * @param array $data
+     * @return User
+     */
+    public function create(array $data)
+    {
+        return $this->user->forceCreate([
+            'name'     => $data['name'],
+            'email'    => $data['email'],
+            'password' => bcrypt($data['password'])
+        ]);
+    }
+
+    /**
+     * Remove the given user from storage, Delete all related content.
+     * @param User $user
+     */
+    public function destroy(User $user)
+    {
+        $user->socialAccounts()->delete();
+        $user->delete();
+    }
 }
\ No newline at end of file