Skip to content

Commit b9aae10

Browse files
committed
remove merge
1 parent aacc4a8 commit b9aae10

File tree

5 files changed

+0
-216
lines changed

5 files changed

+0
-216
lines changed

docs/10-Introduction/20-SetupEnvironment/SetupEnvironmentKeycloak.md

-40
Original file line numberDiff line numberDiff line change
@@ -105,45 +105,5 @@ To remove the step that propose to review the profile when account already exist
105105

106106
In Keycloak interface > menu "Authentication" > tab "Flow" > click on "first broker login"
107107

108-
<<<<<<< HEAD
109-
=======
110-
# Simplify Authentication flow
111-
112-
## Remove “Update Account Information” form after first login
113-
To remove “Update Account Information” form after first login
114-
![update account information](../../Images/Keycloak/UpdateAccountInformation.png)
115-
116-
In Keycloak interface > menu "Realm settings" > tab "User profile" > edit the 3 field (email, firstName, lastName)
117-
and switch Required field to off.
118-
119-
![email setting](../../Images/Keycloak/emailSettings.JPG)
120-
121-
122-
<<<<<<< HEAD
123-
=======
124-
# Simplify Authentication flow
125-
126-
## Remove “Update Account Information” form after first login
127-
To remove “Update Account Information” form after first login
128-
![update account information](../../Images/Keycloak/UpdateAccountInformation.png)
129-
130-
In Keycloak interface > menu "Realm settings" > tab "User profile" > edit the 3 field (email, firstName, lastName)
131-
and switch Required field to off.
132-
133-
![email setting](../../Images/Keycloak/emailSettings.JPG)
134-
135-
136-
>>>>>>> 654da63ffb2d1509efeaa04521212f4aef9c92d5
137-
138-
## Remove the step "Review Profile"
139-
To remove the step that propose to review the profile when account already exist
140-
![step Review Profile](../../Images/Keycloak/ReviewProfile.jpg)
141-
142-
In Keycloak interface > menu "Authentication" > tab "Flow" > click on "first broker login"
143-
144-
<<<<<<< HEAD
145-
>>>>>>> 654da63ffb2d1509efeaa04521212f4aef9c92d5
146-
=======
147-
>>>>>>> 654da63ffb2d1509efeaa04521212f4aef9c92d5
148108
Change the requirement of "Confirm link existing account" to "Disabled"
149109
![authentication flow](../../Images/Keycloak/AuthFlow.jpg)

versioned_docs/version-3.10.0/10-Introduction/20-SetupEnvironment/SetupEnvironmentKeycloak.md

-22
Original file line numberDiff line numberDiff line change
@@ -105,27 +105,5 @@ To remove the step that propose to review the profile when account already exist
105105

106106
In Keycloak interface > menu "Authentication" > tab "Flow" > click on "first broker login"
107107

108-
<<<<<<< HEAD
109-
=======
110-
# Simplify Authentication flow
111-
112-
## Remove “Update Account Information” form after first login
113-
To remove “Update Account Information” form after first login
114-
![update account information](../../Images/Keycloak/UpdateAccountInformation.png)
115-
116-
In Keycloak interface > menu "Realm settings" > tab "User profile" > edit the 3 field (email, firstName, lastName)
117-
and switch Required field to off.
118-
119-
![email setting](../../Images/Keycloak/emailSettings.JPG)
120-
121-
122-
123-
## Remove the step "Review Profile"
124-
To remove the step that propose to review the profile when account already exist
125-
![step Review Profile](../../Images/Keycloak/ReviewProfile.jpg)
126-
127-
In Keycloak interface > menu "Authentication" > tab "Flow" > click on "first broker login"
128-
129-
>>>>>>> 654da63ffb2d1509efeaa04521212f4aef9c92d5
130108
Change the requirement of "Confirm link existing account" to "Disabled"
131109
![authentication flow](../../Images/Keycloak/AuthFlow.jpg)

versioned_docs/version-3.9.0/10-Introduction/20-SetupEnvironment/SetupEnvironmentKeycloak.md

-66
Original file line numberDiff line numberDiff line change
@@ -13,50 +13,6 @@ Never modify the **Master** realm.
1313

1414
Create a new **Realm**, for example **BIA-Realm**
1515

16-
<<<<<<< HEAD
17-
=======
18-
## User federation
19-
Create a new **User federation**, configure it, example:
20-
21-
![LDAP-Connection-authentication-settings](../../Images/Keycloak/LDAP-Connection-authentication-settings.jpg)
22-
23-
![LDAP-searching-updating](../../Images/Keycloak/LDAP-searching-updating.jpg)
24-
25-
And check that everything is ok with the buttons **Test connection** and **Test authentication**
26-
27-
![check-ldap-success](../../Images/Keycloak/check-ldap-success.jpg)
28-
29-
Among the fields requested in the **User** table in database, look at what the **User federation** contains. If any are missing, create the corresponding mappers.
30-
31-
![user-federation-mapper](../../Images/Keycloak/user-federation-mapper.jpg)
32-
33-
configure groupldap as follows:
34-
35-
**LDAP Filter**: (&(objectCategory=CN=Group,CN=Schema,CN=Configuration,DC=your,DC=ad)(|(cn=GROUP_AD_PREFIX_TO_FILTER_*)(cn=GROUP_AD_TO_FILTER)))
36-
37-
![user-federation-mapper-groupldap](../../Images/Keycloak/user-federation-mapper-groupldap.jpg)
38-
39-
40-
At the top right, select from the list, **Sync all users**
41-
42-
![sync-all-user](../../Images/Keycloak/sync-all-user.jpg)
43-
44-
## Client
45-
Create a new client, for example, biaapp and fill **Root URL** and **Admin URL** with the root of your applications' URLs (example: https://myapp-int.mydomain/)
46-
47-
Go to the tab **Client scopes** and click on the link **biaapp-dedicated** contained in the table with the description: **Dedicated scope and mappers for this client**
48-
49-
![dedicated-mappers](../../Images/Keycloak/dedicated-mappers.jpg)
50-
51-
If they are missing, add them:
52-
53-
![dedicated-mappers-userName](../../Images/Keycloak/dedicated-mappers-userName.jpg)
54-
55-
![dedicated-mappers-groups](../../Images/Keycloak/dedicated-mappers-groups.jpg)
56-
57-
![dedicated-mappers-audience](../../Images/Keycloak/dedicated-mappers-audience.jpg)
58-
59-
>>>>>>> 654da63ffb2d1509efeaa04521212f4aef9c92d5
6016
## Service Account
6117

6218
You must create a user in Keycloak which will be used to query the list of users in your realm.
@@ -149,27 +105,5 @@ To remove the step that propose to review the profile when account already exist
149105

150106
In Keycloak interface > menu "Authentication" > tab "Flow" > click on "first broker login"
151107

152-
<<<<<<< HEAD
153-
=======
154-
# Simplify Authentication flow
155-
156-
## Remove “Update Account Information” form after first login
157-
To remove “Update Account Information” form after first login
158-
![update account information](../../Images/Keycloak/UpdateAccountInformation.png)
159-
160-
In Keycloak interface > menu "Realm settings" > tab "User profile" > edit the 3 field (email, firstName, lastName)
161-
and switch Required field to off.
162-
163-
![email setting](../../Images/Keycloak/emailSettings.JPG)
164-
165-
166-
167-
## Remove the step "Review Profile"
168-
To remove the step that propose to review the profile when account already exist
169-
![step Review Profile](../../Images/Keycloak/ReviewProfile.jpg)
170-
171-
In Keycloak interface > menu "Authentication" > tab "Flow" > click on "first broker login"
172-
173-
>>>>>>> 654da63ffb2d1509efeaa04521212f4aef9c92d5
174108
Change the requirement of "Confirm link existing account" to "Disabled"
175109
![authentication flow](../../Images/Keycloak/AuthFlow.jpg)

versioned_docs/version-4.0.0/10-Introduction/20-SetupEnvironment/SetupEnvironmentKeycloak.md

-22
Original file line numberDiff line numberDiff line change
@@ -105,27 +105,5 @@ To remove the step that propose to review the profile when account already exist
105105

106106
In Keycloak interface > menu "Authentication" > tab "Flow" > click on "first broker login"
107107

108-
<<<<<<< HEAD
109-
=======
110-
# Simplify Authentication flow
111-
112-
## Remove “Update Account Information” form after first login
113-
To remove “Update Account Information” form after first login
114-
![update account information](../../Images/Keycloak/UpdateAccountInformation.png)
115-
116-
In Keycloak interface > menu "Realm settings" > tab "User profile" > edit the 3 field (email, firstName, lastName)
117-
and switch Required field to off.
118-
119-
![email setting](../../Images/Keycloak/emailSettings.JPG)
120-
121-
122-
123-
## Remove the step "Review Profile"
124-
To remove the step that propose to review the profile when account already exist
125-
![step Review Profile](../../Images/Keycloak/ReviewProfile.jpg)
126-
127-
In Keycloak interface > menu "Authentication" > tab "Flow" > click on "first broker login"
128-
129-
>>>>>>> 654da63ffb2d1509efeaa04521212f4aef9c92d5
130108
Change the requirement of "Confirm link existing account" to "Disabled"
131109
![authentication flow](../../Images/Keycloak/AuthFlow.jpg)

versioned_docs/version-older/10-Introduction/20-SetupEnvironment/SetupEnvironmentKeycloak.md

-66
Original file line numberDiff line numberDiff line change
@@ -13,50 +13,6 @@ Never modify the **Master** realm.
1313

1414
Create a new **Realm**, for example **BIA-Realm**
1515

16-
<<<<<<< HEAD
17-
=======
18-
## User federation
19-
Create a new **User federation**, configure it, example:
20-
21-
![LDAP-Connection-authentication-settings](../../Images/Keycloak/LDAP-Connection-authentication-settings.jpg)
22-
23-
![LDAP-searching-updating](../../Images/Keycloak/LDAP-searching-updating.jpg)
24-
25-
And check that everything is ok with the buttons **Test connection** and **Test authentication**
26-
27-
![check-ldap-success](../../Images/Keycloak/check-ldap-success.jpg)
28-
29-
Among the fields requested in the **User** table in database, look at what the **User federation** contains. If any are missing, create the corresponding mappers.
30-
31-
![user-federation-mapper](../../Images/Keycloak/user-federation-mapper.jpg)
32-
33-
configure groupldap as follows:
34-
35-
**LDAP Filter**: (&(objectCategory=CN=Group,CN=Schema,CN=Configuration,DC=your,DC=ad)(|(cn=GROUP_AD_PREFIX_TO_FILTER_*)(cn=GROUP_AD_TO_FILTER)))
36-
37-
![user-federation-mapper-groupldap](../../Images/Keycloak/user-federation-mapper-groupldap.jpg)
38-
39-
40-
At the top right, select from the list, **Sync all users**
41-
42-
![sync-all-user](../../Images/Keycloak/sync-all-user.jpg)
43-
44-
## Client
45-
Create a new client, for example, biaapp and fill **Root URL** and **Admin URL** with the root of your applications' URLs (example: https://myapp-int.mydomain/)
46-
47-
Go to the tab **Client scopes** and click on the link **biaapp-dedicated** contained in the table with the description: **Dedicated scope and mappers for this client**
48-
49-
![dedicated-mappers](../../Images/Keycloak/dedicated-mappers.jpg)
50-
51-
If they are missing, add them:
52-
53-
![dedicated-mappers-userName](../../Images/Keycloak/dedicated-mappers-userName.jpg)
54-
55-
![dedicated-mappers-groups](../../Images/Keycloak/dedicated-mappers-groups.jpg)
56-
57-
![dedicated-mappers-audience](../../Images/Keycloak/dedicated-mappers-audience.jpg)
58-
59-
>>>>>>> 654da63ffb2d1509efeaa04521212f4aef9c92d5
6016
## Service Account
6117

6218
You must create a user in Keycloak which will be used to query the list of users in your realm.
@@ -149,27 +105,5 @@ To remove the step that propose to review the profile when account already exist
149105

150106
In Keycloak interface > menu "Authentication" > tab "Flow" > click on "first broker login"
151107

152-
<<<<<<< HEAD
153-
=======
154-
# Simplify Authentication flow
155-
156-
## Remove “Update Account Information” form after first login
157-
To remove “Update Account Information” form after first login
158-
![update account information](../../Images/Keycloak/UpdateAccountInformation.png)
159-
160-
In Keycloak interface > menu "Realm settings" > tab "User profile" > edit the 3 field (email, firstName, lastName)
161-
and switch Required field to off.
162-
163-
![email setting](../../Images/Keycloak/emailSettings.JPG)
164-
165-
166-
167-
## Remove the step "Review Profile"
168-
To remove the step that propose to review the profile when account already exist
169-
![step Review Profile](../../Images/Keycloak/ReviewProfile.jpg)
170-
171-
In Keycloak interface > menu "Authentication" > tab "Flow" > click on "first broker login"
172-
173-
>>>>>>> 654da63ffb2d1509efeaa04521212f4aef9c92d5
174108
Change the requirement of "Confirm link existing account" to "Disabled"
175109
![authentication flow](../../Images/Keycloak/AuthFlow.jpg)

0 commit comments

Comments
 (0)