Commit Graph

3020 Commits

Author SHA1 Message Date
Hayden Faulds 60ee78704a return url from FileStoreHandler.copyFile 2017-12-04 09:42:09 +00:00
Hayden Faulds 4ec0d07aae remove unused ProjectEntityHandler.copyFileFromExistingProject 2017-12-04 09:42:09 +00:00
Hayden Faulds 90e3b71c1c version replacing files 2017-12-04 09:42:09 +00:00
Hayden Faulds 980e43e478 pass user_id into EditorController.addDoc 2017-12-04 09:42:09 +00:00
Hayden Faulds e4ca3bc5ad pass user_id into EditorController.addDocWithoutLock 2017-12-04 09:42:09 +00:00
Hayden Faulds 7d63939f79 pass owner_id to ProjectEntityHandler.addDoc from ProjectDuplicator 2017-12-04 09:42:09 +00:00
Hayden Faulds 300f76bc5c pass user_id into ProjectEntityHandler.addDoc / addDocWithProject 2017-12-04 09:42:09 +00:00
Hayden Faulds bfd22899a0 fix DocumentUpdaterHandler.updateProjectStructure 2017-12-04 09:42:09 +00:00
Hayden Faulds ef68c6a531 avoid N+1 lookups in DocumentUpdaterHandler 2017-12-04 09:42:09 +00:00
Hayden Faulds 953dba0ede pass userId into Editorcontroller.addFile / addFileWithoutLock 2017-12-04 09:42:09 +00:00
Hayden Faulds 42a1deaaca pass userId into ProjectEntityHandler.addFile 2017-12-04 09:42:09 +00:00
Hayden Faulds c1481d596f call DocumentUpdaterHandle.updateProjectStructure from ProjectEntityHandler.addDoc and addFile
pass in user_id as null
2017-12-04 09:42:09 +00:00
Hayden Faulds 6e84c635cf return url from FileStoreHandler.uploadFileFromDisk 2017-12-04 09:42:09 +00:00
Hayden Faulds 0178f78249 handle file additions in DocumentUpdaterHandler.updateProjectStructure 2017-12-04 09:42:09 +00:00
Hayden Faulds 28bcf83d87 better error when project creation fails 2017-12-04 09:25:22 +00:00
Hayden Faulds eacb19fac9 create user in db and use login endpoint instead of register 2017-12-04 09:25:22 +00:00
Hayden Faulds 938d22da3f get csrf token from /dev/csrf not /register 2017-12-04 09:25:22 +00:00
James Allen 488e6d7c5d Merge pull request #158 from sharelatex/ja-dockerise-tests
Dockerize unit and acceptance tests using docker-compose
2017-11-30 10:09:07 +00:00
Shane Kilkelly c203a8d80a Merge branch 'sk-use-recurly-hosted-details-page' 2017-11-29 09:45:54 +00:00
Nate Stemen 2a50a18d23 Merge branch 'ns-package-aware-autocomplete' 2017-11-28 10:24:37 -05:00
Shane Kilkelly cc9986cefd Remove the obsolete update-billing-details page 2017-11-28 11:52:14 +00:00
Shane Kilkelly 22c163c60a Move the recurly-billing-details link up to main subscription page 2017-11-28 11:40:48 +00:00
James Allen 3e90103d9c No need to bind to 0.0.0.0 when running in same container 2017-11-27 17:10:58 +00:00
James Allen fbf8cc2d03 Run acceptance tests via docker compose 2017-11-27 17:10:58 +00:00
James Allen 62de9d8946 Move test/UnitTests -> unit/test 2017-11-27 17:10:22 +00:00
Shane Kilkelly caa65dddc1 Send user to hosted recurly billing-details page.
And remove our update-billing-details form, the APIs for which will be
deprecated soon.
2017-11-23 16:16:13 +00:00
Brian Gough 2c3ee253e1 fix unit tests 2017-11-23 15:47:11 +00:00
Brian Gough bb2d1321d4 Merge pull request #91 from sharelatex/bg-add-project-history-flag
route history requests based on project
2017-11-23 15:36:45 +00:00
Hayden Faulds e54e2c8328 fix acceptance tests 2017-11-23 10:39:30 +00:00
Alasdair Smith e1fa196de5 Merge pull request #153 from sharelatex/as-remove-old-onboarding
Remove unused onboarding
2017-11-23 10:28:50 +00:00
Alasdair Smith 8f32f0d65f Remove old unused track changes onboarding 2017-11-22 14:48:22 +00:00
James Allen d3f146499c Merge pull request #135 from sharelatex/ja-disable-account-settings-for-ol-v2
Enable the external auth switches when OL OAuth is in use
2017-11-22 11:44:10 +00:00
Henry Oswald b7dca80294 use /dev/csrf for smoke tests 2017-11-21 12:17:53 +00:00
Henry Oswald 7187f5ed67 use /login for smoke tests not register
1) A user needs an OL access token to load the beta - https://github.com/sharelatex/overleaf-integration-web-module/blob/5001dc48f15ca557bab8689f50b6ac28f30db66a/app/coffee/OAuth/OAuthRequest.coffee#L8

2) If a user has an OL access token they can not use the register endpoint on ShareLaTeX.  https://github.com/sharelatex/web-sharelatex-modules/blob/master/public-registration/app/coffee/PublicRegistrationController.coffee#L72
2017-11-21 10:43:24 +00:00
Alasdair Smith 24ceaffd3a Rename hook for clarity 2017-11-20 11:23:02 +00:00
Alasdair Smith 119be26989 Remove unnecessary project getter
Had bad assumption about whether ol-integration module would be available in
filesystem, now replaced with Module hook
2017-11-20 11:23:02 +00:00
Alasdair Smith 621977c47c Replace call to V1ProjectGetter with Module hook 2017-11-20 11:23:02 +00:00
Alasdair Smith 3eaf6c5d8e Stub V1 project getter 2017-11-20 11:23:02 +00:00
Alasdair Smith 47942816ae Include token based 2017-11-20 11:23:02 +00:00
Alasdair Smith 6822a0d838 Add assertions for integration module call 2017-11-20 11:23:02 +00:00
Alasdair Smith e32406a4c4 Dynamically monkey patch impl to check integration once instead of each request 2017-11-20 11:23:02 +00:00
Alasdair Smith 56634bdb49 Add assertions for tag properties 2017-11-20 11:23:02 +00:00
Alasdair Smith 9a96f070d5 Add assertions for correctly mapping V1 properties 2017-11-20 11:23:02 +00:00
Alasdair Smith 24166af90e Add tests for V1ProjectGetter 2017-11-20 11:23:02 +00:00
Alasdair Smith fff6873e10 Add tests for getting V1 projects 2017-11-20 11:23:02 +00:00
James Allen 311ebf89c4 Refactor to always use req.externalAuthenticationSystemUsed 2017-11-20 10:10:23 +00:00
Shane Kilkelly 5df4556e9c Set redirect when bouncing away from token route
This ensures that when the user logs in they will be redirected back
to this token, the page they wanted to access in the first place.
2017-11-15 13:30:40 +00:00
Shane Kilkelly a0c7295b36 Merge branch 'master' of github.com:sharelatex/web-sharelatex-internal 2017-11-13 10:45:29 +00:00
Shane Kilkelly cac39134cd Remove stray test lines 2017-11-10 16:20:59 +00:00
Shane Kilkelly 600191b2af Ensure that different features produce different results 2017-11-10 16:19:43 +00:00