Bump diffs to Sharelatex 4.2.0

This commit is contained in:
Alex Fuchs 2024-01-05 14:08:11 +01:00
parent 83e5158aba
commit 86069cadca
3 changed files with 5 additions and 8 deletions

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).

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) {

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
> >
> // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> > // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
> /** > /**