Skip to content

Commit

Permalink
build: get rid of webpack for server
Browse files Browse the repository at this point in the history
  • Loading branch information
Tanguy Antoine committed Apr 10, 2020
1 parent 1cc36cc commit 99fa238
Show file tree
Hide file tree
Showing 6 changed files with 82 additions and 232 deletions.
114 changes: 4 additions & 110 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,113 +1,7 @@
# ApiRouter
# Pizzly

| Scope | Stage | Package | URL |
| ----------- | ------------ | ---------------------------------- | ----------------------------------------------- |
| API | `dev` | `api-router-dev-ApiService` | `https://int.dev.bearer.sh/api/v1/{proxy+}` |
| HTML | `dev` | `api-router-dev-ApiService` | `https://int.dev.bearer.sh/v1/{proxy+}` |
| API | `staging` | `api-router-staging-ApiService` | `https://int.staging.bearer.sh/api/v1/{proxy+}` |
| HTML | `staging` | `api-router-staging-ApiService` | `https://int.staging.bearer.sh/v1/{proxy+}` |
| API | `production` | `api-router-production-ApiService` | `https://int.bearer.sh/api/v1/{proxy+}` |
| HTML | `production` | `api-router-production-ApiService` | `https://int.bearer.sh/v1/{proxy+}` |
| BACKEND_API | `production` | `api-router-production-ApiService` | `https://int.bearer.sh/backend/api/v1/{proxy+}` |
| WEBHOOK_API | `production` | `api-router-production-ApiService` | `https://int.bearer.sh/webhook/v1/{proxy+}` |
Deploy it to Heroku and test it.

## Endpoints
[![Deploy to Heroku](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/Bearer/Pizzly)

| Scope | endpoint | implemented :white_check_mark: / :x: |
| ----------- | ---------------------------------- | :----------------------------------: |
| HTML | `/user/initialize` | :white_check_mark: |
| HTML | `/auth/:integration_uuid` | :white_check_mark: |
| HTML | `/auth/:integration_uuid/callback` | :white_check_mark: |
| HTML | `/auth/:service/callback` | :white_check_mark: |
| HTML | `/account/:integration_uuid` | :white_check_mark: |
| API | `/signup` | :white_check_mark: |
| API | `/login` | :white_check_mark: |
| API | `/refresh_token` | :white_check_mark: |
| API | `/items/:reference_id` | :white_check_mark: |
| API | DELETE `/items/:reference_id` | :white_check_mark: |
| API | POST `/items` | :white_check_mark: |
| API | PUT `/items/:reference_id` | :white_check_mark: |
| API | `/:integration_uuid/:action_id` | :white_check_mark: |
| API | `/:integration_uuid/:action_id` | :white_check_mark: |
| BACKEND_API | `/:integration_uuid/:action_id` | :white_check_mark: |
| WEBHOOK_API | `/config` | :white_check_mark: |
| WEBHOOK_API | `/t/:uuid` | :white_check_mark: |

### `/user/initialize`

Get access to the iframe. This will also check the cookie and generate a `uuid` if this one doesn't exist.

### `/auth/:integration_uuid`

When the user hits this endpoint, we will go through the OAuth dance to get the user a token.
We will pass a signed cookie so that it will be possible from the callback URL to attached the `integration_uuid`, the `user_id` and the `token`

### `/auth/:integration_uuid/callback`

**To Be Deprecated**

Once the user has successfully authorized the application, the user will be redirected to this callback URL.
It will store the `integration_uuid`, the `token` and the `user_id`.

### `/auth/:service/callback`

Once the user has successfully authorized the application, the user will be redirected to this callback URL.
It will store the `integration_uuid`, the `token` and the `user_id`.

### `/account/:integration_uuid`

Once the user has been authenticated, it will be redirected to this URL, which will basically return a `200`.

### `/:integration_uuid/:action_id`

Pass an `integration_uuid` along with an `action_id` (which is an intent defined within the package), to get it executed using the user's token.

## How to test?

We use jest to test the integration service pieces

```
$ # setup env variables correctly
$ cp .envrc{.example,}
$ # start a local dynamodb server (listening on 8000)
$ docker-compose up -d
$ yarn test
```

## How to deploy?

This repository uses `drone.io` as CI//CD. If you would like to try your code/branch on staging before mergin to master, you can do it by pushing on the `staging` branch.

## Running Locally

1. Use ssh tuneling to connect to staging dashboard-api

```
docker-compose up -d # To start the redis cluster
$ yarn start:staging
Killing the http tunnel to the dashboard
Import secrets from secret manager from arn:aws:secretsmanager:eu-west-1:794568872834:secret:local/is-Yn35MQ
It seems that the following modules have been required before Sqreen:
- /Users/tarikihadjadene/projects/bearer/integration-service/node_modules/newrelic/index.js
Sqreen may not be able to protect the whole application.
If you think this is an error, please report it to Sqreen team.
Read more on https://doc.sqreen.io/docs/nodejs-agent-installation
[bugsnag] Loaded!
express-session deprecated undefined resave option; provide resave option src/auth/v3/session.ts:18:37
express-session deprecated undefined saveUninitialized option; provide saveUninitialized option src/auth/v3/session.ts:18:37
Integration service app listening on port 8002
```

2. Call proxy endpoint

To call the proxy endpoint you will need to set the Host header to `proxy.staging.bearer.sh`

Example :

```
curl -X GET \
-H 'Authorization: sk_product`on_OC6LEXmykI7zg4k0r9xQfBR_ZszfTYMF' \
-H "Host: proxy.staging.bearer.sh" \
-H 'Bearer-Auth-Id: 0da61ec0-e4f2-11e9-9297-7bb04faac2f4' \
"http://localhost:8002/github/user/repos"
```
Once deployed, go to the heroku application and perform an API call.
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"scripts": {
"test": "jest",
"build": "rimraf dist/ && yarn build:server && yarn build:views",
"build:server": "yarn webpack --config webpack.config.js",
"build:views": "rimraf dist/views && yarn webpack --config webpack.views.config.js",
"build:server": "yarn tsc -p tsconfig.build.json",
"build:views": "rimraf dist/views && yarn webpack --config webpack.config.js",
"start": "node dist",
"dev": "concurrently --names 'server,views' 'yarn build:server --watch' 'yarn build:views --watch'",
"lint:server": "yarn tsc --noEmit"
Expand Down
0 src/server.ts → src/index.ts
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion tsconfig.build.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"noUnusedLocals": true,
"strictNullChecks": true,
"skipLibCheck": true,
"outDir": "dist/app"
"outDir": "dist"
},
"include": ["src/"],
"exclude": ["**/*.test.*"]
Expand Down
115 changes: 75 additions & 40 deletions webpack.config.js
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,79 @@
const path = require('path')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const HtmlWebpackInlineSourcePlugin = require('html-webpack-inline-source-plugin')

module.exports = {
entry: { index: './src/server.ts' },
target: 'node',
mode: 'production',
optimization: {
// We no not want to minimize our code.
minimize: false
},
performance: {
// Turn off size warnings for entry point
hints: 'warning'
},
resolve: {
extensions: ['.js', '.json', '.ts', '.tsx']
},
devtool: 'nosources-source-map',
output: {
libraryTarget: 'commonjs2',
path: path.join(__dirname, 'dist'),
filename: '[name].js',
sourceMapFilename: '[file].map'
},
module: {
rules: [
{
test: /\.ts(x?)$/,
use: [
{
loader: 'ts-loader',
options: {
configFile: 'tsconfig.build.json'
}
const resolve = { extensions: ['.ts', '.tsx', '.js'] }
const moduleConf = {
rules: [
{
test: /\.html$/,
loader: 'html-loader'
},
{
test: /\.ts(x?)$/,
use: [
{
loader: 'ts-loader',
options: {
configFile: 'tsconfig.views.build.json'
}
],
exclude: /node_modules/
}
]
}
],
exclude: /node_modules/
}
]
}

module.exports = [
{
resolve: resolve,
entry: { 'callback-script': './views/callback-script.ts' },
output: { path: __dirname + '/dist/views' },
plugins: [
new HtmlWebpackPlugin({
filename: 'callback.html',
template: './views/callback.html',
inlineSource: '.js$'
}),
new HtmlWebpackInlineSourcePlugin()
],
module: moduleConf
},
externals: {
'simple-oauth2': true
{
resolve: resolve,
entry: { 'iframe-script': './views/iframe-script.ts' },
output: { path: __dirname + '/dist/views' },
plugins: [
new HtmlWebpackPlugin({
filename: 'iframe.html',
template: './views/iframe.html',
inlineSource: '.js$'
}),
new HtmlWebpackInlineSourcePlugin()
],
module: moduleConf
},
{
entry: { 'error-script': './views/error-script.ts' },
output: { path: __dirname + '/dist/views' },
plugins: [
new HtmlWebpackPlugin({
template: './views/page-not-found-error.html',
filename: 'page-not-found-error.html',
inlineSource: '.js$'
}),
new HtmlWebpackPlugin({
template: './views/callback-url-request-error.html',
filename: 'callback-url-request-error.html',
inlineSource: '.js$'
}),
new HtmlWebpackPlugin({
template: './views/oauth-error.html',
filename: 'oauth-error.html',
inlineSource: '.js$'
}),
new HtmlWebpackInlineSourcePlugin()
],
resolve: resolve,
module: moduleConf
}
}
]
79 changes: 0 additions & 79 deletions webpack.views.config.js
View file

This file was deleted.

0 comments on commit 99fa238

Please sign in to comment.