Browse Source

権限周り 微修正

develop
sosuke.iwabuchi 2 years ago
parent
commit
bddd27475c
2 changed files with 3 additions and 2 deletions
  1. +1
    -1
      app/Models/Ex/LoginUser.php
  2. +2
    -1
      app/Models/User.php

+ 1
- 1
app/Models/Ex/LoginUser.php View File

@@ -52,7 +52,7 @@ class LoginUser
public function setCurrentContractId(?string $contractId) public function setCurrentContractId(?string $contractId)
{ {
$user = $this->user(); $user = $this->user();
if ($user && Auth::user()->role !== UserRole::SUPER_ADMIN) {
if ($user && Auth::user()->role !== UserRole::SUPER_ADMIN && $contractId !== null) {
throw new LogicException("スーパー管理者以外の成り代わりを検知"); throw new LogicException("スーパー管理者以外の成り代わりを検知");
} }
Session::put(self::SESSION_KEY_CURERNT_CONTRACT_ID, $contractId); Session::put(self::SESSION_KEY_CURERNT_CONTRACT_ID, $contractId);


+ 2
- 1
app/Models/User.php View File

@@ -10,6 +10,7 @@ use App\Models\Feature\ContractFeature;
use App\Models\Feature\IModelFeature; use App\Models\Feature\IModelFeature;
use Illuminate\Database\Eloquent\Concerns\HasUuids; use Illuminate\Database\Eloquent\Concerns\HasUuids;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Builder;
use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable; use Illuminate\Notifications\Notifiable;
@@ -18,7 +19,7 @@ use Laravel\Sanctum\HasApiTokens;


class User extends Authenticatable implements IModelFeature class User extends Authenticatable implements IModelFeature
{ {
use HasApiTokens, HasFactory, Notifiable, HasUuids, ContractFeature;
use HasApiTokens, HasFactory, Notifiable, HasUuids, SoftDeletes, ContractFeature;


const COL_NAME_ID = 'id'; const COL_NAME_ID = 'id';
const COL_NAME_ROLE = 'role'; const COL_NAME_ROLE = 'role';


Loading…
Cancel
Save