-
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.
Coommit includes the following: (#634)
- Titles of FASCA and Drone in all Trainings #616 - User Profile > Save Changes Without Returning the User to the Search Results Screen #621 - Bug: Admin User unable to download another user's certificate #623 - Dependabot Alert: Server-Side Request Forgery in axios #620
- Loading branch information
1 parent
8935f7b
commit 37afe3d
Showing
17 changed files
with
299 additions
and
131 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 |
|---|---|---|
|
|
@@ -6,3 +6,4 @@ __pycache__ | |
| _site/ | ||
| node_modules | ||
| .coverage | ||
| .idea/workspace.xml | ||
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 |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| <script> | ||
| import { profile} from '../stores/user' | ||
| import { useStore } from '@nanostores/vue' | ||
| import {ref} from "vue"; | ||
| const user = useStore(profile) | ||
| const base_url = import.meta.env.PUBLIC_API_BASE_URL | ||
| const users_api = `${base_url}/api/v1/users/` | ||
| const userSearch = async function(searchText, currentPage){ | ||
| const url = new URL(`${users_api}`) | ||
| url.search = new URLSearchParams({searchText: searchText, page_number: currentPage + 1}) | ||
| const response = await fetch( | ||
| url, { | ||
| method: 'GET', | ||
| headers: { | ||
| 'Authorization': `Bearer ${user.value.jwt}` | ||
| } | ||
| } | ||
| ) | ||
| if (! response.ok) { | ||
| const message = await response.text() | ||
| throw new Error(message) | ||
| } | ||
| return await response.json() | ||
| } | ||
| const updateUserReports = async function(userId, agencyIds) { | ||
| const agencies = agencyIds.map(a => a.id) | ||
| const url = new URL(`${users_api}edit-user-for-reporting/`) | ||
| url.search = new URLSearchParams({user_id: userId}) | ||
| const response = await fetch( | ||
| url, { | ||
| method: "PATCH", | ||
| headers: { | ||
| 'Content-Type': 'application/json', | ||
| 'Authorization': `Bearer ${user.value.jwt}` | ||
| }, | ||
| body: JSON.stringify(agencies) | ||
| } | ||
| ) | ||
| if (!response.ok) { | ||
| const message = await response.text() | ||
| throw new Error(message) | ||
| } | ||
| return await response.json() | ||
| } | ||
| const getUser = async function(userId){ | ||
| const url = new URL(`${users_api}${userId}`) | ||
| const response = await fetch( | ||
| url, { | ||
| method: 'GET', | ||
| headers: { | ||
| 'Authorization': `Bearer ${user.value.jwt}` | ||
| } | ||
| } | ||
| ) | ||
| if (! response.ok) { | ||
| const message = await response.text() | ||
| throw new Error(message) | ||
| } | ||
| return await response.json() | ||
| } | ||
| const updateUser = async function(userId, userData){ | ||
| const apiURL = new URL(`${users_api}${userId}`) | ||
| let response = ref(); | ||
| try { | ||
| response.value = await fetch(apiURL, { | ||
| method: 'PATCH', | ||
| headers: { | ||
| 'Content-Type': 'application/json', | ||
| 'Authorization': `Bearer ${user.value.jwt}` | ||
| }, | ||
| body: JSON.stringify(userData) | ||
| }) | ||
| } catch (error) { | ||
| throw new Error('Sorry, we had an error connecting to the server.') | ||
| } | ||
| if (!response.value.ok) { | ||
| if (response.value.status === 400) { | ||
| throw new Error('You are not authorized to edit profile.') | ||
| } | ||
| if (response.value.status === 403) { | ||
| throw new Error("You can not update your own profile.") | ||
| } | ||
| throw new Error("Error contacting server.") | ||
| } | ||
| return await response.value.json() | ||
| } | ||
| export default { | ||
| userSearch, | ||
| updateUserReports, | ||
| getUser, | ||
| updateUser, | ||
| } | ||
| </script> |
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
Oops, something went wrong.