Feature/iot 1249 manage kombit users merged #168
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
…hat you have to be logged in. Nessesary since a new user should choose which organizations the user wishes to be a part of.
…s now saved in db.
…s requested organizations. Changed the migration.
…nly org admins should get the mail, and if no org admins then global admin. Need to take care of exception in user.service
…s to be changed to environment variables. Check all TODOS before merging
…n ourselves. Made TODO::: for places that needs to do.
…ereal Email server for test.
…thout permissions. Made map functions
# Conflicts: # src/config/configuration.ts # src/modules/app.module.ts # src/modules/shared.module.ts
added 4 commits
May 17, 2022 09:03
…ageKombitUsersMerged # Conflicts: # src/services/user-management/user.service.ts
Changed UserRejectDTO to also have id of the user to reject Minor code quality changes
…ageKombitUsersMerged
GufCab
approved these changes
May 17, 2022
AramAlsabti
added a commit
that referenced
this pull request
May 19, 2022
* Add flow for hiding new welcome screen (#172) * Merge permission entities into one. Support multiple levels per permission * Fix some test errors * Feature/iot 1320 fix sig fox connection (#165) * Fixes issues with communication with the SigFox API * Better description for SigFox controller endpoint Co-authored-by: nlg <[email protected]> * Feature/iot 1249 manage kombit users merged (#168) * Made it possible to get all organizations without other permissions that you have to be logged in. Nessesary since a new user should choose which organizations the user wishes to be a part of. * Ready for put setEmail * set email for user * When logging in to kombit user, the entered email and organizations is now saved in db. * changed to ManyToMany between user and organizations. Made a migration * Possible to update the organizations that the user applies. * Changed names so it's more clear that the organizations on the user is requested organizations. Changed the migration. * Made mail work with mail test server. It's possible to send a mail. Only org admins should get the mail, and if no org admins then global admin. Need to take care of exception in user.service * Changed user name to awaiting users. Made api call to get awaiting users. * Made backend for kombit. Sends mail at verification and rejection. Has to be changed to environment variables. Check all TODOS before merging * changed migration to match with stage * Getting ready for OAuth2 mail system. We need to generate refreshtoken ourselves. Made TODO::: for places that needs to do. * Service is now looking at environment variables. Currently set to Ethereal Email server for test. * Changed default email values to mailgun * Made a new controller for new kombit users so endpoints is allowed without permissions. Made map functions * Now possible to get permissions onto an organization * updated to correct and latest migration * Renamed migration * Added frontend.baseurl environment property Changed UserRejectDTO to also have id of the user to reject Minor code quality changes Co-authored-by: August Andersen <[email protected]> Co-authored-by: nlg <[email protected]> * Bumped momemnt version one minor version * Fixed package.lock * Fixed casing of Kombit migration * Finish permission levels migration * Deny duplicate permission types * Constrain permission type to enum * Removed unused permission types * Fix kombit permissions * Show overview of gateway status (#170) * Init kafka for online status service * Subscribe to gateway connection state Migration, data storage and error handling are missing. * Init get gateway status * Refactor gateway status * Implement gateway status fetch. Missing save in db * Store gateway status messages. Cleanup * Organization id is optional * Re-timestamped migration to to make it fit in the migration timeline * Minor renaming * Bump migration timestamp * Fetch status for single gateway (#171) Co-authored-by: nlg <[email protected]> * Update accept kombit to use group instead of level * Remove permission check from gateway status * Cleanup permission relations on down * Fix multiple permission relations not mapped to the same new permissions * Fix global admin not created on startup Co-authored-by: Nikolaj Gustafsson <[email protected]> Co-authored-by: nlg <[email protected]> Co-authored-by: augusthjerrild <[email protected]> Co-authored-by: August Andersen <[email protected]>
AramAlsabti
added a commit
that referenced
this pull request
May 19, 2022
* Revised permission system on backend. Pending integration test with frontend * Check for the proper permissions * Initial migration * Fix proper linting ignore of migrations * Migrate existing permissions * Update organization controller role * Fix merge issues * Migrations build * Modified Migration * Fixed permission migration and the organizationID check * New user management multiple levels (#174) * Add flow for hiding new welcome screen (#172) * Merge permission entities into one. Support multiple levels per permission * Fix some test errors * Feature/iot 1320 fix sig fox connection (#165) * Fixes issues with communication with the SigFox API * Better description for SigFox controller endpoint Co-authored-by: nlg <[email protected]> * Feature/iot 1249 manage kombit users merged (#168) * Made it possible to get all organizations without other permissions that you have to be logged in. Nessesary since a new user should choose which organizations the user wishes to be a part of. * Ready for put setEmail * set email for user * When logging in to kombit user, the entered email and organizations is now saved in db. * changed to ManyToMany between user and organizations. Made a migration * Possible to update the organizations that the user applies. * Changed names so it's more clear that the organizations on the user is requested organizations. Changed the migration. * Made mail work with mail test server. It's possible to send a mail. Only org admins should get the mail, and if no org admins then global admin. Need to take care of exception in user.service * Changed user name to awaiting users. Made api call to get awaiting users. * Made backend for kombit. Sends mail at verification and rejection. Has to be changed to environment variables. Check all TODOS before merging * changed migration to match with stage * Getting ready for OAuth2 mail system. We need to generate refreshtoken ourselves. Made TODO::: for places that needs to do. * Service is now looking at environment variables. Currently set to Ethereal Email server for test. * Changed default email values to mailgun * Made a new controller for new kombit users so endpoints is allowed without permissions. Made map functions * Now possible to get permissions onto an organization * updated to correct and latest migration * Renamed migration * Added frontend.baseurl environment property Changed UserRejectDTO to also have id of the user to reject Minor code quality changes Co-authored-by: August Andersen <[email protected]> Co-authored-by: nlg <[email protected]> * Bumped momemnt version one minor version * Fixed package.lock * Fixed casing of Kombit migration * Finish permission levels migration * Deny duplicate permission types * Constrain permission type to enum * Removed unused permission types * Fix kombit permissions * Show overview of gateway status (#170) * Init kafka for online status service * Subscribe to gateway connection state Migration, data storage and error handling are missing. * Init get gateway status * Refactor gateway status * Implement gateway status fetch. Missing save in db * Store gateway status messages. Cleanup * Organization id is optional * Re-timestamped migration to to make it fit in the migration timeline * Minor renaming * Bump migration timestamp * Fetch status for single gateway (#171) Co-authored-by: nlg <[email protected]> * Update accept kombit to use group instead of level * Remove permission check from gateway status * Cleanup permission relations on down * Fix multiple permission relations not mapped to the same new permissions * Fix global admin not created on startup Co-authored-by: Nikolaj Gustafsson <[email protected]> Co-authored-by: nlg <[email protected]> Co-authored-by: augusthjerrild <[email protected]> Co-authored-by: August Andersen <[email protected]> Co-authored-by: nlg <[email protected]> Co-authored-by: Nikolaj Gustafsson <[email protected]> Co-authored-by: augusthjerrild <[email protected]> Co-authored-by: August Andersen <[email protected]>
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.
New kombit users has to create an email when logged in for the first time.