From 199d908d7a5e9c1908f36f0bbe309b52c5f16939 Mon Sep 17 00:00:00 2001
From: Emil Olsson <emilolsson93@gmail.com>
Date: Thu, 9 Apr 2020 17:25:48 +0200
Subject: [PATCH] #7658 Fix linking account if multiple IDP on common user
 overlay (#7845)

---
 .../src/views/common/overlays/user/user.controller.js        | 4 ++++
 .../src/views/common/overlays/user/user.html                 | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
index 5ed87f073b..8248d11863 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js
@@ -91,6 +91,10 @@ angular.module("umbraco")
             });
         }
 
+        $scope.linkProvider = function (e) {
+            e.target.submit();
+        }
+
         $scope.unlink = function (e, loginProvider, providerKey) {
             var result = confirm("Are you sure you want to unlink this account?");
             if (!result) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
index 531feef892..8b12d061f3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
@@ -49,12 +49,11 @@
 
         <div ng-repeat="login in externalLoginProviders">
 
-			<form ng-if="login.linkedProviderKey == undefined" method="POST" action="{{externalLinkLoginFormAction}}" id="oauthloginform" name="oauthloginform">
+			<form ng-submit="linkProvider($event)" ng-if="login.linkedProviderKey == undefined" method="POST" action="{{externalLinkLoginFormAction}}" name="oauthloginform" id="oauthloginform-{{login.authType}}">
 				<input type="hidden" name="provider" value="{{login.authType}}" />
                 <button class="btn btn-block btn-social"
                         ng-class="login.properties.SocialStyle"
-                        id="{{login.authType}}"
-                        onclick="document.forms.oauthloginform.submit();">
+                        id="{{login.authType}}">
 
                     <i class="fa" ng-class="login.properties.SocialIcon"></i>
                     <localize key="defaultdialogs_linkYour">Link your</localize>&nbsp;{{login.caption}}&nbsp;<localize key="defaultdialogs_account">account</localize>