From 365c190cca4c5ce9a4e35745d4f3515673ac791e Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 4 Mar 2021 10:12:34 +1100
Subject: [PATCH] Remove return type for User Service

---
 app/Http/Middleware/PasswordProtection.php    |  2 +-
 app/Models/User.php                           |  2 +-
 app/Transformers/UserTransformer.php          |  1 +
 ...1_add_has_password_field_to_user_table.php | 30 +++++++++++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 database/migrations/2021_03_03_230941_add_has_password_field_to_user_table.php

diff --git a/app/Http/Middleware/PasswordProtection.php b/app/Http/Middleware/PasswordProtection.php
index 1df11b733400..16bb85d9921b 100644
--- a/app/Http/Middleware/PasswordProtection.php
+++ b/app/Http/Middleware/PasswordProtection.php
@@ -36,7 +36,7 @@ class PasswordProtection
             'errors' => new stdClass,
         ];
 
-        if($request->header('X-API-OAUTH-PASSWORD')){
+        if( $request->header('X-API-OAUTH-PASSWORD') && strlen($request->header('X-API-OAUTH-PASSWORD')) >=1 ){
 
             //user is attempting to reauth with OAuth - check the token value
             //todo expand this to include all OAuth providers
diff --git a/app/Models/User.php b/app/Models/User.php
index bc9a363abbee..f9fb94e5b59f 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -400,7 +400,7 @@ class User extends Authenticatable implements MustVerifyEmail
         //$this->notify(new ResetPasswordNotification($token));
     }
 
-    public function service() :User
+    public function service()
     {
         return new UserService($this);
     }
diff --git a/app/Transformers/UserTransformer.php b/app/Transformers/UserTransformer.php
index bd3632ab69b7..6c550feff39a 100644
--- a/app/Transformers/UserTransformer.php
+++ b/app/Transformers/UserTransformer.php
@@ -60,6 +60,7 @@ class UserTransformer extends EntityTransformer
             'oauth_provider_id' => (string) $user->oauth_provider_id,
             'last_confirmed_email_address' => (string) $user->last_confirmed_email_address ?: '',
             'google_2fa_secret' => (bool) $user->google_2fa_secret,
+            'has_password' => (bool) $user->has_password,
         ];
     }
 
diff --git a/database/migrations/2021_03_03_230941_add_has_password_field_to_user_table.php b/database/migrations/2021_03_03_230941_add_has_password_field_to_user_table.php
new file mode 100644
index 000000000000..92f3821c8d6a
--- /dev/null
+++ b/database/migrations/2021_03_03_230941_add_has_password_field_to_user_table.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddHasPasswordFieldToUserTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->boolean('has_password')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+
+    }
+}