Fix tests

Author: molotkov-and

ydb/mvp/oidc_proxy/oidc_proxy_ut.cpp

@@ -667,15 +667,9 @@ Y_UNIT_TEST_SUITE(Mvp) {
 
         TAutoPtr<IEventHandle> handle;
         NHttp::TEvHttpProxy::TEvHttpOutgoingResponse* outgoingResponseEv = runtime.GrabEdgeEvent<NHttp::TEvHttpProxy::TEvHttpOutgoingResponse>(handle);
-        UNIT_ASSERT_STRINGS_EQUAL(outgoingResponseEv->Response->Status, "302");
-        const NHttp::THeaders headers(outgoingResponseEv->Response->Headers);
-        UNIT_ASSERT(headers.Has("Location"));
-        TString location = TString(headers.Get("Location"));
-        UNIT_ASSERT_STRING_CONTAINS(location, "https://auth.test.net/oauth/authorize");
-        UNIT_ASSERT_STRING_CONTAINS(location, "response_type=code");
-        UNIT_ASSERT_STRING_CONTAINS(location, "scope=openid");
-        UNIT_ASSERT_STRING_CONTAINS(location, "client_id=" + settings.ClientId);
-        UNIT_ASSERT_STRING_CONTAINS(location, "redirect_uri=https://" + hostProxy + "/auth/callback");
+        UNIT_ASSERT_STRINGS_EQUAL(outgoingResponseEv->Response->Status, "400");
+        UNIT_ASSERT_STRING_CONTAINS(outgoingResponseEv->Response->Body, "Unknown error has occurred. Please open the page again");
+
     }
 
     Y_UNIT_TEST(OpenIdConnectotWrongStateAuthorizationFlow) {
@@ -784,22 +778,11 @@ Y_UNIT_TEST_SUITE(Mvp) {
                                                     "Content-Length: " + ToString(authorizationServerResponse.length()) + "\r\n\r\n" + authorizationServerResponse);
         runtime.Send(new IEventHandle(handle->Sender, edge, new NHttp::TEvHttpProxy::TEvHttpIncomingResponse(outgoingRequestEv->Request, incomingResponse)));
         auto outgoingResponseEv = runtime.GrabEdgeEvent<NHttp::TEvHttpProxy::TEvHttpOutgoingResponse>(handle);
-        redirectStrategy.CheckRedirectStatus(outgoingResponseEv);
-        TString location = redirectStrategy.GetRedirectUrl(outgoingResponseEv);
-        UNIT_ASSERT_STRING_CONTAINS(location, "https://auth.test.net/oauth/authorize");
-        UNIT_ASSERT_STRING_CONTAINS(location, "response_type=code");
-        UNIT_ASSERT_STRING_CONTAINS(location, "scope=openid");
-        UNIT_ASSERT_STRING_CONTAINS(location, "client_id=" + settings.ClientId);
-        UNIT_ASSERT_STRING_CONTAINS(location, "redirect_uri=https://oidcproxy.net/auth/callback");
-
-        NHttp::TUrlParameters urlParameters(location);
-        const TString newState = urlParameters["state"];
-
-        NHttp::THeaders headers(outgoingResponseEv->Response->Headers);
-        UNIT_ASSERT(headers.Has("Set-Cookie"));
-        const TStringBuf setCookie = headers.Get("Set-Cookie");
-        UNIT_ASSERT_STRING_CONTAINS(setCookie, CreateNameYdbOidcCookie(settings.ClientSecret, newState));
-        redirectStrategy.CheckSpecificHeaders(headers);
+        UNIT_ASSERT_STRINGS_EQUAL(outgoingResponseEv->Response->Status, "302");
+        const NHttp::THeaders headers(outgoingResponseEv->Response->Headers);
+        UNIT_ASSERT(headers.Has("Location"));
+        TStringBuf location = headers.Get("Location");
+        UNIT_ASSERT_STRING_CONTAINS(location, "/requested/page");
     }
 
     Y_UNIT_TEST(OpenIdConnectSessionServiceCreateAccessTokenInvalid) {

ydb/mvp/oidc_proxy/oidc_session_create.cpp

@@ -20,21 +20,6 @@ THandlerSessionCreate::THandlerSessionCreate(const NActors::TActorId& sender,
 {}
 
 void THandlerSessionCreate::Bootstrap(const NActors::TActorContext& ctx) {
-    // NHttp::TUrlParameters urlParameters(Request->URL);
-    // TString code = urlParameters["code"];
-    // TString state = urlParameters["state"];
-
-    // NHttp::THeaders headers(Request->Headers);
-    // NHttp::TCookies cookies(headers.Get("cookie"));
-
-    // if (IsStateValid(state, cookies, ctx) && !code.Empty()) {
-    //     RequestSessionToken(code, ctx);
-    // } else {
-    //     NHttp::THttpOutgoingResponsePtr response = GetHttpOutgoingResponsePtr(Request, Settings, IsAjaxRequest);
-    //     ctx.Send(Sender, new NHttp::TEvHttpProxy::TEvHttpOutgoingResponse(response));
-    //     TBase::Die(ctx);
-    //     return;
-    // }
     TryRestoreOidcSessionFromCookie(ctx);
 }
 
@@ -126,7 +111,7 @@ void THandlerSessionCreate::TryRestoreOidcSessionFromCookie(const NActors::TActo
             NHttp::THeadersBuilder responseHeaders;
             responseHeaders.Set("Content-Type", "text/html");
             SetCORS(Request, &responseHeaders);
-            const static TStringBuf BAD_REQUEST_HTML_PAGE = "<html><head><title>400 Bad Request</title></head><body bgcolor=\"white\"><center><h1>go back to the page</h1></center></body></html>";
+            const static TStringBuf BAD_REQUEST_HTML_PAGE = "<html><head><title>400 Bad Request</title></head><body bgcolor=\"white\"><center><h1>Unknown error has occurred. Please open the page again</h1></center></body></html>";
             ctx.Send(Sender, new NHttp::TEvHttpProxy::TEvHttpOutgoingResponse(Request->CreateResponse("400", "Bad Request", responseHeaders, BAD_REQUEST_HTML_PAGE)));
         }
         Die(ctx);

ydb/mvp/oidc_proxy/openid_connect.cpp

@@ -148,12 +148,12 @@ TRestoreOidcContextResult RestoreSessionStoredOnClientSide(const TString& state,
             expectedState = jsonState->GetStringRobust();
         }
         const NJson::TJsonValue* jsonRedirectUrl = nullptr;
-        if (jsonValue.GetValuePointer("redirect_url", &jsonRedirectUrl)) {
+        if (jsonValue.GetValuePointer("requested_address", &jsonRedirectUrl)) {
             redirectUrl = jsonRedirectUrl->GetStringRobust();
         } else {
             return TRestoreOidcContextResult({.IsSuccess = false,
                                              .IsErrorRetryable = false,
-                                             .ErrorMessage = errorMessage << "Redirect url not found in cookie"});
+                                             .ErrorMessage = errorMessage << "Requested address not found in cookie"});
         }
         const NJson::TJsonValue* jsonExpirationTime = nullptr;
         if (jsonValue.GetValuePointer("expiration_time", &jsonExpirationTime)) {