Skip to content

Commit

Permalink
typescript frontend
Browse files Browse the repository at this point in the history
  • Loading branch information
vzakharchenko committed Jul 18, 2021
1 parent 3a97b48 commit f954997
Show file tree
Hide file tree
Showing 27 changed files with 694 additions and 352 deletions.
3 changes: 3 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ jobs:
- run:
name: test
command: npm run test
- run:
name: build
command: npm run build
- run:
name: publish coveralls
command: node ./node_modules/coveralls/bin/coveralls.js < .coverage/lcov.info
Expand Down
33 changes: 17 additions & 16 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,22 @@ jobs:
- run: npm i
- run: npm run lint
- run: npm run test
- run: cd examples/keycloak-authorizer/serverless && npm i
- run: cd examples/keycloak-authorizer/serverless && npm run lint
- run: cd examples/keycloak-authorizer/serverless-jwks && npm i
- run: cd examples/keycloak-authorizer/serverless-jwks && npm run lint
- run: cd examples/keycloak-authorizer/ui && npm i
- run: cd examples/keycloak-authorizer/ui && npm run lint
- run: cd examples/chain-service-calls/frontend && npm i && npm run lint
- run: cd examples/chain-service-calls/service1 && npm i && npm run lint
- run: cd examples/chain-service-calls/service2 && npm i && npm run lint
- run: cd examples/chain-service-calls/service3 && npm i && npm run lint
- run: cd examples/express/frontend && npm i && npm run lint
- run: cd examples/express/express-service && npm i && npm run lint
- run: cd examples/express-scopes/frontend && npm i && npm run lint
- run: cd examples/express-scopes/express-service && npm i && npm run lint
- run: cd examples/userToAdminAPI/frontend && npm i && npm run lint
- run: cd examples/userToAdminAPI/express-service && npm i && npm run lint
- run: npm run build
- run: cd examples/keycloak-authorizer/serverless && npm i && npm run build
- run: cd examples/keycloak-authorizer/serverless && npm run lint && npm run build
- run: cd examples/keycloak-authorizer/serverless-jwks && npm i && npm run build
- run: cd examples/keycloak-authorizer/serverless-jwks && npm run lint && npm run build
- run: cd examples/keycloak-authorizer/ui && npm i && npm run build
- run: cd examples/keycloak-authorizer/ui && npm run lint && npm run build
- run: cd examples/chain-service-calls/frontend && npm i && npm run lint && npm run build
- run: cd examples/chain-service-calls/service1 && npm i && npm run lint && npm run build
- run: cd examples/chain-service-calls/service2 && npm i && npm run lint && npm run build
- run: cd examples/chain-service-calls/service3 && npm i && npm run lint && npm run build
- run: cd examples/express/frontend && npm i && npm run lint && npm run build
- run: cd examples/express/express-service && npm i && npm run lint && npm run build
- run: cd examples/express-scopes/frontend && npm i && npm run lint && npm run build
- run: cd examples/express-scopes/express-service && npm i && npm run lint && npm run build
- run: cd examples/userToAdminAPI/frontend && npm i && npm run lint && npm run build
- run: cd examples/userToAdminAPI/express-service && npm i && npm run lint && npm run build


Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
const jsonwebtoken = require('jsonwebtoken');
const express = require('express');
const exphbs = require('express-handlebars');
const Keycloak = require('keycloak-connect');
const path = require('path');
const bodyParser = require('body-parser');
const session = require('express-session');
const { fetchData, sendData } = require('./restCalls');
import path from 'path';

import jsonwebtoken from 'jsonwebtoken';
import express from 'express';
import exphbs from 'express-handlebars';
import Keycloak from 'keycloak-connect';
import bodyParser from 'body-parser';
import session from 'express-session';

import {fetchData} from './restCalls';

const app = express();
const memoryStore = new session.MemoryStore();
Expand Down Expand Up @@ -33,7 +35,7 @@ const keycloak = new Keycloak({

app.use(keycloak.middleware());

app.use(bodyParser.urlencoded({ extended: true }));
app.use(bodyParser.urlencoded({extended: true}));

app.engine('.hbs', exphbs({
defaultLayout: 'main',
Expand All @@ -45,7 +47,7 @@ app.set('view engine', '.hbs');

app.set('views', path.join(__dirname, 'views'));

function renderUI(request, response, data) {
function renderUI(request:any, response:any, data:any) {
response.render('home', {
host1: process.env.SERVICE1_URL,
host2: process.env.SERVICE2_URL,
Expand All @@ -54,7 +56,7 @@ function renderUI(request, response, data) {
});
}

app.post('/service1api1', keycloak.protect(), async (request, response) => {
app.post('/service1api1', keycloak.protect(), async (request:any, response) => {
const lambdaJWT = JSON.parse(request.session['keycloak-token']);
try {
const res = await fetchData(`${process.env.SERVICE1_URL}service1api1?message=frontend`, 'GET', {
Expand All @@ -75,7 +77,7 @@ app.post('/service1api1', keycloak.protect(), async (request, response) => {
}
});

app.post('/service1api2', keycloak.protect(), async (request, response) => {
app.post('/service1api2', keycloak.protect(), async (request:any, response) => {
const lambdaJWT = JSON.parse(request.session['keycloak-token']);
try {
const res = await fetchData(`${process.env.SERVICE1_URL}service1api2?message=frontend`, 'GET', {
Expand All @@ -96,7 +98,7 @@ app.post('/service1api2', keycloak.protect(), async (request, response) => {
}
});

app.post('/service2api', keycloak.protect(), async (request, response) => {
app.post('/service2api', keycloak.protect(), async (request:any, response) => {
const lambdaJWT = JSON.parse(request.session['keycloak-token']);
try {
const res = await fetchData(`${process.env.SERVICE2_URL}service2Api?message=frontend`, 'GET', {
Expand All @@ -117,7 +119,7 @@ app.post('/service2api', keycloak.protect(), async (request, response) => {
}
});

app.post('/service3api', keycloak.protect(), async (request, response) => {
app.post('/service3api', keycloak.protect(), async (request:any, response) => {
const lambdaJWT = JSON.parse(request.session['keycloak-token']);
try {
const res = await fetchData(`${process.env.SERVICE3_URL}service3Api?message=frontend`, 'GET', {
Expand All @@ -139,11 +141,14 @@ app.post('/service3api', keycloak.protect(), async (request, response) => {
});

app.get('/', keycloak.protect(), (request, response) => {
renderUI(request, response, '', '');
renderUI(request, response, '');
});

const server = app.listen(3001, () => {
const host = 'localhost';
const { port } = server.address();
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
const {port} = server.address();
// eslint-disable-next-line no-console
console.log('Example app listening at http://%s:%s', host, port);
});
9 changes: 7 additions & 2 deletions examples/chain-service-calls/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,18 @@
"main": "index.js",
"scripts": {
"start": "SERVICE1_URL=http://localhost:3002/ SERVICE2_URL=http://localhost:3003/dev/ SERVICE3_URL=http://localhost:3004/dev/ node index.js",
"lint": "eslint --quiet --ext .js index.js",
"lint:fix": "eslint --fix --quiet --ext .js index.js",
"build": "tsc",
"prestart": "npm run build",
"lint": "eslint --quiet --ext .ts index.ts",
"lint:fix": "eslint --fix --quiet --ext .ts index.ts ",
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "vzakharchenko",
"license": "Apache-2.0",
"devDependencies": {
"@types/express-handlebars": "*",
"@types/express-session": "*",
"typescript": "*",
"eslint": "*",
"eslint-config-airbnb": "*",
"eslint-plugin-import": "*"
Expand Down
49 changes: 0 additions & 49 deletions examples/chain-service-calls/frontend/restCalls.js

This file was deleted.

28 changes: 28 additions & 0 deletions examples/chain-service-calls/frontend/restCalls.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import fetch, { Method } from 'axios';

fetch.interceptors.response.use((response) => response, (error) => error);

export async function fetchData(url:string, method:Method = 'GET', headers?:any) {
const ret = await fetch({
url,
method,
headers,
transformResponse: (req) => req,
withCredentials: true,
timeout: 29000,
});
return ret.data;
}

export async function sendData(url:string, method:Method = 'POST', data:string, headers?:any) {
const ret = await fetch({
url,
method,
data,
transformResponse: (req) => req,
headers,
withCredentials: true,
timeout: 29000,
});
return ret.data;
}
77 changes: 77 additions & 0 deletions examples/chain-service-calls/frontend/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
{
"compilerOptions": {
/* Visit https://aka.ms/tsconfig.json to read more about this file */
/* Basic Options */
// "incremental": true, /* Enable incremental compilation */
"target": "ES2015", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
// "lib": [], /* Specify library files to be included in the compilation. */
// "allowJs": true, /* Allow javascript files to be compiled. */
// "checkJs": true, /* Report errors in .js files. */
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
"declaration": false, /* Generates corresponding '.d.ts' file. */
"declarationMap": false, /* Generates a sourcemap for each corresponding '.d.ts' file. */
"sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
"outDir": "./", /* Redirect output structure to the directory. */
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
// "removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */

/* Strict Type-Checking Options */
"strict": true, /* Enable all strict type-checking options. */
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */

/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
// "noUnusedParameters": true, /* Report errors on unused parameters. */
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
// "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an 'override' modifier. */
// "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */

/* Module Resolution Options */
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
"types": ["node"], /* Type declaration files to be included in compilation. */
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */

/* Source Map Options */
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */

/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */

/* Advanced Options */
"skipLibCheck": true, /* Skip type checking of declaration files. */
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
},
"exclude": [
"examples/**",
"example/**",
"src",
"__tests__",
]
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
const jsonwebtoken = require('jsonwebtoken');
const express = require('express');
const exphbs = require('express-handlebars');
const Keycloak = require('keycloak-connect');
const path = require('path');
const bodyParser = require('body-parser');
const session = require('express-session');
const { fetchData, sendData } = require('./restCalls');
import path from 'path';

import jsonwebtoken from 'jsonwebtoken';
import express from 'express';
import exphbs from 'express-handlebars';
import Keycloak from 'keycloak-connect';
import bodyParser from 'body-parser';
import session from 'express-session';

import {fetchData} from './restCalls';

const app = express();
const memoryStore = new session.MemoryStore();
Expand All @@ -27,7 +29,7 @@ const keycloak = new Keycloak({

app.use(keycloak.middleware());

app.use(bodyParser.urlencoded({ extended: true }));
app.use(bodyParser.urlencoded({extended: true}));

app.engine('.hbs', exphbs({
defaultLayout: 'main',
Expand All @@ -39,14 +41,14 @@ app.set('view engine', '.hbs');

app.set('views', path.join(__dirname, 'views'));

function renderUI(request, response, data) {
function renderUI(request:any, response:any, data:any) {
response.render('home', {
host1: process.env.SERVICE_URL,
...data,
});
}

app.post('/express1', keycloak.protect(), async (request, response) => {
app.post('/express1', keycloak.protect(), async (request:any, response) => {
const lambdaJWT = JSON.parse(request.session['keycloak-token']);
try {
const res = await fetchData(`${process.env.SERVICE_URL}expressServiceApi1`, 'GET', {
Expand All @@ -67,7 +69,7 @@ app.post('/express1', keycloak.protect(), async (request, response) => {
}
});

app.post('/express2', keycloak.protect(), async (request, response) => {
app.post('/express2', keycloak.protect(), async (request:any, response) => {
const lambdaJWT = JSON.parse(request.session['keycloak-token']);
try {
const res = await fetchData(`${process.env.SERVICE_URL}expressServiceApi2`, 'GET', {
Expand All @@ -89,11 +91,14 @@ app.post('/express2', keycloak.protect(), async (request, response) => {
});

app.get('/', keycloak.protect(), (request, response) => {
renderUI(request, response, '', '');
renderUI(request, response, '');
});

const server = app.listen(3001, () => {
const host = 'localhost';
const { port } = server.address();
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
const {port} = server.address();
// eslint-disable-next-line no-console
console.log('Example app listening at http://%s:%s', host, port);
});
Loading

0 comments on commit f954997

Please sign in to comment.