-
Notifications
You must be signed in to change notification settings - Fork 24
feat: add possibility to pass function into the loginPromptHTML #273
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
8282f67
feat: add possibility to pass function into the loginPromptHTML
yaroslav8765 8fccf23
fix: update loginPromptHTML function call to remove unnecessary param…
yaroslav8765 51d0c0c
fix: remove unused parametr from the /get_public_config
yaroslav8765 02e683d
fix: add possibility to pass void functions to the loginPromptHTML
yaroslav8765 dcc5097
chore: move getLoginPromptHTML to the utils
yaroslav8765 a76338d
chore: change getLoginPromptHTML
yaroslav8765 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -210,14 +210,21 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI { | |
| const resource = this.adminforth.config.resources.find((res) => res.resourceId === this.adminforth.config.auth.usersResourceId); | ||
| const usernameColumn = resource.columns.find((col) => col.name === usernameField); | ||
|
|
||
| let loginPromptHTML; | ||
| if(typeof this.adminforth.config.auth.loginPromptHTML === 'function') { | ||
| loginPromptHTML = await this.adminforth.config.auth.loginPromptHTML(); | ||
| } else { | ||
| loginPromptHTML = this.adminforth.config.auth.loginPromptHTML; | ||
| } | ||
|
|
||
| return { | ||
| brandName: this.adminforth.config.customization.brandName, | ||
| usernameFieldName: usernameColumn.label, | ||
| loginBackgroundImage: this.adminforth.config.auth.loginBackgroundImage, | ||
| loginBackgroundPosition: this.adminforth.config.auth.loginBackgroundPosition, | ||
| title: this.adminforth.config.customization?.title, | ||
| demoCredentials: this.adminforth.config.auth.demoCredentials, | ||
| loginPromptHTML: await tr(this.adminforth.config.auth.loginPromptHTML, 'system.loginPromptHTML'), | ||
| loginPromptHTML: await tr(loginPromptHTML, 'system.loginPromptHTML'), | ||
| loginPageInjections: this.adminforth.config.customization.loginPageInjections, | ||
| globalInjections: { | ||
| everyPageBottom: this.adminforth.config.customization.globalInjections.everyPageBottom, | ||
|
|
@@ -290,6 +297,14 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI { | |
| } | ||
|
|
||
| const announcementBadge: AnnouncementBadgeResponse = this.adminforth.config.customization.announcementBadge?.(adminUser); | ||
|
|
||
| let loginPromptHTML; | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't repeat yourself |
||
| if(typeof this.adminforth.config.auth.loginPromptHTML === 'function') { | ||
| loginPromptHTML = await this.adminforth.config.auth.loginPromptHTML(); | ||
| } else { | ||
| loginPromptHTML = this.adminforth.config.auth.loginPromptHTML; | ||
| } | ||
|
|
||
|
|
||
| const publicPart = { | ||
| brandName: this.adminforth.config.customization.brandName, | ||
|
|
@@ -298,7 +313,7 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI { | |
| loginBackgroundPosition: this.adminforth.config.auth.loginBackgroundPosition, | ||
| title: this.adminforth.config.customization?.title, | ||
| demoCredentials: this.adminforth.config.auth.demoCredentials, | ||
| loginPromptHTML: await tr(this.adminforth.config.auth.loginPromptHTML, 'system.loginPromptHTML'), | ||
| loginPromptHTML: await tr(loginPromptHTML, 'system.loginPromptHTML'), | ||
| loginPageInjections: this.adminforth.config.customization.loginPageInjections, | ||
| rememberMeDays: this.adminforth.config.auth.rememberMeDays, | ||
| } | ||
|
|
||
This file contains hidden or 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 hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@yaroslav8765 can we remove this return? I think function shoudl understand undefined as well!