diff options
| author | bob <bcz@cs.brown.edu> | 2019-08-27 14:32:56 -0400 |
|---|---|---|
| committer | bob <bcz@cs.brown.edu> | 2019-08-27 14:32:56 -0400 |
| commit | 0341f6bb0d23e32ba2cb632fec3bf365ccd10047 (patch) | |
| tree | 889731a2f9b6502fdf952d2cab5d77b6b0c149f2 /src/server/index.ts | |
| parent | 8b210d872e3a9c540825be0e9fbb912514092def (diff) | |
| parent | 32f066ebc70684fe410b89fcb87cf550bd3537e3 (diff) | |
Merge branch 'master' into bullets
Diffstat (limited to 'src/server/index.ts')
| -rw-r--r-- | src/server/index.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/index.ts b/src/server/index.ts index 34a0a19f1..fca90a585 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -116,7 +116,7 @@ function addSecureRoute(method: Method, ) { let abstracted = (req: express.Request, res: express.Response) => { if (req.user) { - handler(req.user, res, req); + handler(req.user as any, res, req); } else { req.session!.target = req.originalUrl; onRejection(res, req); @@ -447,7 +447,7 @@ function LoadPage(file: string, pageNumber: number, res: Response) { console.log(pageNumber); pdf.getPage(pageNumber).then((page: Pdfjs.PDFPageProxy) => { console.log("reading " + page); - let viewport = page.getViewport(1); + let viewport = page.getViewport({ scale: 1 }); let canvasAndContext = factory.create(viewport.width, viewport.height); let renderContext = { canvasContext: canvasAndContext.context, @@ -811,8 +811,8 @@ const EndpointHandlerMap = new Map<GoogleApiServerUtils.Action, GoogleApiServerU ]); app.post(RouteStore.googleDocs + "/:sector/:action", (req, res) => { - let sector = req.params.sector; - let action = req.params.action; + let sector: any = req.params.sector; + let action: any = req.params.action; GoogleApiServerUtils.GetEndpoint(GoogleApiServerUtils.Service[sector], { credentials, token }).then(endpoint => { let handler = EndpointHandlerMap.get(action); if (endpoint && handler) { |