github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-24 05:52:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2216 from overleaf/jel-saml-beta-account-settings

Browse source 
Allow SAML beta testing on Account Settings

GitOrigin-RevId: 6a2c60a3cbab3d9d0cdcc72e23f5d75f7702f89c
This commit is contained in:
Jessica Lawshe 2019-10-09 07:58:27 -05:00 committed by sharelatex
parent 849f21fde3
commit 625b4c9339
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
services/web/app/src/infrastructure/ExpressLocals.js
View file

@ -530,6 +530,7 @@ module.exports = function(app, webRouter, privateApiRouter, publicApiRouter) {
res.locals.ExposedSettings = {
isOverleaf: Settings.overleaf != null,
appName: Settings.appName,
hasSamlBeta: req.session.samlBeta,
hasSamlFeature: Features.hasFeature('saml'),
samlInitPath: lodash.get(Settings, ['saml', 'ukamf', 'initPath']),
siteUrl: Settings.siteUrl,

2
services/web/app/views/user/settings/user-affiliations.pug
View file

@ -137,7 +137,7 @@ form.row(
input-type="email"
input-required="true"
)
if hasFeature('saml')
if hasFeature('saml') || samlBeta
td(
colspan="2"
ng-if="newAffiliation && newAffiliation.university && newAffiliation.university.ssoEnabled"

3
services/web/public/src/main/affiliations/controllers/UserAffiliationsController.js
View file

@ -28,11 +28,12 @@ define(['base'], App =>
$scope.closeInstitutionNotification = type => {
$scope.hideInstitutionNotifications[type] = true
}
$scope.hasSamlBeta = ExposedSettings.hasSamlBeta
$scope.hasSamlFeature = ExposedSettings.hasSamlFeature
$scope.samlInitPath = ExposedSettings.samlInitPath
$scope.shouldShowRolesAndAddEmailButton = () => {
const newAffiliation = $scope.newAffiliation
const hasSamlFeature = $scope.hasSamlFeature
const hasSamlFeature = $scope.hasSamlFeature || $scope.hasSamlBeta
return (
!newAffiliation ||
(newAffiliation && !newAffiliation.university) ||