Merge branch 'smhaller:master' into oauth-redirect

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).
@@ -19,7 +19,7 @@ Be careful if you try to migrate from 3.3.2! Backup your machines and data. The
     cd /overleaf/services/web
     node scripts/history/migrate_history.js --force-clean --fix-invalid-characters --convert-large-docs-to-file
     ```
-- run this sharelatex image (4.1.1)
+- run this sharelatex image (4.2.0)
 
 ## Limitations
 
@@ -85,6 +85,7 @@ LOGIN_TEXT=username
 COLLAB_TEXT=Direct share with collaborators is enabled only for activated users!
 ADMIN_IS_SYSADMIN=false
 ```
+
 *LOGIN_TEXT* : displayed instead of email-adress field (login.pug) <br/>
 *COLLAB_TEXT* : displayed for email invitation (share.pug)<br/>
 *ADMIN_IS_SYSADMIN* : false or true (if ``false`` isAdmin group is allowed to add users to sharelatex and post messages. if ``true`` isAdmin group is allowed to logout other users / set maintenance mode)
@@ -224,7 +225,7 @@ pip install docker-compose
 use the following commands:
 
 ```
-bash scripts/extract_files.sh 4.1.1
+bash scripts/extract_files.sh 4.2.0
 bash scripts/apply_diffs.sh
 make
 ```

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 

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

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

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