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

Feat(rbac) azure entra #86

Merged
merged 6 commits into from
Jan 31, 2025
Merged

Feat(rbac) azure entra #86

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7dd2a4a
show name when logged in via azure
GailMelanie Jan 30, 2025
65db089
give user role if no roles set
GailMelanie Jan 30, 2025
98d2afd
azure entra id get roles
GailMelanie Jan 30, 2025
1244343
azure entra id get roles
GailMelanie Jan 30, 2025
c27b6df
get roles always from id_token
GailMelanie Jan 30, 2025
ce939a5
remove unnecessary if
GailMelanie Jan 31, 2025
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
20 changes: 15 additions & 5 deletions src/components/authentication/authConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const authOptions: AuthOptions = {
callbacks: {
async jwt({ token, account }) {
let roles = null;
let userName: string | null = null;

const nowTimeStamp = Math.floor(Date.now() / 1000);

Expand All @@ -59,16 +60,21 @@ export const authOptions: AuthOptions = {
token.expires_at = account.expires_at;
token.refresh_token = account.refresh_token;

// The Roles are stored inside the access_token
if (account.access_token) {
const decodedToken = jwt.decode(account.access_token);
// The roles are stored inside the id_token
if (account.id_token) {
const decodedToken = jwt.decode(account.id_token);
if (decodedToken) {
if (account.provider === 'azure-ad') {
// @ts-expect-error name exits
userName = decodedToken.name;
}
// @ts-expect-error role exits
roles = decodedToken?.role;
roles = decodedToken.roles;
}
}

// Store Roles inside token
return { ...token, roles: roles };
return { ...token, roles: roles, ad_name: userName };
} else if (nowTimeStamp < (token.expires_at as number)) {
return token;
}
Expand All @@ -89,6 +95,10 @@ export const authOptions: AuthOptions = {
session.accessToken = token.access_token as string;
session.idToken = token.id_token as string;
session.user.roles = token.roles as string[];
// Azure Entra ID:
if (token.ad_name) {
session.user.name = token.ad_name as string;
}
return session;
},
},
Expand Down
4 changes: 2 additions & 2 deletions src/lib/hooks/UseAuth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ export function useAuth(): Auth {
);
},
getAccount: (): Session | null => {
if (session && session.user.roles) {
if (session && session.user) {
// MnestixUser is the default role for a logged-in user
if (session.user) {
session.user.mnestixRole = MnestixRole.MnestixUser;
session.user.allowedRoutes = AllowedRoutes.mnestixUser;
}
if (session.user.roles.find((role) => role === MnestixRole.MnestixAdmin)) {
if (session.user.roles && session.user.roles.find((role) => role === MnestixRole.MnestixAdmin)) {
session.user.mnestixRole = MnestixRole.MnestixAdmin;
session.user.allowedRoutes = AllowedRoutes.mnestixAdmin;
}
Expand Down