From 44536c695a580f84a22b5acf6b743e84ee883895 Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Thu, 12 Nov 2020 11:24:36 +0300 Subject: [PATCH] Thirdparty: fix. --- common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs | 4 ++-- web/ASC.Web.Api/Controllers/ThirdPartyController.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs b/common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs index bf47a68160..2b312fc56f 100644 --- a/common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs +++ b/common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs @@ -49,7 +49,7 @@ namespace ASC.FederatedLogin.Helpers ConsumerFactory = consumerFactory; } - public RedirectResult RequestCode(string scope = null, Dictionary additionalArgs = null) where T : Consumer, IOAuthProvider, new() + public string RequestCode(string scope = null, Dictionary additionalArgs = null) where T : Consumer, IOAuthProvider, new() { var loginProvider = ConsumerFactory.Get(); 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(ConsumerFactory consumerFactory, string authCode) where T : Consumer, IOAuthProvider, new() diff --git a/web/ASC.Web.Api/Controllers/ThirdPartyController.cs b/web/ASC.Web.Api/Controllers/ThirdPartyController.cs index e9da719ae4..6ea5d7ede3 100644 --- a/web/ASC.Web.Api/Controllers/ThirdPartyController.cs +++ b/web/ASC.Web.Api/Controllers/ThirdPartyController.cs @@ -52,7 +52,7 @@ namespace ASC.Web.Api.Controllers } [Read("{provider}")] - public RedirectResult Get(LoginProviderEnum provider) + public string Get(LoginProviderEnum provider) { switch (provider) {