Skip to content
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.

Sign up for GitHub

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

Refactor to embeds #72

Merged
merged 15 commits into from
Mar 4, 2024
Merged

Refactor to embeds #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a4d1dd0
P1 - myTeams
ssb-jnk Feb 28, 2024
9601fa2
teamOverview p2
ssb-jnk Feb 29, 2024
b72a143
userProfile p1+p2
ssb-jnk Feb 29, 2024
fe46c9c
final refactor
ssb-jnk Mar 3, 2024
12bdda4
.
ssb-jnk Mar 3, 2024
89677ec
lint
ssb-jnk Mar 3, 2024
23c8e49
Merge branch 'develop' into refactor-to-embeds
ssb-jnk Mar 3, 2024
966e01e
lint problems
ssb-jnk Mar 3, 2024
abd5673
remove unused interface files
ssb-jnk Mar 3, 2024
2163c1e
re-add user
ssb-jnk Mar 3, 2024
90084d0
remove log
ssb-jnk Mar 3, 2024
0f8db02
remove dependencies to useEffect
ssb-jnk Mar 4, 2024
a1b0fb1
dep remove
ssb-jnk Mar 4, 2024
1ea44de
more dependencies
ssb-jnk Mar 4, 2024
77ddee0
.
ssb-jnk Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
252 changes: 7 additions & 245 deletions server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ import jwksClient from 'jwks-rsa'
import { getReasonPhrase } from 'http-status-codes'
import dotenv from 'dotenv'

// TODO: Do a massive cleanup. There are much of the code that can be re-written for reuseability, and some functions
// may not even be required anymore after dapla-team-api-redux changes.

if (!process.env.VITE_JWKS_URI) {
dotenv.config({ path: './.env.local' })
}
Expand Down Expand Up @@ -79,77 +76,16 @@ app.post('/api/verify-token', (req, res) => {
})
})

app.get('/api/teamOverview', tokenVerificationMiddleware, async (req, res, next) => {
const token = req.token
const principalName = req.user.email
const allteamsUrl = `${DAPLA_TEAM_API_URL}/teams`
const myTeamsUrl = `${DAPLA_TEAM_API_URL}/users/${principalName}/teams`

try {
const [allTeams, myTeams] = await Promise.all([
fetchAPIData(token, allteamsUrl, 'Failed to fetch all teams').then((teams) => getTeamOverviewTeams(token, teams)),
fetchAPIData(token, myTeamsUrl, 'Failed to fetch my teams').then((teams) => getTeamOverviewTeams(token, teams)),
])

const result = {
allTeams: {
count: allTeams.count,
...allTeams._embedded,
},
myTeams: {
count: myTeams.count,
...myTeams._embedded,
},
}

res.json(result)
} catch (error) {
next(error)
}
})

async function getTeamOverviewTeams(token, teams) {
const teamPromises = teams._embedded.teams.map(async (team) => {
const teamUniformName = team.uniform_name
const teamInfoUrl = `${DAPLA_TEAM_API_URL}/teams/${teamUniformName}`
const teamUsersUrl = `${DAPLA_TEAM_API_URL}/teams/${teamUniformName}/users`
const teamManagerUrl = `${DAPLA_TEAM_API_URL}/groups/${teamUniformName}-managers/users`

const [teamInfo, teamUsers, teamManager] = await Promise.all([
fetchAPIData(token, teamInfoUrl, 'Failed to fetch team info').catch(() => sectionFallback(teamUniformName)),
fetchAPIData(token, teamUsersUrl, 'Failed to fetch team users'),
fetchAPIData(token, teamManagerUrl, 'Failed to fetch team manager').catch(() => managerFallback()),
])
team['section_name'] = teamInfo.section_name
team['team_user_count'] = teamUsers.count
team['manager'] = teamManager.count > 0 ? teamManager._embedded.users[0] : managerFallback()

return { ...team }
})

const resolvedTeams = await Promise.all(teamPromises)
const validTeams = resolvedTeams.filter((team) => team !== null)

teams._embedded.teams = validTeams
teams.count = validTeams.length
return teams
}
// DO NOT REMOVE, NECCESSARY FOR FRONTEND
app.get('/api/photo/:principalName', tokenVerificationMiddleware, async (req, res, next) => {
const accessToken = req.token
const principalName = req.params.principalName
const userPhotoUrl = `${DAPLA_TEAM_API_URL}/users/${principalName}/photo`

app.get('/api/userProfile/:principalName', tokenVerificationMiddleware, async (req, res, next) => {
try {
const token = req.token
const principalName = req.params.principalName
const userProfileUrl = `${DAPLA_TEAM_API_URL}/users/${principalName}`
const userManagerUrl = `${DAPLA_TEAM_API_URL}/users/${principalName}/manager`
const userPhotoUrl = `${DAPLA_TEAM_API_URL}/users/${principalName}/photo`

const [userProfile, userManager, userPhoto] = await Promise.all([
fetchAPIData(token, userProfileUrl, 'Failed to fetch userProfile'),
fetchAPIData(token, userManagerUrl, 'Failed to fetch user manager').catch(() => managerFallback()),
fetchPhoto(token, userPhotoUrl, 'Failed to fetch user photo'),
])
const photoData = await fetchPhoto(accessToken, userPhotoUrl)

return res.json({ ...userProfile, manager: { ...userManager }, photo: userPhoto })
return res.send({ photo: photoData })
} catch (error) {
next(error)
}
Expand All @@ -167,162 +103,6 @@ async function fetchPhoto(token, url, fallbackErrorMessage) {
return photoBuffer.toString('base64')
}

async function getUserProfileTeamData(token, principalName, teams) {
const teamPromises = teams._embedded.teams.map(async (team) => {
const teamUniformName = team.uniform_name
const teamInfoUrl = `${DAPLA_TEAM_API_URL}/teams/${teamUniformName}`
const teamGroupsUrl = `${DAPLA_TEAM_API_URL}/teams/${teamUniformName}/groups`
const teamManagerUrl = `${DAPLA_TEAM_API_URL}/groups/${teamUniformName}-managers/users`

const [teamInfo, teamGroups, teamManager] = await Promise.all([
fetchAPIData(token, teamInfoUrl, 'Failed to fetch team info').catch(() => sectionFallback(teamUniformName)),
fetchAPIData(token, teamGroupsUrl, 'Failed to fetch groups').then((response) => {
const groupPromises = response._embedded.groups.map((group) => fetchUserGroups(group, token, principalName))
return Promise.all(groupPromises).then((groupsArrays) => groupsArrays.flat())
}),
fetchAPIData(token, teamManagerUrl, 'Failed to fetch team manager').catch(() => managerFallback()),
])

team['section_name'] = teamInfo.section_name
team['manager'] = teamManager.count > 0 ? teamManager._embedded.users[0] : managerFallback()
team['groups'] = teamGroups

return { ...team }
})

const resolvedTeams = await Promise.all(teamPromises)
const validTeams = resolvedTeams.filter((team) => team !== null)

teams._embedded.teams = validTeams
teams.count = validTeams.length
return teams
}

async function fetchUserGroups(group, token, principalName) {
const groupUsersUrl = `${DAPLA_TEAM_API_URL}/groups/${group.uniform_name}/users`
try {
const groupUsers = await fetchAPIData(token, groupUsersUrl, 'Failed to fetch group users')
if (!groupUsers._embedded || !groupUsers._embedded.users || groupUsers._embedded.users.length === 0) {
return []
}

return groupUsers._embedded.users
.filter((user) => user.principal_name === principalName)
.map(() => group.uniform_name)
} catch (error) {
console.error(`Error processing group ${group.uniform_name}:`, error)
throw error
}
}

app.get('/api/userProfile/:principalName/team', tokenVerificationMiddleware, async (req, res, next) => {
const token = req.token
const principalName = req.params.principalName
const myTeamsUrl = `${DAPLA_TEAM_API_URL}/users/${principalName}/teams`

try {
const [myTeams] = await Promise.all([
fetchAPIData(token, myTeamsUrl, 'Failed to fetch my teams').then((teams) =>
getUserProfileTeamData(token, principalName, teams)
),
])

const result = {
count: myTeams.count,
...myTeams._embedded,
}

res.json(result)
} catch (error) {
next(error)
}
})

app.get('/api/teamDetail/:teamUniformName', tokenVerificationMiddleware, async (req, res, next) => {
try {
const token = req.token
const teamUniformName = req.params.teamUniformName
const teamInfoUrl = `${DAPLA_TEAM_API_URL}/teams/${teamUniformName}`
const teamUsersUrl = `${DAPLA_TEAM_API_URL}/teams/${teamUniformName}/users`

const [teamInfo, teamUsers] = await Promise.all([
fetchAPIData(token, teamInfoUrl, 'Failed to fetch team info').then(async (teamInfo) => {
const manager = await fetchTeamManager(token, teamInfo.uniform_name)
return { ...teamInfo, manager }
}),
fetchAPIData(token, teamUsersUrl, 'Failed to fetch team users').then(async (teamUsers) => {
const resolvedUsers = await fetchTeamUsersWithGroups(token, teamUsers, teamUniformName)
return { ...teamUsers, _embedded: { users: resolvedUsers } }
}),
])

// TODO: Implement shared data tab
res.json({ teamUsers: { teamInfo, teamUsers: teamUsers._embedded.users } })
} catch (error) {
next(error)
}
})

async function fetchTeamManager(token, teamUniformName) {
const teamManagerUrl = `${DAPLA_TEAM_API_URL}/groups/${teamUniformName}-managers/users`
return await fetchAPIData(token, teamManagerUrl, 'Failed to fetch team manager')
.then((teamManager) => {
return teamManager.count > 0 ? teamManager._embedded.users[0] : managerFallback()
})
.catch(() => managerFallback())
}

async function fetchTeamUsersWithGroups(token, teamUsers, teamUniformName) {
const userPromises = teamUsers._embedded.users.map(async (user) => {
const userUrl = `${DAPLA_TEAM_API_URL}/users/${user.principal_name}`
const userGroupsUrl = `${DAPLA_TEAM_API_URL}/users/${user.principal_name}/groups`
const currentUser = await fetchAPIData(token, userUrl, 'Failed to fetch user')
const groups = await fetchAPIData(token, userGroupsUrl, 'Failed to fetch groups').catch(() => groupFallback())

const flattenedGroups = groups._embedded.groups
.filter((group) => group !== null && group.uniform_name.startsWith(teamUniformName))
.flatMap((group) => group)

currentUser.groups = flattenedGroups

return { ...currentUser }
})
return await Promise.all(userPromises)
}

async function fetchAPIData(token, url, fallbackErrorMessage) {
const response = await fetch(url, getFetchOptions(token))
const wwwAuthenticate = response.headers.get('www-authenticate')

if (!response.ok) {
const { error_description } = wwwAuthenticate
? parseWwwAuthenticate(wwwAuthenticate)
: { error_description: fallbackErrorMessage }
throw new APIError(error_description, response.status)
}

return response.json()
}

function parseWwwAuthenticate(header) {
const parts = header.split(',')
const result = {}

parts.forEach((part) => {
const [key, value] = part.trim().split('=')
result[key] = value.replace(/"/g, '')
})

return result
}

class APIError extends Error {
constructor(message, statusCode) {
super(message)
this.statusCode = statusCode
}
}

function getFetchOptions(token) {
return {
method: 'GET',
Expand Down Expand Up @@ -362,24 +142,6 @@ app.use((err, req, res, next) => {
})
})

function managerFallback() {
return {
display_name: 'Mangler ansvarlig',
principal_name: 'Mangler ansvarlig',
}
}

function sectionFallback(uniformName) {
return {
uniform_name: uniformName,
section_name: 'Mangler seksjon',
}
}

function groupFallback() {
return { _embedded: { groups: [] }, count: '0' }
}

//const lightship = await createLightship();
// Replace above with below to get liveness and readiness probes when running locally
const lightship = await createLightship({ detectKubernetes: false })
Expand Down
8 changes: 0 additions & 8 deletions src/@types/error.ts
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions src/@types/group.ts
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/@types/team.ts
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions src/@types/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { Group } from '../@types/group'

export interface User {
principal_name: string
azure_ad_id: string
Expand All @@ -11,7 +9,6 @@ export interface User {
division_code?: number
section_name?: string
section_code?: number
manager?: User
section_manager?: User
photo?: string
groups?: Group[]
}
4 changes: 1 addition & 3 deletions src/components/Avatar/Avatar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ const Avatar = () => {
if (!userProfile) return

setUserProfileData(userProfile)
setEncodedURI(
`/teammedlemmer/${encodeURIComponent(userProfile.principal_name ? userProfile.principal_name.split('@')[0] : userProfile.email.split('@')[0])}`
)
setEncodedURI(`/teammedlemmer/${userProfile.principal_name}`)
johnnadeluy marked this conversation as resolved.
Show resolved Hide resolved
setFallbackInitials(userProfile.first_name[0] + userProfile.last_name[0])

const base64Image = userProfile?.photo
Expand Down
Loading