diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index f76d469e2c..4f3f0596d6 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -176,7 +176,7 @@ class AuthController extends Controller $google2fa = app()->make('PragmaRX\Google2FA\Contracts\Google2FA'); if ($user->two_factor_secret=='') { - $user->two_factor_secret = $google2fa->generateSecretKey(); + $user->two_factor_secret = $google2fa->generateSecretKey(32); $user->save(); } diff --git a/database/migrations/2016_09_04_182149_migrate_asset_log_to_action_log.php b/database/migrations/2016_09_04_182149_migrate_asset_log_to_action_log.php index 05d3a26e8d..ad8118a418 100644 --- a/database/migrations/2016_09_04_182149_migrate_asset_log_to_action_log.php +++ b/database/migrations/2016_09_04_182149_migrate_asset_log_to_action_log.php @@ -59,6 +59,7 @@ class MigrateAssetLogToActionLog extends Migration $a->expected_checkin = $log->expected_checkin; $a->thread_id = $log->thread_id; $a->accepted_id = $log->accepted_id; + $a->filename = $log->filename; $a->save();