diff --git a/services/web/app/src/Features/User/UserPagesController.js b/services/web/app/src/Features/User/UserPagesController.js index c50ae5ef9b..cdba47fe2b 100644 --- a/services/web/app/src/Features/User/UserPagesController.js +++ b/services/web/app/src/Features/User/UserPagesController.js @@ -22,7 +22,8 @@ const UserPagesController = { title: 'register', sharedProjectData, newTemplateData, - new_email: req.query.new_email || '' + new_email: req.query.new_email || '', + samlBeta: req.session.samlBeta }) }, @@ -79,7 +80,8 @@ const UserPagesController = { } res.render('user/login', { title: 'login', - email: req.query.email + email: req.query.email, + samlBeta: req.session.samlBeta }) }, @@ -145,6 +147,7 @@ const UserPagesController = { samlInitPath: _.get(Settings, ['saml', 'ukamf', 'initPath']), institutionLinked, institutionNotLinked, + samlBeta: req.session.samlBeta, ssoError: ssoError, thirdPartyIds: UserPagesController._restructureThirdPartyIds(user) }) diff --git a/services/web/app/views/user/settings/user-affiliations.pug b/services/web/app/views/user/settings/user-affiliations.pug index 393be19aa6..74194d6618 100644 --- a/services/web/app/views/user/settings/user-affiliations.pug +++ b/services/web/app/views/user/settings/user-affiliations.pug @@ -92,7 +92,7 @@ form.row( i.fa.fa-fw.fa-trash(aria-hidden="true") span.sr-only #{translate("remove")} tr.affiliations-table-saml-row(ng-repeat-end ng-if="userEmail.affiliation && userEmail.affiliation && userEmail.affiliation.institution.ssoEnabled") - if hasFeature('saml') + if hasFeature('saml') || samlBeta td td(ng-attr-colspan="{{userEmail.samlProviderId ? '2' : '1'}}" ng-class="institutionAlreadyLinked(userEmail) ? '' : 'with-border'") p.small(ng-if="userEmail.samlProviderId")