Merge pull request NangoHQ#40 from Bearer/fix/make-proxy-request-work…

…-correctly

Fix/make proxy request work correctly

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
     "editor.formatOnSave": true,
     "javascript.format.enable": false,
+    "typescript.tsdk": "node_modules/typescript/lib",
 }

config/config.test.json

@@ -0,0 +1 @@
+{}

docker-compose.yml

@@ -0,0 +1,4 @@
+version: '3'
+services:
+  database:
+    image: postgres

package.json

@@ -10,6 +10,9 @@
     "prepare": "npm run build",
     "build": "rimraf dist/ && tsc -p tsconfig.json",
     "start": "node dist/src",
+    "dev": "concurrently 'yarn dev:build' 'yarn dev:serve' ",
+    "dev:build": "yarn build --watch",
+    "dev:serve": "nodemon --delay 1 --watch dist/src node dist/src",
     "db:setup": "npm run db:create && npm run db:migrate",
     "db:create": "node dist/src/lib/database/config/create",
     "db:migrate": "knex --cwd dist/src/lib/database/config migrate:latest",
@@ -30,6 +33,7 @@
     "ejs": "^3.0.2",
     "express": "^4.16.3",
     "express-session": "^1.15.6",
+    "express-winston": "^4.0.3",
     "js-cookie": "^2.2.0",
     "jsonwebtoken": "^8.5.1",
     "knex": "^0.21.1",
@@ -42,7 +46,8 @@
     "passport-oauth1": "^1.1.0",
     "pg": "^8.0.3",
     "simple-oauth2": "^3.0.0",
-    "uuid": "^7.0.3"
+    "uuid": "^7.0.3",
+    "winston": "^3.2.1"
   },
   "devDependencies": {
     "@commitlint/cli": "^7.2.1",
@@ -65,7 +70,7 @@
     "@types/wreck": "^14.0.0",
     "babel-loader": "^8.0.5",
     "commitlint": "^7.2.1",
-    "concurrently": "^5.1.0",
+    "concurrently": "^5.2.0",
     "cz-conventional-changelog": "^2.1.0",
     "file-loader": "^3.0.1",
     "html-loader": "^1.1.0",
@@ -83,7 +88,7 @@
     "ts-jest": "^23.10.5",
     "ts-loader": "^5.3.3",
     "ts-node": "^8.10.1",
-    "typescript": "^3.2.2"
+    "typescript": "^3.9.3"
   },
   "jest": {
     "collectCoverageFrom": [
@@ -97,7 +102,7 @@
         "transform": {
           "^.+\\.tsx?$": "ts-jest"
         },
-        "testRegex": "(.*/views/.*)((test|spec))\\.(jsx?|tsx?)$",
+        "testRegex": "(.*/clients/.*)((test|spec))\\.(jsx?|tsx?)$",
         "moduleFileExtensions": [
           "ts",
           "tsx",
@@ -123,13 +128,14 @@
         "transform": {
           "^.+\\.tsx?$": "ts-jest"
         },
-        "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
+        "testRegex": "(.*/src/lib/.*)(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
         "modulePathIgnorePatterns": [
           "<rootDir>/dist/"
         ],
         "testPathIgnorePatterns": [
           "/node_modules/",
-          "/views/"
+          "/views/",
+          "legacy"
         ],
         "moduleFileExtensions": [
           "ts",

src/clients/javascript/test/connect.test.ts

@@ -0,0 +1,76 @@
+import Pizzly from '../src/index'
+
+describe('Connect', () => {
+  beforeAll(() => {
+    window.addEventListener = jest.fn()
+    // @ts-ignore
+    window.open = jest.fn(() => {
+      return { closed: false }
+    })
+  })
+
+  const publishableKey = 'foo'
+  const integration = 'github'
+
+  function setup() {
+    return new Pizzly(publishableKey)
+  }
+
+  describe('connect', () => {
+    it('is a function', () => {
+      const pizzly = setup()
+
+      expect(pizzly.connect).toBeInstanceOf(Function)
+    })
+
+    it('accepts an integration argument', () => {
+      const pizzly = setup()
+
+      expect(pizzly.connect(integration)).toBeInstanceOf(Promise)
+    })
+
+    it('must have an integration argument', () => {
+      const pizzly = setup()
+      expect(() => {
+        // @ts-expect-error
+        return pizzly.connect()
+      }).toThrowError()
+    })
+
+    it('accepts an (optional) options argument', () => {
+      const pizzly = setup()
+
+      expect(pizzly.connect(integration, {})).toBeInstanceOf(Promise)
+    })
+  })
+
+  it('opens a popup (window modal)', () => {
+    const pizzly = setup()
+    expect.assertions(1)
+
+    pizzly.connect(integration).catch()
+
+    expect(window.open).toHaveBeenCalled()
+  })
+
+  // More tests to add on that:
+  // - it opens a popup with this URL
+  // - it opens a popup with this size
+  // - it opens a popup with this position
+
+  it('listens to message', () => {
+    const pizzly = setup()
+    expect.assertions(1)
+
+    pizzly.connect(integration).catch()
+
+    expect(window.addEventListener).toHaveBeenCalledWith('message', expect.any(Function), false)
+  })
+
+  describe('Return values', () => {
+    // More test to add here:
+    // it returns a promise
+    // it returns an object on promise.resolve
+    // it returns an error on promise.reject
+  })
+})

src/clients/javascript/test/initialization.test.js → src/clients/javascript/test/initialization.test.ts

@@ -1,4 +1,4 @@
-const Pizzly = require('../dist/index.umd.js')
+import Pizzly from '../src/index'
 
 describe('Pizzly class', () => {
   const publishableKey = 'foo'
@@ -13,6 +13,7 @@ describe('Pizzly class', () => {
 
     it('accepts no arguments', () => {
       expect(() => {
+        // @ts-expect-error
         new Pizzly()
       }).not.toThrowError()
     })
@@ -31,6 +32,7 @@ describe('Pizzly class', () => {
 
     it('accepts invalid options', () => {
       expect(() => {
+        // @ts-expect-error
         new Pizzly(publishableKey, invalidOptions)
       }).toBeInstanceOf(Function)
     })

src/index.ts

@@ -1,5 +1,7 @@
 import express from 'express'
+
 import * as routes from './routes'
+import { requestLogger, errorLogger } from './lib/utils/logger'
 
 export const BUID = 'bearerUid' // TODO - What is this for?
 export const PORT = process.env.PORT || 8080
@@ -12,13 +14,9 @@ app.set('trust proxy', 1)
 app.use('/assets', express.static('./views/assets'))
 
 /**
- * Logging request
+ * Request log
  */
-
-app.use((req, res, next) => {
-  console.log(new Date().toISOString(), req.method, req.originalUrl)
-  next()
-})
+app.use(requestLogger)
 
 /**
  * Project homepage
@@ -67,6 +65,7 @@ app.use('/api/v4/functions', routes.legacy.proxy)
  * Error handling
  */
 
+app.use(errorLogger)
 app.use((req, res, next) => {
   res.status(404).render('404')
 })