From 35f818841012012855c3644a75cf641bd6c96182 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Mon, 19 Apr 2021 02:24:20 +0100
Subject: [PATCH] restore cookie methods on ServiceRequest

---
 actix-http/src/http_message.rs | 16 ++++++++++------
 src/service.rs                 | 12 ++++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/actix-http/src/http_message.rs b/actix-http/src/http_message.rs
index 0f4e347e..ccaa320f 100644
--- a/actix-http/src/http_message.rs
+++ b/actix-http/src/http_message.rs
@@ -1,14 +1,18 @@
-use std::cell::{Ref, RefMut};
-use std::str;
+use std::{
+    cell::{Ref, RefMut},
+    str,
+};
 
 use encoding_rs::{Encoding, UTF_8};
 use http::header;
 use mime::Mime;
 
-use crate::error::{ContentTypeError, ParseError};
-use crate::extensions::Extensions;
-use crate::header::{Header, HeaderMap};
-use crate::payload::Payload;
+use crate::{
+    error::{ContentTypeError, ParseError},
+    header::{Header, HeaderMap},
+    payload::Payload,
+    Extensions,
+};
 
 /// Trait that implements general purpose operations on HTTP messages.
 pub trait HttpMessage: Sized {
diff --git a/src/service.rs b/src/service.rs
index 9765343c..dd3597ef 100644
--- a/src/service.rs
+++ b/src/service.rs
@@ -9,6 +9,7 @@ use actix_http::{
 };
 use actix_router::{IntoPattern, Path, Resource, ResourceDef, Url};
 use actix_service::{IntoServiceFactory, ServiceFactory};
+use cookie::{Cookie, ParseError as CookieParseError};
 
 use crate::dev::insert_slash;
 use crate::guard::Guard;
@@ -244,6 +245,17 @@ impl ServiceRequest {
         None
     }
 
+    #[cfg(feature = "cookies")]
+    pub fn cookies(&self) -> Result<Ref<'_, Vec<Cookie<'static>>>, CookieParseError> {
+        self.req.cookies()
+    }
+
+    /// Return request cookie.
+    #[cfg(feature = "cookies")]
+    pub fn cookie(&self, name: &str) -> Option<Cookie<'static>> {
+        self.req.cookie(name)
+    }
+
     /// Set request payload.
     pub fn set_payload(&mut self, payload: Payload) {
         self.payload = payload;