fixes #27 (17cfa25c) · Commits · cra / overleaf-ldap-oauth2

ldap-overleaf-sl/Dockerfile

+1 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ COPY sharelatex/router.js /overleaf/services/web/app/src/route
		COPY sharelatex/settings.pug /overleaf/services/web/app/views/user/
		COPY sharelatex/login.pug /overleaf/services/web/app/views/user/
		COPY sharelatex/navbar.pug /overleaf/services/web/app/views/layout/
		COPY sharelatex/navbar-marketing.pug /overleaf/services/web/app/views/layout/

		# Non LDAP User Registration for Admins
		COPY sharelatex/admin-index.pug /overleaf/services/web/app/views/admin/index.pug

ldap-overleaf-sl/sharelatex_diff/admin-index.pug.diff

+13 −87

Original line number	Diff line number	Diff line
		1,2c1
		< extends ../layout-marketing
		< include ../_mixins/bookmarkable_tabset
		---
		> extends ../layout
		9c8
		< .card
		---
		> .card(ng-controller="RegisterUsersController")
		12,79c11,37
		< div(data-ol-bookmarkable-tabset)
		< ul.nav.nav-tabs(role="tablist")
		< +bookmarkable-tabset-header('system-messages', 'System Messages', true)
		15,18c15
		< +bookmarkable-tabset-header('open-sockets', 'Open Sockets')
		< +bookmarkable-tabset-header('open-close-editor', 'Open/Close Editor')
		< if hasFeature('saas')
		< +bookmarkable-tabset-header('tpds', 'TPDS/Dropbox Management')
		<
		< .tab-content
		< .tab-pane.active(
		< role="tabpanel"
		< id='system-messages'
		< )
		< each message in systemMessages
		< .alert.alert-info.row-spaced(ng-non-bindable) #{message.content}
		< hr
		< form(method='post', action='/admin/messages')
		< input(name="_csrf", type="hidden", value=csrfToken)
		< .form-group
		< label(for="content")
		< input.form-control(name="content", type="text", placeholder="Message…", required)
		< button.btn.btn-primary(type="submit") Post Message
		< hr
		< form(method='post', action='/admin/messages/clear')
		< input(name="_csrf", type="hidden", value=csrfToken)
		< button.btn.btn-danger(type="submit") Clear all messages
		<
		---
		> +bookmarkable-tabset-header('register-user', 'Register User')
		39,49d35
		< .tab-pane(
		< role="tabpanel"
		< id='open-sockets'
		@@ -46,11 +17,11 @@
		< ul
		< each agent in agents
		< li(ng-non-bindable) #{agent}
		<
		< .tab-pane(
		< role="tabpanel"
		53c39
		< id='open-close-editor'
		< )
		---
		> id='register-user'
		55,74c41,42
		< if hasFeature('saas')
		< \| The "Open/Close Editor" feature is not available in SAAS.
		< else
		@@ -71,40 +42,15 @@
		< input(name="_csrf", type="hidden", value=csrfToken)
		< button.btn.btn-danger(type="submit") Reopen Editor
		< p.small Will reopen the editor after closing.
		<
		---
		> hr
		> a(href="/admin/register") Register User
		76,99d43
		< if hasFeature('saas')
		< .tab-pane(
		< role="tabpanel"
		< id='tpds'
		---
		> tabset(ng-cloak)
		> tab(heading="System Messages")
		> each message in systemMessages
		> .alert.alert-info.row-spaced(ng-non-bindable) #{message.content}
		> hr
		> form(method='post', action='/admin/messages')
		> input(name="_csrf", type="hidden", value=csrfToken)
		> .form-group
		> label(for="content")
		> input.form-control(name="content", type="text", placeholder="Message...", required)
		> button.btn.btn-primary(type="submit") Post Message
		> hr
		> form(method='post', action='/admin/messages/clear')
		> input(name="_csrf", type="hidden", value=csrfToken)
		> button.btn.btn-danger(type="submit") Clear all messages
		>
		>
		> tab(heading="Register non LDAP User")
		> form.form
		> .row
		> .col-md-4.col-xs-8
		> input.form-control(
		> name="email",
		> type="text",
		> placeholder="jane@example.com, joe@example.com",
		> ng-model="inputs.emails",
		> on-enter="registerUsers()"
		81,99c39,57
		< )
		< h3 Flush project to TPDS
		< .row
		< form.col-xs-6(method='post',action='/admin/flushProjectToTpds')
		@@ -124,23 +70,3 @@
		< input.form-control(type='text', name='user_id', placeholder='user_id', required)
		< .form-group
		< button.btn-primary.btn(type='submit') Poll
		---
		> .col-md-8.col-xs-4
		> button.btn.btn-primary(ng-click="registerUsers()") #{translate("register")}
		>
		> .row-spaced(ng-show="error").ng-cloak.text-danger
		> p Sorry, an error occured
		>
		> .row-spaced(ng-show="users.length > 0").ng-cloak.text-success
		> p We've sent out welcome emails to the registered users.
		> p You can also manually send them URLs below to allow them to reset their password and log in for the first time.
		> p (Password reset tokens will expire after one week and the user will need registering again).
		>
		> hr(ng-show="users.length > 0").ng-cloak
		> table(ng-show="users.length > 0").table.table-striped.ng-cloak
		> tr
		> th #{translate("email")}
		> th Set Password Url
		> tr(ng-repeat="user in users")
		> td {{ user.email }}
		> td(style="word-break: break-all;") {{ user.setNewPasswordUrl }}

ldap-overleaf-sl/sharelatex_diff/navbar-marketing.pug.diff

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		55,56d54
		< li
		< a(href="/admin/project") Project URL Lookup

Admin message