diff --git a/avRegistration/login-directive/login-directive.html b/avRegistration/login-directive/login-directive.html
index 2066f3f7..00e3a5ce 100644
--- a/avRegistration/login-directive/login-directive.html
+++ b/avRegistration/login-directive/login-directive.html
@@ -35,7 +35,7 @@
-
+
-
-
+
' + ConfigService.contact.email + ""
+ support: ConfigService.contact.email
});
if (scope.isOpenId) {
setOIDCErrorCookie(errorCodename);
@@ -808,7 +808,7 @@ angular.module('avRegistration')
* @param {*} altAuthMethod altAuthMethod object
*/
scope.getAltAuthMethodName = function(altAuthMethod) {
- var langCode = $window.i18n.lng();
+ var langCode = $window.i18next.resolvedLanguage;
if (
altAuthMethod.public_name_i18n &&
altAuthMethod.public_name_i18n[langCode]
@@ -823,7 +823,7 @@ angular.module('avRegistration')
* Sets the current alt auth method
* @param {*} altAuthMethod altAuthMethod object
*/
- scope.setCurrentAltAuthMethod = function(altAuthMethod) {
+ scope.setCurrentAltAuthMethod = function(altAuthMethod, isClick) {
var authevent = angular.copy(scope.base_authevent);
if (altAuthMethod === null) {
scope.current_alt_auth_method_id = null;
@@ -841,6 +841,7 @@ angular.module('avRegistration')
// smart link cannot be enabled if it doesn't come from the url
if (
+ !!isClick &&
scope.selectedAltMethod !== 'smart-link' &&
altAuthMethod.auth_method_name === 'smart-link'
) {
diff --git a/dist/appCommon-v10.3.0.js b/dist/appCommon-v10.3.0.js
index 4a79dec6..b569cbc5 100644
--- a/dist/appCommon-v10.3.0.js
+++ b/dist/appCommon-v10.3.0.js
@@ -504,7 +504,7 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
}
function setError(errorCodename, error) {
scope.error = error, scope.errorData = angular.toJson({
- support: '' + ConfigService.contact.email + ""
+ support: ConfigService.contact.email
}), scope.isOpenId && (setOIDCErrorCookie(errorCodename), redirectToLogin());
}
if (scope.oidcError = function() {
@@ -660,13 +660,13 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
var params = $window.location.href, paramName2 = paramName2.replace(/[\[\]]/g, "\\$&").replace(/ /g, "%20"), params = new RegExp("[?&]" + paramName2 + "(=([^]*)|&|#|$)").exec(params);
return params ? params[2] ? decodeURIComponent(params[2].replace(/\+/g, " ")) || void 0 : "" : null;
}, scope.getAltAuthMethodName = function(altAuthMethod) {
- var langCode = $window.i18n.lng();
+ var langCode = $window.i18next.resolvedLanguage;
return altAuthMethod.public_name_i18n && altAuthMethod.public_name_i18n[langCode] ? altAuthMethod.public_name_i18n[langCode] : altAuthMethod.public_name;
- }, scope.setCurrentAltAuthMethod = function(altAuthMethod) {
+ }, scope.setCurrentAltAuthMethod = function(altAuthMethod, isClick) {
var authevent = angular.copy(scope.base_authevent);
if (null === altAuthMethod) return scope.current_alt_auth_method_id = null, scope.isOpenId = scope.isOpenId || "openid-connect" === authevent.auth_method,
void scope.apply(authevent);
- altAuthMethod.id !== scope.current_alt_auth_method_id && ("smart-link" !== scope.selectedAltMethod && "smart-link" === altAuthMethod.auth_method_name || (scope.current_alt_auth_method_id = altAuthMethod.id,
+ altAuthMethod.id !== scope.current_alt_auth_method_id && (isClick && "smart-link" !== scope.selectedAltMethod && "smart-link" === altAuthMethod.auth_method_name || (scope.current_alt_auth_method_id = altAuthMethod.id,
authevent.extra_fields = altAuthMethod.extra_fields, authevent.auth_method_config = altAuthMethod.auth_method_config,
authevent.auth_method = altAuthMethod.auth_method_name, scope.apply(authevent)));
}, scope.apply = function(authevent) {
@@ -1791,7 +1791,7 @@ angular.module("avTest", []), angular.module("avTest").controller("UnitTestE2ECo
$templateCache.put("avRegistration/fields/textarea-field-directive/textarea-field-directive.html", ''),
$templateCache.put("avRegistration/loading.html", ''),
$templateCache.put("avRegistration/login-controller/login-controller.html", ''),
- $templateCache.put("avRegistration/login-directive/login-directive.html", '
\x3c!-- Shows the alternative auth method tabs in case there\'s any --\x3e
'),
+ $templateCache.put("avRegistration/login-directive/login-directive.html", '\x3c!-- Shows the alternative auth method tabs in case there\'s any --\x3e
'),
$templateCache.put("avRegistration/register-controller/register-controller.html", ''),
$templateCache.put("avRegistration/register-directive/register-directive.html", ''),
$templateCache.put("avRegistration/success.html", ''),