Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations
This commit is contained in:
commit
7abb7e8951
@ -49,7 +49,7 @@ namespace ASC.FederatedLogin.Helpers
|
|||||||
ConsumerFactory = consumerFactory;
|
ConsumerFactory = consumerFactory;
|
||||||
}
|
}
|
||||||
|
|
||||||
public RedirectResult RequestCode<T>(string scope = null, Dictionary<string, string> additionalArgs = null) where T : Consumer, IOAuthProvider, new()
|
public string RequestCode<T>(string scope = null, Dictionary<string, string> additionalArgs = null) where T : Consumer, IOAuthProvider, new()
|
||||||
{
|
{
|
||||||
var loginProvider = ConsumerFactory.Get<T>();
|
var loginProvider = ConsumerFactory.Get<T>();
|
||||||
var requestUrl = loginProvider.CodeUrl;
|
var requestUrl = loginProvider.CodeUrl;
|
||||||
@ -77,7 +77,7 @@ namespace ASC.FederatedLogin.Helpers
|
|||||||
+ "=" + HttpUtility.UrlEncode((additionalArgs[additionalArg] ?? "").Trim())) : null);
|
+ "=" + HttpUtility.UrlEncode((additionalArgs[additionalArg] ?? "").Trim())) : null);
|
||||||
}
|
}
|
||||||
|
|
||||||
return new RedirectResult(uriBuilder.Uri + "?" + query);
|
return uriBuilder.Uri + "?" + query;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static OAuth20Token GetAccessToken<T>(ConsumerFactory consumerFactory, string authCode) where T : Consumer, IOAuthProvider, new()
|
public static OAuth20Token GetAccessToken<T>(ConsumerFactory consumerFactory, string authCode) where T : Consumer, IOAuthProvider, new()
|
||||||
|
@ -52,7 +52,7 @@ namespace ASC.Web.Api.Controllers
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Read("{provider}")]
|
[Read("{provider}")]
|
||||||
public RedirectResult Get(LoginProviderEnum provider)
|
public string Get(LoginProviderEnum provider)
|
||||||
{
|
{
|
||||||
switch (provider)
|
switch (provider)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user