WIP

Author: hailwood

config/config.php

@@ -2,6 +2,8 @@
 
 return [
 
+    'api_host' => 'https://api.xero.com/api.xro/2.0',
+
     'oauth' => [
         /************************************************************************
          * Client ID provided by Xero when registering your application
@@ -29,6 +31,11 @@
             'offline_access',
         ],
 
+        /************************************************************************
+         * Url to redirect to upon success
+         ************************************************************************/
+        'redirect_on_success' => 'xero.auth.success',
+
         /************************************************************************
          * Url for Xero to redirect to upon granting access
          * Unless you wish to change the default behaviour you should not need to

src/Controllers/AuthorizationCallbackController.php

@@ -39,7 +39,7 @@ public function __invoke(Request $request, OauthCredentialManager $oauth, Identi
 
     public function onSuccess()
     {
-        return Redirect::route(config('xero.oauth.on_success'));
+        return Redirect::route(config('xero.oauth.redirect_on_success'));
     }
 
     public function onFailure(\throwable $e)

src/Controllers/AuthorizationController.php

@@ -10,7 +10,6 @@ class AuthorizationController extends Controller
 {
     public function __invoke(Redirector $redirect, OauthCredentialManager $oauth)
     {
-
         return $redirect->to($oauth->getAuthorizationUrl());
     }
 

src/OauthCredentialManager.php

@@ -96,8 +96,8 @@ public function store(AccessTokenInterface $token, $tenantId = null)
         $this->cache->set($this->cacheKey, [
             'token'         => $token->getToken(),
             'refresh_token' => $token->getRefreshToken(),
-            'id_token'      => $token->getValues(),
-            'expires'       => $token->getExpires()['id_token'],
+            'id_token'      => $token->getValues()['id_token'],
+            'expires'       => $token->getExpires(),
             'tenant_id'     => $tenantId ?? $this->data('tenant_id')
         ]);
     }

src/XeroServiceProvider.php

@@ -44,9 +44,10 @@ public function register()
             ]);
         });
 
-        $this->app->singleton(Configuration::class, function (Application $app, OauthCredentialManager $credentials) {
+        $this->app->singleton(Configuration::class, function (Application $app) {
+            $credentials = $app->make(OauthCredentialManager::class);
             $config = Configuration::getDefaultConfiguration();
-            $config->setHost('https://api.xero.com');
+            $config->setHost(config('xero.api_host'));
 
             if ($credentials->exists()) {
                 //expires
@@ -65,11 +66,12 @@ public function register()
 
         });
 
-        $this->app->singleton(IdentityApi::class, function (Application $app, Configuration $xeroConfig) {
-            return new IdentityApi(new GuzzleClient(), $xeroConfig);
+        $this->app->singleton(IdentityApi::class, function (Application $app) {
+            return new IdentityApi(new GuzzleClient(), $app->make(Configuration::class));
         });
 
-        $this->app->singleton(AccountingApi::class, function (Application $app, Configuration $xeroConfig) {
+        $this->app->singleton(AccountingApi::class, function (Application $app) {
+            return new AccountingApi(new GuzzleClient(), $app->make(Configuration::class));
         });
     }
 }