Add functionality to enable non-tenant subdomains to use tenant middleware when subdomain is enabled

Author: miracuthbert

config/laravel-multi-tenancy.php

@@ -164,6 +164,23 @@
          */
         'subdomain_key' => "domain",
 
+        /*
+         *
+         * The routes that use 'tenant' middleware but are under a
+         * non-tenant subdomain.
+         *
+         * Example: 'cms.*', 'crm.*', 'blog.*'
+         *
+         * Tenant will be resolved from store rather than subdomain.
+         *
+         * Note: Make sure the user knows which tenant account they are
+         * using.
+         *
+         */
+        'subdomain_safe_routes' => [
+            // 'projects.*',
+        ],
+
         /*
          *
          * The tenant routes prefix.

src/Http/Middleware/SetTenant.php

@@ -29,7 +29,11 @@ public function handle($request, Closure $next, $guard = null)
 
         list('in_tenant' => $inTenant, 'in_header' => $inHeader) = $options;
 
-        if (tenancy()->config()->getOption('routes.subdomain')) {
+        $subdomainSafeRoutes = tenancy()->config()->getOption('routes.subdomain_safe_routes');
+
+        $subomainSafeCheck = empty($subdomainSafeRoutes) ? false : $request->routeIs($subdomainSafeRoutes);
+
+        if (tenancy()->config()->getOption('routes.subdomain') && empty($subomainSafeCheck)) {
             $value = ($request->{$subdomainKey});
         } else {
             $value = $inHeader ? $request->header(TenantStore::TENANT_HEADER) : tenancy()->store()->getKey($request->{$paramKey});

src/Tenancy.php

@@ -76,11 +76,11 @@ public function store()
      * @param $value
      * @return mixed
      */
-    public function resolveTenant($value)
+    public function resolveTenant($value, $ignoreSubdomain = false)
     {
         $model = $this->tenantModel();
 
-        if (tenancy()->config()->getOption('routes.subdomain')) {
+        if (tenancy()->config()->getOption('routes.subdomain') && $ignoreSubdomain == false) {
             $key = tenancy()->config()->getOption('routes.subdomain_key', 'domain');
         } else {
             $key = (tenancy()->config()->storeDriver() === 'db') ? config('tenancy.model.db_key') : config('tenancy.model.key');