IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FederatedLogin: refactor

Browse Source
This commit is contained in:
Maksim Chegulov 2022-02-11 13:12:25 +03:00
parent d6d0886c3e
commit 7de212d2b2
8 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/ASC.FederatedLogin/LoginProviders/BaseLoginProvider.cs
View File

@ -62,8 +62,9 @@ public abstract class BaseLoginProvider<T> : Consumer, ILoginProvider where T :
public abstract string ClientSecret { get; }
public virtual string Scopes => string.Empty;
internal readonly Signature _signature;
internal readonly InstanceCrypto _instanceCrypto;
internal readonly Signature Signature;
internal readonly InstanceCrypto InstanceCrypto;
private readonly OAuth20TokenHelper _oAuth20TokenHelper;
protected BaseLoginProvider() { }
@ -82,8 +83,8 @@ public abstract class BaseLoginProvider<T> : Consumer, ILoginProvider where T :
: base(tenantManager, coreBaseSettings, coreSettings, configuration, cache, consumerFactory, name, order, props, additional)
{
_oAuth20TokenHelper = oAuth20TokenHelper;
_signature = signature;
_instanceCrypto = instanceCrypto;
Signature = signature;
InstanceCrypto = instanceCrypto;
}
public virtual LoginProfile ProcessAuthoriztion(HttpContext context, IDictionary<string, string> @params, IDictionary<string, string> additionalStateArgs)
@ -105,7 +106,7 @@ public abstract class BaseLoginProvider<T> : Consumer, ILoginProvider where T :
}
catch (Exception ex)
{
return LoginProfile.FromError(_signature, _instanceCrypto, ex);
return LoginProfile.FromError(Signature, InstanceCrypto, ex);
}
}

2
common/ASC.FederatedLogin/LoginProviders/FacebookLoginProvider.cs
View File

@ -70,7 +70,7 @@ public class FacebookLoginProvider : BaseLoginProvider<FacebookLoginProvider>
throw new Exception("Failed to correctly process the response");
}
var profile = new LoginProfile(_signature, _instanceCrypto)
var profile = new LoginProfile(Signature, InstanceCrypto)
{
BirthDay = jProfile.Value<string>("birthday"),
Link = jProfile.Value<string>("link"),

2
common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
View File

@ -100,7 +100,7 @@ public class GoogleLoginProvider : BaseLoginProvider<GoogleLoginProvider>
throw new Exception("Failed to correctly process the response");
}
var profile = new LoginProfile(_signature, _instanceCrypto)
var profile = new LoginProfile(Signature, InstanceCrypto)
{
Id = jProfile.Value<string>("resourceName").Replace("people/", ""),
Provider = ProviderConstants.Google,

4
common/ASC.FederatedLogin/LoginProviders/GosUslugiLoginProvider.cs
View File

@ -78,7 +78,7 @@ public class GosUslugiLoginProvider : BaseLoginProvider<GosUslugiLoginProvider>
}
catch (Exception ex)
{
return LoginProfile.FromError(_signature, _instanceCrypto, ex);
return LoginProfile.FromError(Signature, InstanceCrypto, ex);
}
}
@ -100,7 +100,7 @@ public class GosUslugiLoginProvider : BaseLoginProvider<GosUslugiLoginProvider>
throw new Exception("userinfo is incorrect");
}
var profile = new LoginProfile(_signature, _instanceCrypto)
var profile = new LoginProfile(Signature, InstanceCrypto)
{
Id = oid,
FirstName = userInfo.Value<string>("firstName"),

2
common/ASC.FederatedLogin/LoginProviders/LinkedInLoginProvider.cs
View File

@ -71,7 +71,7 @@ public class LinkedInLoginProvider : BaseLoginProvider<LinkedInLoginProvider>
throw new Exception("Failed to correctly process the response");
}
var profile = new LoginProfile(_signature, _instanceCrypto)
var profile = new LoginProfile(Signature, InstanceCrypto)
{
Id = jProfile.Value<string>("id"),
FirstName = jProfile.Value<string>("localizedFirstName"),

4
common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs
View File

@ -82,7 +82,7 @@ public class MailRuLoginProvider : BaseLoginProvider<MailRuLoginProvider>
}
catch (Exception ex)
{
return LoginProfile.FromError(_signature, _instanceCrypto, ex);
return LoginProfile.FromError(Signature, InstanceCrypto, ex);
}
}
@ -132,7 +132,7 @@ public class MailRuLoginProvider : BaseLoginProvider<MailRuLoginProvider>
throw new Exception("Failed to correctly process the response");
}
var profile = new LoginProfile(_signature, _instanceCrypto)
var profile = new LoginProfile(Signature, InstanceCrypto)
{
EMail = mailRuProfiles[0].Email,
Id = mailRuProfiles[0].Uid,

4
common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs
View File

@ -88,7 +88,7 @@ public class VKLoginProvider : BaseLoginProvider<VKLoginProvider>
}
catch (Exception ex)
{
return LoginProfile.FromError(_signature, _instanceCrypto, ex);
return LoginProfile.FromError(Signature, InstanceCrypto, ex);
}
}
@ -137,7 +137,7 @@ public class VKLoginProvider : BaseLoginProvider<VKLoginProvider>
throw new Exception("Failed to correctly process the response");
}
var profile = new LoginProfile(_signature, _instanceCrypto)
var profile = new LoginProfile(Signature, InstanceCrypto)
{
Id = vkProfiles[0].Id,
FirstName = vkProfiles[0].FirstName,

4
common/ASC.FederatedLogin/LoginProviders/YandexLoginProvider.cs
View File

@ -78,7 +78,7 @@ public class YandexLoginProvider : BaseLoginProvider<YandexLoginProvider>
}
catch (Exception ex)
{
return LoginProfile.FromError(_signature, _instanceCrypto, ex);
return LoginProfile.FromError(Signature, InstanceCrypto, ex);
}
}
@ -108,7 +108,7 @@ public class YandexLoginProvider : BaseLoginProvider<YandexLoginProvider>
throw new Exception("Failed to correctly process the response");
}
var profile = new LoginProfile(_signature, _instanceCrypto)
var profile = new LoginProfile(Signature, InstanceCrypto)
{
EMail = jProfile.Value<string>("default_email"),
Id = jProfile.Value<string>("id"),