Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Toolkit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
digital blueprint
Web Component Framework
Toolkit
Commits
d73b2f28
Commit
d73b2f28
authored
5 years ago
by
Reiter, Christoph
Browse files
Options
Downloads
Patches
Plain Diff
Adjust for vpu-auth changes
parent
5bc40738
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
packages/app-shell/README.md
+1
-1
1 addition, 1 deletion
packages/app-shell/README.md
packages/app-shell/src/app-shell.js
+5
-3
5 additions, 3 deletions
packages/app-shell/src/app-shell.js
packages/app-shell/vendor/auth
+1
-1
1 addition, 1 deletion
packages/app-shell/vendor/auth
with
7 additions
and
5 deletions
packages/app-shell/README.md
+
1
−
1
View file @
d73b2f28
...
@@ -18,7 +18,7 @@ activities. Handles login, language selection, activity switching, menus etc.
...
@@ -18,7 +18,7 @@ activities. Handles login, language selection, activity switching, menus etc.
-
`src`
: The path to a topic metadata file (json)
-
`src`
: The path to a topic metadata file (json)
-
`base-path`
(optional, default:
`/`
: An absolute base path for routing
-
`base-path`
(optional, default:
`/`
: An absolute base path for routing
-
`entry-point-url`
: Entry point URL to access the API
-
`entry-point-url`
: Entry point URL to access the API
-
`keycloak-config`
:
See
`vpu-auth`
for details
-
`keycloak-config`
:
An object with the following keys: url, realm, clientId, silentCheckSsoRedirectUri, scope
## Topic Metadata
## Topic Metadata
...
...
This diff is collapsed.
Click to expand it.
packages/app-shell/src/app-shell.js
+
5
−
3
View file @
d73b2f28
...
@@ -3,7 +3,7 @@ import {html, css, LitElement} from 'lit-element';
...
@@ -3,7 +3,7 @@ import {html, css, LitElement} from 'lit-element';
import
{
ScopedElementsMixin
}
from
'
@open-wc/scoped-elements
'
;
import
{
ScopedElementsMixin
}
from
'
@open-wc/scoped-elements
'
;
import
{
LanguageSelect
}
from
'
vpu-language-select
'
;
import
{
LanguageSelect
}
from
'
vpu-language-select
'
;
import
{
Icon
,
EventBus
}
from
'
vpu-common
'
;
import
{
Icon
,
EventBus
}
from
'
vpu-common
'
;
import
{
Auth
}
from
'
vpu-auth
'
;
import
{
Auth
Keycloak
}
from
'
vpu-auth
'
;
import
{
AuthMenuButton
}
from
'
./auth-menu-button.js
'
;
import
{
AuthMenuButton
}
from
'
./auth-menu-button.js
'
;
import
{
Notification
}
from
'
vpu-notification
'
;
import
{
Notification
}
from
'
vpu-notification
'
;
import
*
as
commonStyles
from
'
vpu-common/styles
'
;
import
*
as
commonStyles
from
'
vpu-common/styles
'
;
...
@@ -66,7 +66,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
...
@@ -66,7 +66,7 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
'
vpu-language-select
'
:
LanguageSelect
,
'
vpu-language-select
'
:
LanguageSelect
,
'
vpu-tugraz-logo
'
:
TUGrazLogo
,
'
vpu-tugraz-logo
'
:
TUGrazLogo
,
'
vpu-build-info
'
:
BuildInfo
,
'
vpu-build-info
'
:
BuildInfo
,
'
vpu-auth
'
:
Auth
,
'
vpu-auth
-keycloak
'
:
AuthKeycloak
,
'
vpu-auth-menu-button
'
:
AuthMenuButton
,
'
vpu-auth-menu-button
'
:
AuthMenuButton
,
'
vpu-notification
'
:
Notification
,
'
vpu-notification
'
:
Notification
,
'
vpu-icon
'
:
Icon
,
'
vpu-icon
'
:
Icon
,
...
@@ -708,9 +708,11 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
...
@@ -708,9 +708,11 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
"
https://www.tugraz.at/en/about-this-page/legal-notice/
"
:
"
https://www.tugraz.at/en/about-this-page/legal-notice/
"
:
"
https://www.tugraz.at/ueber-diese-seite/impressum/
"
;
"
https://www.tugraz.at/ueber-diese-seite/impressum/
"
;
const
kc
=
this
.
keycloakConfig
;
return
html
`
return
html
`
<slot class="
${
slotClassMap
}
"></slot>
<slot class="
${
slotClassMap
}
"></slot>
<vpu-auth lang="
${
this
.
lang
}
"
keycloak-config="
${
JSON
.
stringify
(
this
.
keycloakConfig
)
}
" load-person try-login></vpu-auth>
<vpu-auth
-keycloak
lang="
${
this
.
lang
}
"
url="
${
kc
.
url
}
" realm="
${
kc
.
realm
}
" client-id="
${
kc
.
clientId
}
" silent-check-sso-redirect-uri="
${
kc
.
silentCheckSsoRedirectUri
||
''
}
" scope="
${
kc
.
scope
||
''
}
" load-person try-login></vpu-auth
-keycloak
>
<div class="
${
mainClassMap
}
">
<div class="
${
mainClassMap
}
">
<div id="main">
<div id="main">
<vpu-notification lang="
${
this
.
lang
}
"></vpu-notification>
<vpu-notification lang="
${
this
.
lang
}
"></vpu-notification>
...
...
This diff is collapsed.
Click to expand it.
auth
@
3d9165d8
Subproject commit
46cecbc422
e0c
2
5ff
9b0336c2c1bd7083117306f
Subproject commit
3d9165d8e688
e0c
f8
5ff
8686e6bcd75733808390
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment