-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #216 from os2display/feature/external-login
Feature: External Login through OIDC
- Loading branch information
Showing
66 changed files
with
8,331 additions
and
2,767 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,3 +37,4 @@ json-server/ | |
|
|
||
| public/config.json | ||
| public/access-config.json | ||
| public/release.json | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,26 @@ | ||
| { | ||
| "api": "{{ getenv "API_PATH" "/" }}", | ||
| "touchButtonRegions": "{{ getenv "APP_TOUCH_BUTTON_REGIONS" "false"}}" | ||
| "touchButtonRegions": "{{ getenv "APP_TOUCH_BUTTON_REGIONS" "false"}}", | ||
| "loginMethods": [ | ||
| { | ||
| "type": "oidc", | ||
| "enabled": "{{ getenv "APP_ENABLE_INTERNAL_LOGIN" "true"}}", | ||
| "provider": "internal", | ||
| "label": null, | ||
| "icon": "faCity" | ||
| }, | ||
| { | ||
| "type": "oidc", | ||
| "enabled": "{{ getenv "APP_ENABLE_EXTERNAL_LOGIN" "true"}}", | ||
| "provider": "external", | ||
| "label": "", | ||
| "icon": "mitID" | ||
| }, | ||
| { | ||
| "type": "username-password", | ||
| "enabled": "{{ getenv "APP_ENABLE_USERNAME_PASSWORD_LOGIN" "true"}}", | ||
| "provider": "username-password", | ||
| "label": null | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,26 @@ | ||
| { | ||
| "api": "{{ getenv "API_PATH" "/" }}", | ||
| "touchButtonRegions": "{{ getenv "APP_TOUCH_BUTTON_REGIONS" "false"}}" | ||
| "touchButtonRegions": "{{ getenv "APP_TOUCH_BUTTON_REGIONS" "false"}}", | ||
| "loginMethods": [ | ||
| { | ||
| "type": "oidc", | ||
| "enabled": "{{ getenv "APP_ENABLE_INTERNAL_LOGIN" "true"}}", | ||
| "provider": "internal", | ||
| "label": null, | ||
| "icon": "faCity" | ||
| }, | ||
| { | ||
| "type": "oidc", | ||
| "enabled": "{{ getenv "APP_ENABLE_EXTERNAL_LOGIN" "true"}}", | ||
| "provider": "external", | ||
| "label": "", | ||
| "icon": "mitID" | ||
| }, | ||
| { | ||
| "type": "username-password", | ||
| "enabled": "{{ getenv "APP_ENABLE_USERNAME_PASSWORD_LOGIN" "true"}}", | ||
| "provider": "username-password", | ||
| "label": null | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,26 @@ | ||
| { | ||
| "api": "/", | ||
| "touchButtonRegions": false | ||
| "touchButtonRegions": false, | ||
| "loginMethods": [ | ||
| { | ||
| "type": "oidc", | ||
| "enabled": true, | ||
| "provider": "internal", | ||
| "label": null, | ||
| "icon": "faCity" | ||
| }, | ||
| { | ||
| "type": "oidc", | ||
| "enabled": true, | ||
| "provider": "external", | ||
| "label": "", | ||
| "icon": "mitID" | ||
| }, | ||
| { | ||
| "type": "username-password", | ||
| "enabled": true, | ||
| "provider": "username-password", | ||
| "label": null | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.