From 798971d636abf49a3a26db0bbfc99c9fcc9ae1bc Mon Sep 17 00:00:00 2001
From: Eugen Neuber <eugen.neuber@tugraz.at>
Date: Mon, 15 Feb 2021 11:46:53 +0100
Subject: [PATCH] Fix auth-demo to run stand alone again
See issue dbp/web-components/toolkit#46
---
packages/auth/assets/index.html | 16 +-------------
packages/auth/rollup.config.js | 6 +++---
packages/auth/src/dbp-auth-demo.js | 34 +++++++++++++-----------------
3 files changed, 19 insertions(+), 37 deletions(-)
diff --git a/packages/auth/assets/index.html b/packages/auth/assets/index.html
index 7a85c894..4ff73a30 100644
--- a/packages/auth/assets/index.html
+++ b/packages/auth/assets/index.html
@@ -7,20 +7,6 @@
</head>
<body>
-
-<dbp-provider auth requested-login-status>
- <dbp-auth-keycloak subscribe="requested-login-status" lang="de" entry-point-url="http://127.0.0.1:8000"
- url="https://auth-dev.tugraz.at/auth"
- realm="tugraz"
- client-id="auth-dev-mw-frontend-local"
- silent-check-sso-redirect-uri="${silentCheckSsoUri}"
- scope="optional-test-scope"
- load-person
- try-login></dbp-auth-keycloak>
- <dbp-login-button subscribe="auth" lang="de" show-image></dbp-login-button>
-
- <dbp-auth-demo lang="de" entry-point-url="http://127.0.0.1:8000" subscribe="auth"></dbp-auth-demo>
-</dbp-provider>
-
+<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/rollup.config.js b/packages/auth/rollup.config.js
index ab74d785..50a75268 100644
--- a/packages/auth/rollup.config.js
+++ b/packages/auth/rollup.config.js
@@ -39,11 +39,11 @@ export default (async () => {
(build !== 'local' && build !== 'test') ? terser() : false,
copy({
targets: [
- {src: 'assets/index.html', dest:'dist'},
+ {src: 'assets/index.html', dest: 'dist'},
{src: 'assets/silent-check-sso.html', dest: 'dist/' + await getDistPath(pkg.name)},
- {src: 'assets/favicon.ico', 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')},
- ]
+ ],
}),
(process.env.ROLLUP_WATCH === 'true') ? serve({contentBase: 'dist', 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 38bcc4ef..9629be72 100644
--- a/packages/auth/src/dbp-auth-demo.js
+++ b/packages/auth/src/dbp-auth-demo.js
@@ -6,7 +6,6 @@ import {LoginButton} from './login-button.js';
import * as commonUtils from '@dbp-toolkit/common/utils';
import {name as pkgName} from './../package.json';
import DBPLitElement from "@dbp-toolkit/common/dbp-lit-element";
-import {Provider} from '@dbp-toolkit/provider';
export class DbpAuthDemo extends ScopedElementsMixin(DBPLitElement) {
constructor() {
@@ -14,6 +13,7 @@ export class DbpAuthDemo extends ScopedElementsMixin(DBPLitElement) {
this.lang = 'de';
this.entryPointUrl = '';
this.auth = {};
+ this.noAuth = false;
}
static get scopedElements() {
@@ -29,6 +29,7 @@ export class DbpAuthDemo extends ScopedElementsMixin(DBPLitElement) {
lang: { type: String },
entryPointUrl: { type: String, attribute: 'entry-point-url' },
auth: { type: Object },
+ noAuth: { type: Boolean, attribute: 'no-auth' },
};
}
@@ -77,6 +78,18 @@ export class DbpAuthDemo extends ScopedElementsMixin(DBPLitElement) {
div.innerHTML = this.auth.token;
}
+ getAuthComponentHtml() {
+ //const silentCheckSsoUri = commonUtils.getAssetURL(pkgName, 'silent-check-sso.html');
+ return this.noAuth ? html`<dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>` : html`
+ <div class="container">
+ <dbp-auth-keycloak subscribe="requested-login-status" lang="${this.lang}" entry-point-url="${this.entryPointUrl}" silent-check-sso-redirect-uri="/dist/silent-check-sso.html"
+ url="https://auth-dev.tugraz.at/auth" realm="tugraz"
+ client-id="auth-dev-mw-frontend-local" load-person try-login></dbp-auth-keycloak>
+ <dbp-login-button subscribe="auth" lang="${this.lang}" show-image></dbp-login-button>
+ </div>
+ `;
+ }
+
render() {
const silentCheckSsoUri = commonUtils.getAssetURL(pkgName, 'silent-check-sso.html');
return html`
@@ -100,27 +113,11 @@ export class DbpAuthDemo extends ScopedElementsMixin(DBPLitElement) {
max-width: 100%;
}
</style>
- <slot></slot>
<section class="section">
<div class="container">
<h1 class="title">Auth-Demo</h1>
</div>
- <div class="container">
- <p>In any App/page an <b>Auth component</b> will be used like:</p>
-<pre>
-<dbp-auth-keycloak lang="${this.lang}" entry-point-url="${this.entryPointUrl}"
- url="https://auth-dev.tugraz.at/auth"
- realm="tugraz"
- client-id="auth-dev-mw-frontend-local"
- silent-check-sso-redirect-uri="${silentCheckSsoUri}"
- scope="optional-test-scope"
- load-person
- try-login></dbp-auth-keycloak>
-<dbp-login-button lang="${this.lang}" show-image></dbp-login-button>
-</pre>
- <p>but in this demo we actually have already such a component at the top of this page.</p>
- <p>Please use the login button on the top of the page!</p>
- </div>
+ ${this.getAuthComponentHtml()}
<div class="container">
<input type="button" value="Fetch userinfo" @click="${this._onUserInfoClick}">
<input type="button" value="Show token" @click="${this._onShowToken}">
@@ -134,5 +131,4 @@ export class DbpAuthDemo extends ScopedElementsMixin(DBPLitElement) {
}
}
-commonUtils.defineCustomElement('dbp-provider', Provider);
commonUtils.defineCustomElement('dbp-auth-demo', DbpAuthDemo);
--
GitLab