Put back google social login

app/Console/Commands/Intuit/InvoiceSync.php

@@ -3,13 +3,13 @@
 namespace App\Console\Commands\Intuit;
 
 use Illuminate\Console\Command;
+use Intuit\Traits\ProviderTokenTrait;
 
-use App\Models\{ProviderOauth,User};
 use App\Jobs\AccountingInvoiceSync as Job;
 
 class InvoiceSync extends Command
 {
-	private const provider = 'intuit';
+	use ProviderTokenTrait;
 
 	/**
 	 * The name and signature of the console command.
@@ -30,16 +30,11 @@ class InvoiceSync extends Command
 	 * Execute the console command.
 	 *
 	 * @return int
+	 * @throws \Intuit\Exceptions\NotTokenException
 	 */
 	public function handle()
 	{
-		$uo = User::where('email',$this->argument('user') ?: config('osb.admin'))->singleOrFail();
+		Job::dispatchSync($this->providerToken($this->argument('user')));
-
-		$so = ProviderOauth::where('name',self::provider)->singleOrFail();
-		if (! ($to=$so->token($uo)))
-			abort(500,sprintf('Unknown Tokens for [%s]',$uo->email));
-
-		Job::dispatchSync($to);
 
 		return self::SUCCESS;
 	}

app/Console/Commands/Intuit/PaymentSync.php

@@ -3,20 +3,20 @@
 namespace App\Console\Commands\Intuit;
 
 use Illuminate\Console\Command;
+use Intuit\Traits\ProviderTokenTrait;
 
-use App\Models\{ProviderOauth,User};
 use App\Jobs\AccountingPaymentSync as Job;
 
 class PaymentSync extends Command
 {
-	private const provider = 'intuit';
+	use ProviderTokenTrait;
 
 	/**
 	 * The name and signature of the console command.
 	 *
 	 * @var string
 	 */
-	protected $signature = 'accounting:payment:sync'
+	protected $signature = 'intuit:payment:sync'
 		.' {user? : User Email}';
 
 	/**
@@ -30,17 +30,13 @@ class PaymentSync extends Command
 	 * Execute the console command.
 	 *
 	 * @return int
+	 * @throws \Intuit\Exceptions\NotTokenException
 	 */
 	public function handle()
 	{
-		$uo = User::where('email',$this->argument('user') ?: config('osb.admin'))->singleOrFail();
+		$to = $this->providerToken($this->argument('user'));
 
-		$so = ProviderOauth::where('name',self::provider)->singleOrFail();
+		foreach ($to->API()->getPayments() as $acc)
-		if (! ($to=$so->token($uo)))
-			abort(500,sprintf('Unknown Tokens for [%s]',$uo->email));
-
-		$api = $to->API();
-		foreach ($api->getPayments() as $acc)
 			Job::dispatchSync($to,$acc);
 
 		return self::SUCCESS;

app/Console/Commands/Intuit/TaxSync.php

@@ -3,8 +3,8 @@
 namespace App\Console\Commands\Intuit;
 
 use Illuminate\Console\Command;
+use Intuit\Traits\ProviderTokenTrait;
 
-use App\Models\{ProviderOauth,User};
 use App\Jobs\AccountingTaxSync as Job;
 
 /**
@@ -12,7 +12,7 @@ use App\Jobs\AccountingTaxSync as Job;
  */
 class TaxSync extends Command
 {
-	private const provider = 'intuit';
+	use ProviderTokenTrait;
 
 	/**
 	 * The name and signature of the console command.
@@ -33,16 +33,11 @@ class TaxSync extends Command
 	 * Execute the console command.
 	 *
 	 * @return int
+	 * @throws \Intuit\Exceptions\NotTokenException
 	 */
 	public function handle()
 	{
-		$uo = User::where('email',$this->argument('user') ?: config('osb.admin'))->singleOrFail();
+		Job::dispatchSync($this->providerToken($this->argument('user')));
-
-		$so = ProviderOauth::where('name',self::provider)->singleOrFail();
-		if (! ($to=$so->token($uo)))
-			abort(500,sprintf('Unknown Tokens for [%s]',$uo->email));
-
-		Job::dispatchSync($to);
 
 		return self::SUCCESS;
 	}

config/auth.php

@@ -2,120 +2,128 @@
 
 return [
 
-    /*
+	/*
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    | Authentication Defaults
+	| Authentication Defaults
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    |
+	|
-    | This option defines the default authentication "guard" and password
+	| This option defines the default authentication "guard" and password
-    | reset "broker" for your application. You may change these values
+	| reset "broker" for your application. You may change these values
-    | as required, but they're a perfect start for most applications.
+	| as required, but they're a perfect start for most applications.
-    |
+	|
-    */
+	*/
 
-    'defaults' => [
+	'defaults' => [
-        'guard' => env('AUTH_GUARD', 'web'),
+		'guard' => env('AUTH_GUARD', 'web'),
-        'passwords' => env('AUTH_PASSWORD_BROKER', 'users'),
+		'passwords' => env('AUTH_PASSWORD_BROKER', 'users'),
-    ],
+	],
 
-    /*
+	/*
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    | Authentication Guards
+	| Authentication Guards
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    |
+	|
-    | Next, you may define every authentication guard for your application.
+	| Next, you may define every authentication guard for your application.
-    | Of course, a great default configuration has been defined for you
+	| Of course, a great default configuration has been defined for you
-    | which utilizes session storage plus the Eloquent user provider.
+	| which utilizes session storage plus the Eloquent user provider.
-    |
+	|
-    | All authentication guards have a user provider, which defines how the
+	| All authentication guards have a user provider, which defines how the
-    | users are actually retrieved out of your database or other storage
+	| users are actually retrieved out of your database or other storage
-    | system used by the application. Typically, Eloquent is utilized.
+	| system used by the application. Typically, Eloquent is utilized.
-    |
+	|
-    | Supported: "session"
+	| Supported: "session"
-    |
+	|
-    */
+	*/
 
-    'guards' => [
+	'guards' => [
-        'web' => [
+		'web' => [
-            'driver' => 'session',
+			'driver' => 'session',
-            'provider' => 'users',
+			'provider' => 'users',
-        ],
+		],
 
-        'api' => [
+		'api' => [
-            'driver' => 'passport',
+			'driver' => 'passport',
-            'provider' => 'users',
+			'provider' => 'users',
-        ],
+		],
 
-    ],
+	],
 
-    /*
+	/*
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    | User Providers
+	| User Providers
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    |
+	|
-    | All authentication guards have a user provider, which defines how the
+	| All authentication guards have a user provider, which defines how the
-    | users are actually retrieved out of your database or other storage
+	| users are actually retrieved out of your database or other storage
-    | system used by the application. Typically, Eloquent is utilized.
+	| system used by the application. Typically, Eloquent is utilized.
-    |
+	|
-    | If you have multiple user tables or models you may configure multiple
+	| If you have multiple user tables or models you may configure multiple
-    | providers to represent the model / table. These providers may then
+	| providers to represent the model / table. These providers may then
-    | be assigned to any extra authentication guards you have defined.
+	| be assigned to any extra authentication guards you have defined.
-    |
+	|
-    | Supported: "database", "eloquent"
+	| Supported: "database", "eloquent"
-    |
+	|
-    */
+	*/
 
-    'providers' => [
+	'providers' => [
-        'users' => [
+		'users' => [
-            'driver' => 'eloquent',
+			'driver' => 'eloquent',
-            'model' => env('AUTH_MODEL', App\Models\User::class),
+			'model' => env('AUTH_MODEL', App\Models\User::class),
-        ],
+		],
 
-        // 'users' => [
+		// 'users' => [
-        //     'driver' => 'database',
+		//	 'driver' => 'database',
-        //     'table' => 'users',
+		//	 'table' => 'users',
-        // ],
+		// ],
-    ],
+	],
 
-    /*
+	/*
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    | Resetting Passwords
+	| Resetting Passwords
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    |
+	|
-    | These configuration options specify the behavior of Laravel's password
+	| These configuration options specify the behavior of Laravel's password
-    | reset functionality, including the table utilized for token storage
+	| reset functionality, including the table utilized for token storage
-    | and the user provider that is invoked to actually retrieve users.
+	| and the user provider that is invoked to actually retrieve users.
-    |
+	|
-    | The expiry time is the number of minutes that each reset token will be
+	| The expiry time is the number of minutes that each reset token will be
-    | considered valid. This security feature keeps tokens short-lived so
+	| considered valid. This security feature keeps tokens short-lived so
-    | they have less time to be guessed. You may change this as needed.
+	| they have less time to be guessed. You may change this as needed.
-    |
+	|
-    | The throttle setting is the number of seconds a user must wait before
+	| The throttle setting is the number of seconds a user must wait before
-    | generating more password reset tokens. This prevents the user from
+	| generating more password reset tokens. This prevents the user from
-    | quickly generating a very large amount of password reset tokens.
+	| quickly generating a very large amount of password reset tokens.
-    |
+	|
-    */
+	*/
 
-    'passwords' => [
+	'passwords' => [
-        'users' => [
+		'users' => [
-            'provider' => 'users',
+			'provider' => 'users',
-            'table' => env('AUTH_PASSWORD_RESET_TOKEN_TABLE', 'password_reset_tokens'),
+			'table' => env('AUTH_PASSWORD_RESET_TOKEN_TABLE', 'password_reset_tokens'),
-            'expire' => 60,
+			'expire' => 60,
-            'throttle' => 60,
+			'throttle' => 60,
-        ],
+		],
-    ],
+	],
 
-    /*
+	/*
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    | Password Confirmation Timeout
+	| Password Confirmation Timeout
-    |--------------------------------------------------------------------------
+	|--------------------------------------------------------------------------
-    |
+	|
-    | Here you may define the amount of seconds before a password confirmation
+	| Here you may define the amount of seconds before a password confirmation
-    | window expires and users are asked to re-enter their password via the
+	| window expires and users are asked to re-enter their password via the
-    | confirmation screen. By default, the timeout lasts for three hours.
+	| confirmation screen. By default, the timeout lasts for three hours.
-    |
+	|
-    */
+	*/
 
-    'password_timeout' => env('AUTH_PASSWORD_TIMEOUT', 10800),
+	'password_timeout' => env('AUTH_PASSWORD_TIMEOUT', 10800),
 
+	'social' => [
+		'google' => [
+			'name' => 'Google',
+			'id' => 'google',
+			'class' => 'btn-danger',
+			'icon' => 'fab fa-google',
+		],
+	],
 ];

config/services.php

@@ -42,6 +42,12 @@ return [
 		'guid' => env('EZYPAY_GUID'),
 	],
 
+	'google' => [
+		'client_id' => env('AUTH_GOOGLE_CLIENT_ID'),
+		'client_secret' => env('AUTH_GOOGLE_SECRET'),
+		'redirect' => '/auth/google/callback',
+	],
+
 	'provider' => [
 		'intuit' => [
 			'api'=> \Intuit\API::class,