mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-04 19:35:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
snipe
2026-01-15 11:42:18 +00:00
parent 1e158721ee 04f4f5b57c
commit ea706863b5
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Importer/UserImporter.php
View File

@ -10,6 +10,7 @@ use App\Notifications\WelcomeNotification;
use Illuminate\Support\Facades\Gate;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Password;
use Illuminate\Support\Facades\Auth;
/**
* This is ONLY used for the User Import. When we are importing users
@ -102,8 +103,7 @@ class UserImporter extends ItemImporter
$this->log('Updating User');
// Todo - check that this works
if (!Gate::allows('canEditAuthFields', $user)) {
if (Auth::check() && (!Gate::allows('canEditAuthFields', $user))) {
unset($user->username);
unset($user->email);
unset($user->password);

2
composer.json
View File

@ -29,7 +29,7 @@
"ext-mbstring": "*",
"ext-pdo": "*",
"alek13/slack": "^2.0",
"arietimmerman/laravel-scim-server": "dev-laravel_11_compatibility",
"arietimmerman/laravel-scim-server": "dev-master",
"bacon/bacon-qr-code": "^2.0",
"barryvdh/laravel-debugbar": "^3.13",
"doctrine/cache": "^1.10",

15
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "553ce69c21704905c568769de08fffe4",
"content-hash": "b1dfc90a20cecf851224ea8a5c71f26d",
"packages": [
{
"name": "alek13/slack",
@ -74,16 +74,16 @@
},
{
"name": "arietimmerman/laravel-scim-server",
"version": "dev-laravel_11_compatibility",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/grokability/laravel-scim-server.git",
"reference": "6c771799090bfe04dcee94a1dc9f82870aed4dbe"
"reference": "ad77044af7c36291b69dc1a7dbfa86ba82362554"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/grokability/laravel-scim-server/zipball/6c771799090bfe04dcee94a1dc9f82870aed4dbe",
"reference": "6c771799090bfe04dcee94a1dc9f82870aed4dbe",
"url": "https://api.github.com/repos/grokability/laravel-scim-server/zipball/ad77044af7c36291b69dc1a7dbfa86ba82362554",
"reference": "ad77044af7c36291b69dc1a7dbfa86ba82362554",
"shasum": ""
},
"require": {
@ -98,6 +98,7 @@
"laravel/legacy-factories": "*",
"orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0"
},
"default-branch": true,
"type": "library",
"extra": {
"laravel": {
@ -130,9 +131,9 @@
],
"description": "Laravel Package for creating a SCIM server",
"support": {
"source": "https://github.com/grokability/laravel-scim-server/tree/laravel_11_compatibility"
"source": "https://github.com/grokability/laravel-scim-server/tree/master"
},
"time": "2025-01-20T14:49:28+00:00"
"time": "2026-01-14T14:30:06+00:00"
},
{
"name": "aws/aws-crt-php",