Feature/clan6 199 remove cogboard init task #113
Merged
Conversation
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
added 3 commits
November 21, 2019 09:25
Configuration files moved to resources `widget1.json` deleted `admins.conf` -> `admins.json` `.gitignore` updated
szymon-owczarzak
approved these changes
Nov 21, 2019
cogboard-app/src/main/kotlin/com/cognifide/cogboard/config/service/CredentialsService.kt
Outdated
Show resolved
Hide resolved
|
|
||
| fun loadConfig(): JsonObject = storage.loadConfig() | ||
| fun loadConfig(): JsonObject = VolumeStorageFactory.endpoints().loadConfig() |
There was a problem hiding this comment.
similar as my previous comment
|
|
||
| object AdminsValidator : Validator { | ||
| override fun validate(config: String): Boolean { | ||
| if (File("/data/admins.json").exists()) { |
There was a problem hiding this comment.
this validation makes no sense now as i will be always created before code reaches this point... Lets validate if at least one admin is defined with password
cogboard-app/src/main/kotlin/com/cognifide/cogboard/security/LoginHandler.kt
Outdated
Show resolved
Hide resolved
cogboard-app/src/main/kotlin/com/cognifide/cogboard/storage/StorageInitializer.kt
Outdated
Show resolved
Hide resolved
cogboard-app/src/main/kotlin/com/cognifide/cogboard/storage/StorageInitializer.kt
Outdated
Show resolved
Hide resolved
…emove-cogboardInit-task # Conflicts: # build.gradle.kts
…Validator not done yet.
…github.com/Cognifide/cogboard into feature/CLAN6-199-Remove-cogboardInit-task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.