Remove remaining SS.Text restrictions

Author: mythz

lib/ServiceStack.Client.dll

@@ -174,11 +174,7 @@ public static void RegisterLicense(string licenseKeyText)
                 var parts = licenseKeyText.SplitOnFirst('-');
                 cutomerId = parts[0];
 
-                LicenseKey key;
-                using (new AccessToken(LicenseFeature.Text))
-                {
-                    key = PclExport.Instance.VerifyLicenseKeyText(licenseKeyText);
-                }
+                var key = PclExport.Instance.VerifyLicenseKeyText(licenseKeyText);
 
                 var releaseDate = Env.GetReleaseDate();
                 if (releaseDate > key.Expiry)
@@ -243,12 +239,6 @@ public static void AssertValidUsage(LicenseFeature feature, QuotaType quotaType,
             if ((LicenseFeature.All & licensedFeatures) == LicenseFeature.All) //Standard Usage
                 return;
 
-            if (AccessTokenScope != null)
-            {
-                if ((feature & AccessTokenScope.tempFeatures) == feature)
-                    return;
-            }
-
             //Free Quotas
             switch (feature)
             {
@@ -393,71 +383,5 @@ public static Exception GetInnerMostException(this Exception ex)
             }
             return ex;
         }
-
-        [ThreadStatic]
-        private static AccessToken AccessTokenScope;
-        private class AccessToken : IDisposable
-        {
-            private readonly AccessToken prevToken;
-            internal readonly LicenseFeature tempFeatures;
-            internal AccessToken(LicenseFeature requested)
-            {
-                prevToken = AccessTokenScope;
-                AccessTokenScope = this;
-                tempFeatures = requested;
-            }
-
-            public void Dispose()
-            {
-                AccessTokenScope = prevToken;
-            }
-        }
-
-        static class _approved
-        {
-            internal static readonly HashSet<string> __tokens = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
-            {
-                "ServiceStack.ServiceClientBase+AccessToken",
-                "ServiceStack.JsonHttpClient+AccessToken",
-                "ServiceStack.RabbitMq.RabbitMqProducer+AccessToken",
-                "ServiceStack.Messaging.RedisMessageQueueClient+AccessToken",
-                "ServiceStack.Messaging.RedisMessageProducer+AccessToken",
-                "ServiceStack.Aws.Support.AwsClientUtils+AccessToken",
-            };
-
-            internal static readonly HashSet<string> __dlls = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
-            {
-                "ServiceStack.HttpClient.dll",
-                "ServiceStack.Client.dll",
-                "ServiceStack.RabbitMq.dll",
-                "ServiceStack.Aws.dll",
-                "<Unknown>"
-            };
-        }
-
-        [Obsolete("Should no longer be needed")]
-        public static IDisposable RequestAccess(object accessToken, LicenseFeature srcFeature, LicenseFeature requestedAccess)
-        {
-            var accessType = accessToken.GetType();
-
-            if (srcFeature != LicenseFeature.Client || requestedAccess != LicenseFeature.Text || accessToken == null)
-                throw new LicenseException(ErrorMessages.UnauthorizedAccessRequest).Trace();
-
-            if (accessType.Name == "AccessToken" && accessType.GetAssembly().ManifestModule.Name.StartsWith("<")) //Smart Assembly
-                return new AccessToken(requestedAccess);
-
-            if (!_approved.__tokens.Contains(accessType.FullName))
-            {
-                var errorDetails = " __token: '{0}', Assembly: '{1}'".Fmt(
-                    accessType.Name,
-                    accessType.GetAssembly().ManifestModule.Name);
-
-                throw new LicenseException(ErrorMessages.UnauthorizedAccessRequest + errorDetails).Trace();
-            }
-
-            PclExport.Instance.VerifyInAssembly(accessType, _approved.__dlls);
-
-            return new AccessToken(requestedAccess);
-        }
     }
 }

lib/ServiceStack.Common.dll

@@ -520,33 +520,6 @@ public override LicenseKey VerifyLicenseKeyText(string licenseKeyText)
             return key;
         }
 
-        public override void VerifyInAssembly(Type accessType, ICollection<string> assemblyNames)
-        {
-            //might get merged/mangled on alt platforms
-            if (assemblyNames.Contains(accessType.Assembly.ManifestModule.Name))
-                return;
-
-            try
-            {
-                if (typeof(PclExport).Assembly.ManifestModule.Name != "ServiceStack.Text.dll")
-                    return; //Smart/Packaged Assembly
-
-                if (assemblyNames.Contains(accessType.Assembly.Location.SplitOnLast(Path.DirectorySeparatorChar).Last()))
-                    return;
-            }
-            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 + errorDetails);
-        }
-
         public override void BeginThreadAffinity()
         {
             Thread.BeginThreadAffinity();
@@ -734,10 +707,6 @@ public IosPclExport()
             SupportsEmit = SupportsExpression = false;
         }
 
-        public override void VerifyInAssembly(Type accessType, ICollection<string> assemblyNames)
-        {
-        }
-
         public new static void Configure()
         {
             Configure(Provider);
@@ -978,10 +947,6 @@ public AndroidPclExport()
             PlatformName = "Android";
         }
 
-        public override void VerifyInAssembly(Type accessType, ICollection<string> assemblyNames)
-        {
-        }
-
         public new static void Configure()
         {
             Configure(Provider);

lib/ServiceStack.Interfaces.dll

@@ -129,10 +129,6 @@ public override string GetAssemblyCodeBase(Assembly assembly)
         //    return TimeZoneInfo.ConvertTimeToUtc(dateTime);
         //}
 
-        public override void VerifyInAssembly(Type accessType, ICollection<string> assemblyNames)
-        {
-        }
-
         public static void InitForAot()
         {
         }

lib/tests/ServiceStack.Interfaces.dll

@@ -449,10 +449,6 @@ public virtual LicenseKey VerifyLicenseKeyText(string licenseKeyText)
             return licenseKeyText.ToLicenseKey();
         }
 
-        public virtual void VerifyInAssembly(Type accessType, ICollection<string> assemblyNames)
-        {
-        }
-
         public virtual void BeginThreadAffinity()
         {
         }