diff --git a/README.md b/README.md index 0387448..197cef1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This repo contains an improved, free ldap authentication and authorisation 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 [worksasintended](https://github.com/worksasintended). diff --git a/ldap-overleaf-sl/Dockerfile b/ldap-overleaf-sl/Dockerfile index b09877d..fd26bc1 100644 --- a/ldap-overleaf-sl/Dockerfile +++ b/ldap-overleaf-sl/Dockerfile @@ -1,4 +1,4 @@ -FROM sharelatex/sharelatex:4.1.1 +FROM sharelatex/sharelatex:4.2.0 # FROM sharelatex/sharelatex:latest # latest might not be tested # e.g. the AuthenticationManager.js script had to be adapted after versions 2.3.1 diff --git a/ldap-overleaf-sl/sharelatex_diff/AuthenticationController.js.diff b/ldap-overleaf-sl/sharelatex_diff/AuthenticationController.js.diff index 3f65fb1..5705a43 100644 --- a/ldap-overleaf-sl/sharelatex_diff/AuthenticationController.js.diff +++ b/ldap-overleaf-sl/sharelatex_diff/AuthenticationController.js.diff @@ -1,7 +1,4 @@ -68a69,70 -> alphaProgram: user.alphaProgram || undefined, // only store if set -> betaProgram: user.betaProgram || undefined, // only store if set -265a268,364 +268a268,364 > > // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> > oauth2Redirect(req, res, next) { diff --git a/ldap-overleaf-sl/sharelatex_diff/AuthenticationManager.js.diff b/ldap-overleaf-sl/sharelatex_diff/AuthenticationManager.js.diff index 1e22606..f732928 100644 --- a/ldap-overleaf-sl/sharelatex_diff/AuthenticationManager.js.diff +++ b/ldap-overleaf-sl/sharelatex_diff/AuthenticationManager.js.diff @@ -5,7 +5,7 @@ > const ldapEscape = require("ldap-escape") > // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<< > -84a91,100 +120a127,136 > // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> > _checkUserPassword2(query, password, callback) { > // leave original _checkUserPassword untouched, because it will be called by @@ -16,13 +16,13 @@ > }, > // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<< > -90c106,108 +126c142,144 < AuthenticationManager._checkUserPassword( --- > // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> > AuthenticationManager._checkUserPassword2( > // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -153a172,451 +190a209,488 > > // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> > /** diff --git a/ldap-overleaf-sl/sharelatex_diff/settings.pug.diff b/ldap-overleaf-sl/sharelatex_diff/settings.pug.diff index 667f77f..eedb873 100644 --- a/ldap-overleaf-sl/sharelatex_diff/settings.pug.diff +++ b/ldap-overleaf-sl/sharelatex_diff/settings.pug.diff @@ -18,7 +18,7 @@ > .page-header > h1 #{translate("account_settings")} > .account-settings(ng-controller="AccountSettingsController", ng-cloak) -6,28c16,17 +6,29c16,17 < block append meta < meta(name="ol-hasPassword" data-type="boolean" content=hasPassword) < 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-projectSyncSuccessMessage", content=projectSyncSuccessMessage) < 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-emailAddressLimit", data-type="json", content=emailAddressLimit) < meta(name="ol-currentManagedUserAdminEmail" data-type="string" content=currentManagedUserAdminEmail) --- > > -30,31c19,178 +31,32c19,178 < block content < main.content.content-alt#settings-page-root ---