AIUS/Overleaf
1
0
Fork 0
mirror of https://git.unistra.fr/aius/root/ldap-overleaf-sl.git synced 2024-10-05 23:23:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44 from xathon/sharelatex-4.2.0

Browse Source 
Update sharelatex to 4.2.0
This commit is contained in:
sym 2024-01-08 15:28:58 +01:00 committed by GitHub
commit 75568ee70e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -2,7 +2,7 @@
This repo contains an improved, free ldap authentication and authorisation This repo contains an improved, free ldap authentication and authorisation
for sharelatex/[overleaf](https://github.com/overleaf/overleaf) community for sharelatex/[overleaf](https://github.com/overleaf/overleaf) community
edition. Currently this repo uses `sharelatex/sharelatex:4.1.1`. edition. Currently this repo uses `sharelatex/sharelatex:4.2.0`.
The inital idea for this implementation was taken from The inital idea for this implementation was taken from
[worksasintended](https://github.com/worksasintended). [worksasintended](https://github.com/worksasintended).

2
ldap-overleaf-sl/Dockerfile
View File

@ -1,4 +1,4 @@
FROM sharelatex/sharelatex:4.1.1 FROM sharelatex/sharelatex:4.2.0
# FROM sharelatex/sharelatex:latest # FROM sharelatex/sharelatex:latest
# latest might not be tested # latest might not be tested
# e.g. the AuthenticationManager.js script had to be adapted after versions 2.3.1 # e.g. the AuthenticationManager.js script had to be adapted after versions 2.3.1

5
ldap-overleaf-sl/sharelatex_diff/AuthenticationController.js.diff
View File

@ -1,7 +1,4 @@
68a69,70 268a268,364
> alphaProgram: user.alphaProgram || undefined, // only store if set
> betaProgram: user.betaProgram || undefined, // only store if set
265a268,364
> >
> // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> > // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
> oauth2Redirect(req, res, next) { > oauth2Redirect(req, res, next) {

6
ldap-overleaf-sl/sharelatex_diff/AuthenticationManager.js.diff
View File

@ -5,7 +5,7 @@
> const ldapEscape = require("ldap-escape") > const ldapEscape = require("ldap-escape")
> // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<< > // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
> >
84a91,100 120a127,136
> // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> > // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
> _checkUserPassword2(query, password, callback) { > _checkUserPassword2(query, password, callback) {
> // leave original _checkUserPassword untouched, because it will be called by > // leave original _checkUserPassword untouched, because it will be called by
@ -16,13 +16,13 @@
> }, > },
> // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<< > // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
> >
90c106,108 126c142,144
< AuthenticationManager._checkUserPassword( < AuthenticationManager._checkUserPassword(
--- ---
> // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> > // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
> AuthenticationManager._checkUserPassword2( > AuthenticationManager._checkUserPassword2(
> // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<< > // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
153a172,451 190a209,488
> >
> // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> > // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
> /** > /**

5
ldap-overleaf-sl/sharelatex_diff/settings.pug.diff
View File

@ -18,7 +18,7 @@
> .page-header > .page-header
> h1 #{translate("account_settings")} > h1 #{translate("account_settings")}
> .account-settings(ng-controller="AccountSettingsController", ng-cloak) > .account-settings(ng-controller="AccountSettingsController", ng-cloak)
6,28c16,17 6,29c16,17
< block append meta < block append meta
< meta(name="ol-hasPassword" data-type="boolean" content=hasPassword) < meta(name="ol-hasPassword" data-type="boolean" content=hasPassword)
< meta(name="ol-shouldAllowEditingDetails" data-type="boolean" content=shouldAllowEditingDetails) < meta(name="ol-shouldAllowEditingDetails" data-type="boolean" content=shouldAllowEditingDetails)
@ -39,13 +39,14 @@
< meta(name="ol-github" data-type="json" content=github) < meta(name="ol-github" data-type="json" content=github)
< meta(name="ol-projectSyncSuccessMessage", content=projectSyncSuccessMessage) < meta(name="ol-projectSyncSuccessMessage", content=projectSyncSuccessMessage)
< meta(name="ol-showPersonalAccessToken", data-type="boolean" content=showPersonalAccessToken) < meta(name="ol-showPersonalAccessToken", data-type="boolean" content=showPersonalAccessToken)
< meta(name="ol-optionalPersonalAccessToken", data-type="boolean" content=optionalPersonalAccessToken)
< meta(name="ol-personalAccessTokens", data-type="json" content=personalAccessTokens) < meta(name="ol-personalAccessTokens", data-type="json" content=personalAccessTokens)
< meta(name="ol-emailAddressLimit", data-type="json", content=emailAddressLimit) < meta(name="ol-emailAddressLimit", data-type="json", content=emailAddressLimit)
< meta(name="ol-currentManagedUserAdminEmail" data-type="string" content=currentManagedUserAdminEmail) < meta(name="ol-currentManagedUserAdminEmail" data-type="string" content=currentManagedUserAdminEmail)
--- ---
> >
> >
30,31c19,178 31,32c19,178
< block content < block content
< main.content.content-alt#settings-page-root < main.content.content-alt#settings-page-root
--- ---