Merge branch 'jej/session-stored-globaly' into 'master'

Session stored globally per request

See merge request gitlab-org/gitlab-ce!27658

2 files changed, 49 insertions, 0 deletions

diff --git a/lib/gitlab/namespaced_session_store.rb b/lib/gitlab/namespaced_session_store.rb
new file mode 100644
index 00000000000..34520078bfb
--- /dev/null
+++ b/lib/gitlab/namespaced_session_store.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Gitlab
+  class NamespacedSessionStore
+    delegate :[], :[]=, to: :store
+
+    def initialize(key)
+      @key = key
+    end
+
+    def initiated?
+      !Session.current.nil?
+    end
+
+    def store
+      return unless Session.current
+
+      Session.current[@key] ||= {}
+      Session.current[@key]
+    end
+  end
+end
diff --git a/lib/gitlab/session.rb b/lib/gitlab/session.rb
new file mode 100644
index 00000000000..7487ba04a6d
--- /dev/null
+++ b/lib/gitlab/session.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Gitlab
+  class Session
+    STORE_KEY = :session_storage
+
+    class << self
+      def with_session(session)
+        old = self.current
+        self.current = session
+        yield
+      ensure
+        self.current = old
+      end
+
+      def current
+        Thread.current[STORE_KEY]
+      end
+
+      protected
+
+      def current=(value)
+        Thread.current[STORE_KEY] = value
+      end
+    end
+  end
+end