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

Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations

Browse Source
This commit is contained in:
Nikita Gopienko 2020-11-12 11:28:01 +03:00
commit c93a923e29
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs
View File

@ -49,7 +49,7 @@ namespace ASC.FederatedLogin.Helpers
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 requestUrl = loginProvider.CodeUrl;
@ -77,7 +77,7 @@ namespace ASC.FederatedLogin.Helpers
+ "=" + 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()

2
web/ASC.Web.Api/Controllers/ThirdPartyController.cs
View File

@ -52,7 +52,7 @@ namespace ASC.Web.Api.Controllers
}
[Read("{provider}")]
public RedirectResult Get(LoginProviderEnum provider)
public string Get(LoginProviderEnum provider)
{
switch (provider)
{