DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removed env dependency, switched to DB

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2023-05-10 00:27:47 -07:00
parent 72d1c08fbc
commit bc9b47c46d
4 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.env.example
View file

@ -175,15 +175,6 @@ REQUIRE_SAML=false
API_THROTTLE_PER_MINUTE=120 API_THROTTLE_PER_MINUTE=120
CSV_ESCAPE_FORMULAS=true CSV_ESCAPE_FORMULAS=true
# --------------------------------------------
# OPTIONAL: GOOGLE LOGIN
# --------------------------------------------
ENABLE_GOOGLE_LOGIN=false
GOOGLE_CLIENT_ID=null
GOOGLE_CLIENT_SECRET=null
GOOGLE_REDIRECT_URL=null
# -------------------------------------------- # --------------------------------------------
# OPTIONAL: HASHING # OPTIONAL: HASHING
# -------------------------------------------- # --------------------------------------------

9
config/app.php
View file

@ -218,15 +218,6 @@ return [
'require_saml' => env('REQUIRE_SAML', false), 'require_saml' => env('REQUIRE_SAML', false),
/*
|--------------------------------------------------------------------------
| Enable Google Login
|--------------------------------------------------------------------------
*/
'google_login' => env('ENABLE_GOOGLE_LOGIN', false),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Demo Mode Lockdown | Demo Mode Lockdown

3
config/services.php
View file

@ -51,9 +51,6 @@ return [
'google' => [ 'google' => [
'maps_api_key' => env('GOOGLE_MAPS_API'), 'maps_api_key' => env('GOOGLE_MAPS_API'),
'client_id' => env('GOOGLE_CLIENT_ID'),
'client_secret' => env('GOOGLE_CLIENT_SECRET'),
'redirect' => env('GOOGLE_REDIRECT_URL'),
], ],
]; ];

5
resources/views/auth/login.blade.php
View file

@ -78,8 +78,11 @@
<button class="btn btn-lg btn-primary btn-block">{{ trans('auth/general.login') }}</button> <button class="btn btn-lg btn-primary btn-block">{{ trans('auth/general.login') }}</button>
@endif @endif
@if ((config('app.google_login')) && (config('services.google.client_id')) && (config('services.google.client_secret')) && (config('services.google.redirect'))) @if (($snipeSettings->google_login=='1') && ($snipeSettings->google_client_id!='') && ($snipeSettings->google_client_secret!='') && ($snipeSettings->google_redirect!='')))
<br>
Or
<br>
<a class="btn btn-lg btn-primary btn-block" href="{{ route('google.redirect') }}"> <a class="btn btn-lg btn-primary btn-block" href="{{ route('google.redirect') }}">
<i class="fa-brands fa-google"></i> <i class="fa-brands fa-google"></i>
{{ trans('auth/general.google_login') }} {{ trans('auth/general.google_login') }}