From 389ed66a0c307f060fff0607e3bd05a1a541f50e Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Thu, 11 Aug 2022 15:45:59 +0200
Subject: [PATCH] auth: port to shared demo config
---
packages/auth/assets/favicon.ico | Bin 1150 -> 0 bytes
packages/auth/assets/index.html | 12 ---------
packages/auth/assets/index.html.ejs | 34 ++++++++++++++++++++++++
packages/auth/rollup.config.js | 39 +++++++++++++++++++++++-----
packages/auth/src/dbp-auth-demo.js | 6 +----
5 files changed, 68 insertions(+), 23 deletions(-)
delete mode 100644 packages/auth/assets/favicon.ico
delete mode 100644 packages/auth/assets/index.html
create mode 100644 packages/auth/assets/index.html.ejs
diff --git a/packages/auth/assets/favicon.ico b/packages/auth/assets/favicon.ico
deleted file mode 100644
index a9ca0900db3b27416c42571720c23eecf0581f8b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1150
zcmb7^OHUI~7={ng#Dxn<Ox)_ypFn}q7J8%f25o6+3k?)nF0D{%3$(Q@)TZ362mw*U
z0v2dUB+&)Nm|#pyTo@N7u3Y#NT)Hqm&a~-*1PEmEo|*G~-}5AMG8rN2q^rJONb4Oj
zd{u~BLWsLkq>@yr)}@;eQt#&VYASna0nSWFJxIh5l}65<Ijc9^(#u%u0Hc}^aqGmT
z98tA{sK!G?<7Zqyz=R=0%9Xf~Bd)d*YqJy6I;FUY>HJKZg2X$*WPQnV9dWIJ`&tu|
zdJ74?jfBBL!ssDs@-bx@WZFJLX)t@LV@j)GMz1Ah(2+74$(YQf%{I~&2N_E@X}gcC
zGep)k%5tQ5!ZD+3LFO~<Dzc_F@@5@*tC3l22eWo7g)S!rr<*y4kD@osd~bxUc&XyZ
z7#flJv_Vb5tYprjrr4>GqGjG`WWix(vD?N{kAoGjhjM?A^`S6(so9D{<{ucF$eEOv
z=3i#2?=fdm@X)NFWN%{Lu4J)G#Y(q^6_1v(x1F-z%#(nPry)PjM*<w=G92blp5sDi
z1IrEttF9)>ZY66yDmMJBZ1(AR7BsOl>SFhvmp6qe-W8`$oS(F*e8XjT1M58sHvP?P
z2UNTWs@V;<u|IC(AnxF(6yta?ekxmYZ1**?)30DJq~ukkg~Q2q-X<-4T#E2{b?jWW
z=GYH6@;chgQBuc;Ogmp54e{;q@P*i#<9(`)PdP1L*ZTRfF>ooi=J>u5;OAEFx$M83
n5Pwxd{JAZ}?;Aq=x+cW&6(RC<wLe7lS+2=Fc}AX<8JYbLLCl|Q
diff --git a/packages/auth/assets/index.html b/packages/auth/assets/index.html
deleted file mode 100644
index 4ff73a30..00000000
--- a/packages/auth/assets/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!doctype html>
-<html>
-<head>
- <meta charset="UTF-8">
- <script type="module" src="dbp-auth-demo.js"></script>
- <script type="module" src="dbp-auth.js"></script>
-</head>
-
-<body>
-<dbp-auth-demo auth requested-login-status lang="de" entry-point-url="http://127.0.0.1:8000" subscribe="auth"></dbp-auth-demo>
-</body>
-</html>
diff --git a/packages/auth/assets/index.html.ejs b/packages/auth/assets/index.html.ejs
new file mode 100644
index 00000000..b276b0d5
--- /dev/null
+++ b/packages/auth/assets/index.html.ejs
@@ -0,0 +1,34 @@
+<!doctype html>
+<html>
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+
+ <style>
+ :root {
+ font-family: sans-serif;
+ font-weight: 300;
+ font-size: 11pt;
+ }
+
+ body {
+ margin: 0;
+ }
+ </style>
+
+ <script type="module" src="<%= getUrl(name + '-demo.js') %>"></script>
+</head>
+<body>
+ <dbp-auth-demo
+ auth
+ requested-login-status
+ lang="de"
+ entry-point-url="<%= entryPointURL %>"
+ url="<%= keyCloakBaseURL %>"
+ realm="<%= keyCloakRealm %>"
+ client-id="<%= keyCloakClientId %>"
+ silent-check-sso-redirect-uri="<%= getUrl('silent-check-sso.html') %>"
+ subscribe="auth"
+ ></dbp-auth-demo>
+</body>
+</html>
diff --git a/packages/auth/rollup.config.js b/packages/auth/rollup.config.js
index d5f81517..3b21ce64 100644
--- a/packages/auth/rollup.config.js
+++ b/packages/auth/rollup.config.js
@@ -1,22 +1,29 @@
import glob from 'glob';
+import url from 'url';
import resolve from '@rollup/plugin-node-resolve';
import commonjs from '@rollup/plugin-commonjs';
import copy from 'rollup-plugin-copy';
import {terser} from 'rollup-plugin-terser';
-import json from '@rollup/plugin-json';
import serve from 'rollup-plugin-serve';
import del from 'rollup-plugin-delete';
+import json from '@rollup/plugin-json';
+import emitEJS from 'rollup-plugin-emit-ejs';
import {getPackagePath, getDistPath} from '../../rollup.utils.js';
+import config from '../../demo.common.config.js';
-const pkg = require('./package.json');
const build = typeof process.env.BUILD !== 'undefined' ? process.env.BUILD : 'local';
console.log('build: ' + build);
+const pkg = require('./package.json');
+const basePath = '/dist/';
+const appName = 'dbp-auth';
+
export default (async () => {
+ let privatePath = await getDistPath(pkg.name);
return {
input:
build != 'test'
- ? ['src/dbp-auth.js', 'src/dbp-auth-demo.js']
+ ? ['src/' + appName + '.js', 'src/' + appName + '-demo.js']
: glob.sync('test/**/*.js'),
output: {
dir: 'dist',
@@ -29,15 +36,30 @@ export default (async () => {
del({
targets: 'dist/*',
}),
+ emitEJS({
+ src: 'assets',
+ include: ['**/*.ejs', '**/.*.ejs'],
+ data: {
+ getUrl: (p) => {
+ return url.resolve(basePath, p);
+ },
+ getPrivateUrl: (p) => {
+ return url.resolve(`${basePath}${privatePath}/`, p);
+ },
+ name: appName,
+ entryPointURL: config.entryPointURL,
+ keyCloakBaseURL: config.keyCloakBaseURL,
+ keyCloakRealm: config.keyCloakRealm,
+ keyCloakClientId: config.keyCloakClientId,
+ },
+ }),
resolve(),
commonjs(),
json(),
build !== 'local' && build !== 'test' ? terser() : false,
copy({
targets: [
- {src: 'assets/index.html', dest: 'dist'},
{src: 'assets/silent-check-sso.html', dest: 'dist'},
- {src: 'assets/favicon.ico', dest: 'dist'},
{
src: await getPackagePath('@dbp-toolkit/common', 'assets/icons/*.svg'),
dest: 'dist/' + (await getDistPath('@dbp-toolkit/common', 'icons')),
@@ -45,7 +67,12 @@ export default (async () => {
],
}),
process.env.ROLLUP_WATCH === 'true'
- ? serve({contentBase: 'dist', host: '127.0.0.1', port: 8002})
+ ? serve({
+ contentBase: '.',
+ historyApiFallback: basePath + 'index.html',
+ host: '127.0.0.1',
+ port: 8002,
+ })
: false,
],
};
diff --git a/packages/auth/src/dbp-auth-demo.js b/packages/auth/src/dbp-auth-demo.js
index 22a2f7ea..4854e032 100644
--- a/packages/auth/src/dbp-auth-demo.js
+++ b/packages/auth/src/dbp-auth-demo.js
@@ -86,13 +86,9 @@ export class DbpAuthDemo extends ScopedElementsMixin(DBPLitElement) {
: html`
<div class="container">
<dbp-auth-keycloak
- subscribe="requested-login-status"
+ subscribe="requested-login-status,silent-check-sso-redirect-uri,url,realm,client-id,entry-point-url"
lang="${this.lang}"
entry-point-url="${this.entryPointUrl}"
- silent-check-sso-redirect-uri="/silent-check-sso.html"
- url="https://auth-dev.tugraz.at/auth"
- realm="tugraz-vpu"
- client-id="auth-dev-mw-frontend-local"
try-login></dbp-auth-keycloak>
<dbp-login-button subscribe="auth" lang="${this.lang}"></dbp-login-button>
</div>
--
GitLab