Add short-circuit for Smart Assemblies + include extra error info

Author: mythz

src/ServiceStack.Text/LicenseUtils.cs

@@ -127,7 +127,7 @@ public static class ErrorMessages
             internal const string ExceededServiceStackOperations = "The free-quota limit on '{0} ServiceStack Operations' has been reached." + UpgradeInstructions;
             internal const string ExceededAdminUi = "The Admin UI is a commerical-only premium feature." + UpgradeInstructions;
             internal const string ExceededPremiumFeature = "Unauthorized use of a commerical-only premium feature." + UpgradeInstructions;
-            public const string UnauthorizedAccessRequest = "Unauthorized access request of a licensed feature." + UpgradeInstructions;
+            public const string UnauthorizedAccessRequest = "Unauthorized access request of a licensed feature.";
         }
 
         public static class FreeQuotas
@@ -384,10 +384,22 @@ public static IDisposable RequestAccess(object accessToken, LicenseFeature srcFe
         {
             var accessType = accessToken.GetType();
 
-            if (srcFeature != LicenseFeature.Client || requestedAccess != LicenseFeature.Text
-                || accessToken == null || !_approved.__tokens.Contains(accessType.FullName))
+            if (srcFeature != LicenseFeature.Client || requestedAccess != LicenseFeature.Text || accessToken == null)
                 throw new LicenseException(ErrorMessages.UnauthorizedAccessRequest);
 
+            if (accessType.Name.StartsWith("#")) //Smart Assembly
+                return new AccessToken(requestedAccess);
+
+            if (!_approved.__tokens.Contains(accessType.FullName))
+            {
+                var errorDetails = " __tokens: '{0}', Assembly: '{1}', '{2}'".Fmt(
+                    accessType.Name,
+                    accessType.Assembly.ManifestModule.Name,
+                    accessType.Assembly.Location);
+
+                throw new LicenseException(ErrorMessages.UnauthorizedAccessRequest + errorDetails);
+            }
+
             PclExport.Instance.VerifyInAssembly(accessType, _approved.__dlls);
 
             return new AccessToken(requestedAccess);

src/ServiceStack.Text/PclExport.Net40.cs

@@ -463,13 +463,10 @@ public override LicenseKey VerifyLicenseKeyText(string licenseKeyText)
 
         public override void VerifyInAssembly(Type accessType, ICollection<string> assemblyNames)
         {
-            //might get merged/mangled on alt platforms (also issues with Smart Assembly)
+            //might get merged/mangled on alt platforms
             if (assemblyNames.Contains(accessType.Assembly.ManifestModule.Name)) 
                 return;
 
-            if (accessType.Name.StartsWith("#")) //Allow Smart Assemblies
-                return;
-
             try
             {
                 if (assemblyNames.Contains(accessType.Assembly.Location.SplitOnLast(Path.DirectorySeparatorChar).Last()))
@@ -478,9 +475,14 @@ public override void VerifyInAssembly(Type accessType, ICollection<string> assem
             catch (Exception)
             {
                 return; //dynamic assembly
-            } 
+            }
+
+            var errorDetails = " Type: '{0}', Assembly: '{1}', '{2}'".Fmt(
+                accessType.Name,
+                accessType.Assembly.ManifestModule.Name,
+                accessType.Assembly.Location);
 
-            throw new LicenseException(LicenseUtils.ErrorMessages.UnauthorizedAccessRequest);
+            throw new LicenseException(LicenseUtils.ErrorMessages.UnauthorizedAccessRequest + errorDetails);
         }
 
         public override void BeginThreadAffinity()