Skip to content

Commit 08dec15

Browse files
authored
Merge pull request #84 from spring-media/PA-5238
feat PA-5238: extend renderAuthComponent interface to allow inline rendering
2 parents 569ef4b + 39c062e commit 08dec15

File tree

3 files changed

+10
-39
lines changed

3 files changed

+10
-39
lines changed

.github/workflows/pull_request.yml

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
name: Checks
22
on:
33
pull_request:
4-
# we're doing the filtering for branches and actions in each step,
5-
# this one here works not as expected and could be misleading
6-
# branches:
7-
# - migrating-to-yaml-syntax
8-
# - master
9-
# action:
10-
# - opened
11-
# - edited
12-
# - synchronize
134

145
env:
156
GITHUB_TOKEN: ${{ secrets.PS_GITHUB_ACCESSTOKEN }}
@@ -20,12 +11,10 @@ jobs:
2011
runs-on: ubuntu-latest
2112
steps:
2213
- name: Checkout branch
23-
if: github.event.action == 'opened' || github.event.action == 'edited' || github.event.action == 'synchronize'
24-
uses: actions/checkout@v2
14+
uses: actions/checkout@v4
2515

2616
- name: Set Node.js 16
27-
if: github.event.action == 'opened' || github.event.action == 'edited' || github.event.action == 'synchronize'
28-
uses: actions/setup-node@v2
17+
uses: actions/setup-node@v4
2918
with:
3019
node-version: "16"
3120
cache: 'yarn'
@@ -35,37 +24,20 @@ jobs:
3524
npm config set //npm.pkg.github.com/:_authToken=$GITHUB_TOKEN
3625
3726
- name: Install yarn
38-
if: github.event.action == 'opened' || github.event.action == 'edited' || github.event.action == 'synchronize'
3927
run: yarn install --frozen-lockfile
4028

4129
- name: yarn format-check
42-
if: github.event.action == 'opened' || github.event.action == 'edited' || github.event.action == 'synchronize'
4330
run: yarn check
4431

4532
build:
4633
name: Build
4734
runs-on: ubuntu-latest
4835
steps:
4936
- name: Checkout branch
50-
if: github.event.action == 'opened' || github.event.action == 'edited' || github.event.action == 'synchronize'
51-
uses: actions/[email protected]
52-
53-
- name: Checkout master
54-
if: github.event.action == 'opened' || github.event.action == 'edited' || github.event.action == 'synchronize'
55-
uses: actions/[email protected]
56-
with:
57-
ref: master
58-
59-
- name: Check merge
60-
if: github.event.action == 'opened' || github.event.action == 'edited' || github.event.action == 'synchronize'
61-
run: |
62-
git config --global user.name "Spring Media CD"
63-
git config --global user.email "[email protected]"
64-
git merge ${{ github.event.pull_request.head.sha }} -m"prchecker" --stat
37+
uses: actions/checkout@v4
6538

6639
- name: Set Node.js 16
67-
if: github.event.action == 'opened' || github.event.action == 'edited' || github.event.action == 'synchronize'
68-
uses: actions/setup-node@v2
40+
uses: actions/setup-node@v4
6941
with:
7042
node-version: "16"
7143
cache: 'yarn'
@@ -75,13 +47,10 @@ jobs:
7547
npm config set //npm.pkg.github.com/:_authToken=$GITHUB_TOKEN
7648
7749
- name: Install yarn
78-
if: github.event.action == 'opened' || github.event.action == 'edited' || github.event.action == 'synchronize'
7950
run: yarn install --frozen-lockfile
8051

8152
- name: Test yarn
82-
if: github.event.action == 'opened' || github.event.action == 'edited' || github.event.action == 'synchronize'
8353
run: yarn test
8454

8555
- name: Build yarn
86-
if: github.event.action == 'opened' || github.event.action == 'edited' || github.event.action == 'synchronize'
8756
run: yarn build

.github/workflows/push_master.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout branch
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v4
1717

1818
- name: Set Node.js 16
19-
uses: actions/setup-node@v2
19+
uses: actions/setup-node@v4
2020
with:
2121
node-version: "16"
2222
cache: 'yarn'
@@ -36,10 +36,10 @@ jobs:
3636
runs-on: ubuntu-latest
3737
steps:
3838
- name: Checkout branch
39-
uses: actions/checkout@v2
39+
uses: actions/checkout@v4
4040

4141
- name: Set Node.js 16
42-
uses: actions/setup-node@v2
42+
uses: actions/setup-node@v4
4343
with:
4444
node-version: "16"
4545
cache: 'yarn'

src/ps-web-apis.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ export interface WhoamiV1 {
200200
*
201201
* @param {Object} config - config container object
202202
* @param {HTMLElement} [config.container] - The HTML element in which the Wonderwall should be rendered in. default = overlay
203+
* @param {boolean} [config.inlineRender] - Renders Wonderwall directly in container instead of as overlay. default = false
203204
* @param {Object} config.props - The props which will be passed to the Wonderwall web component.
204205
* @param {String} config.props.template - valid choices are "register" and "login"
205206
* @param {String} config.props.variant - variant of the brand that should be shown e.g bild or welt
@@ -255,6 +256,7 @@ export type WonderwallProps = {
255256

256257
export interface AuthComponentConfig {
257258
container?: HTMLElement;
259+
inlineRender?: boolean;
258260
props: WonderwallProps;
259261
}
260262

0 commit comments

Comments
 (0)