Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 30 insertions, 0 deletions

diff --git a/lib/gitlab/auth/atlassian/identity_linker.rb b/lib/gitlab/auth/atlassian/identity_linker.rb
new file mode 100644
index 00000000000..4dec54d44d6
--- /dev/null
+++ b/lib/gitlab/auth/atlassian/identity_linker.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Auth
+    module Atlassian
+      class IdentityLinker < OmniauthIdentityLinkerBase
+        extend ::Gitlab::Utils::Override
+        include ::Gitlab::Utils::StrongMemoize
+
+        private
+
+        override :identity
+        def identity
+          strong_memoize(:identity) do
+            current_user.atlassian_identity || build_atlassian_identity
+          end
+        end
+
+        def build_atlassian_identity
+          identity = current_user.build_atlassian_identity
+          ::Gitlab::Auth::Atlassian::User.assign_identity_from_auth_hash!(identity, auth_hash)
+        end
+
+        def auth_hash
+          ::Gitlab::Auth::Atlassian::AuthHash.new(oauth)
+        end
+      end
+    end
+  end
+end