fix: faculty users are now recognized as employees

routes/(apps)/students/api/promotions.ts

@@ -1,7 +1,7 @@
 import { FreshContext, Handlers } from "$fresh/server.ts";
 import { db } from "$root/databases/db.ts";
 import { promotions } from "$root/databases/schema.ts";
-import { AuthenticatedState } from "$root/defaults/interfaces.ts";
+import { AuthenticatedState, isEmployee } from "$root/defaults/interfaces.ts";
 
 export const handler: Handlers<null, AuthenticatedState> = {
   // #13 GET /promotions
@@ -9,7 +9,7 @@ export const handler: Handlers<null, AuthenticatedState> = {
     _request: Request,
     context: FreshContext<AuthenticatedState>,
   ): Promise<Response> {
-    if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
+    if (!isEmployee(context.state.session)) {
       return new Response(JSON.stringify([]), {
         headers: { "content-type": "application/json" },
       });
@@ -26,7 +26,7 @@ export const handler: Handlers<null, AuthenticatedState> = {
     request: Request,
     context: FreshContext<AuthenticatedState>,
   ): Promise<Response> {
-    if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
+    if (!isEmployee(context.state.session)) {
       return new Response(null, { status: 403 });
     }
 

routes/(apps)/students/api/promotions/[idPromo].ts

@@ -10,7 +10,7 @@ import {
   ueModules,
   ues,
 } from "$root/databases/schema.ts";
-import { AuthenticatedState } from "$root/defaults/interfaces.ts";
+import { AuthenticatedState, isEmployee } from "$root/defaults/interfaces.ts";
 import { eq } from "npm:drizzle-orm@0.45.2";
 
 const NOT_FOUND = () =>
@@ -27,7 +27,7 @@ export const handler: Handlers<null, AuthenticatedState> = {
     _request: Request,
     context: FreshContext<AuthenticatedState>,
   ): Promise<Response> {
-    if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
+    if (!isEmployee(context.state.session)) {
       return FORBIDDEN();
     }
 
@@ -49,7 +49,7 @@ export const handler: Handlers<null, AuthenticatedState> = {
     request: Request,
     context: FreshContext<AuthenticatedState>,
   ): Promise<Response> {
-    if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
+    if (!isEmployee(context.state.session)) {
       return FORBIDDEN();
     }
 
@@ -76,7 +76,7 @@ export const handler: Handlers<null, AuthenticatedState> = {
     _request: Request,
     context: FreshContext<AuthenticatedState>,
   ): Promise<Response> {
-    if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
+    if (!isEmployee(context.state.session)) {
       return FORBIDDEN();
     }
 

routes/(apps)/students/api/students.ts

@@ -1,7 +1,7 @@
 import { FreshContext, Handlers } from "$fresh/server.ts";
 import { db } from "$root/databases/db.ts";
 import { students } from "$root/databases/schema.ts";
-import { AuthenticatedState } from "$root/defaults/interfaces.ts";
+import { AuthenticatedState, isEmployee } from "$root/defaults/interfaces.ts";
 import { eq } from "npm:drizzle-orm@0.45.2";
 
 export const handler: Handlers<null, AuthenticatedState> = {
@@ -10,7 +10,7 @@ export const handler: Handlers<null, AuthenticatedState> = {
     request: Request,
     context: FreshContext<AuthenticatedState>,
   ): Promise<Response> {
-    if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
+    if (!isEmployee(context.state.session)) {
       return new Response(JSON.stringify([]), {
         headers: { "content-type": "application/json" },
       });
@@ -33,7 +33,7 @@ export const handler: Handlers<null, AuthenticatedState> = {
     request: Request,
     context: FreshContext<AuthenticatedState>,
   ): Promise<Response> {
-    if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
+    if (!isEmployee(context.state.session)) {
       return new Response(null, { status: 403 });
     }
 

routes/(apps)/students/api/students/[numEtud].ts

@@ -7,7 +7,7 @@ import {
   stages,
   students,
 } from "$root/databases/schema.ts";
-import { AuthenticatedState } from "$root/defaults/interfaces.ts";
+import { AuthenticatedState, isEmployee } from "$root/defaults/interfaces.ts";
 import { eq } from "npm:drizzle-orm@0.45.2";
 
 const NOT_FOUND = () =>
@@ -24,7 +24,7 @@ export const handler: Handlers<null, AuthenticatedState> = {
     _request: Request,
     context: FreshContext<AuthenticatedState>,
   ): Promise<Response> {
-    if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
+    if (!isEmployee(context.state.session)) {
       return FORBIDDEN();
     }
 
@@ -47,7 +47,7 @@ export const handler: Handlers<null, AuthenticatedState> = {
     request: Request,
     context: FreshContext<AuthenticatedState>,
   ): Promise<Response> {
-    if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
+    if (!isEmployee(context.state.session)) {
       return FORBIDDEN();
     }
 
@@ -86,7 +86,7 @@ export const handler: Handlers<null, AuthenticatedState> = {
     _request: Request,
     context: FreshContext<AuthenticatedState>,
   ): Promise<Response> {
-    if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
+    if (!isEmployee(context.state.session)) {
       return FORBIDDEN();
     }
 

routes/(apps)/students/api/students/import-csv.ts

@@ -1,7 +1,7 @@
 import { FreshContext, Handlers } from "$fresh/server.ts";
 import { db } from "$root/databases/db.ts";
 import { students } from "$root/databases/schema.ts";
-import { AuthenticatedState } from "$root/defaults/interfaces.ts";
+import { AuthenticatedState, isEmployee } from "$root/defaults/interfaces.ts";
 
 // #9 POST /students/import-csv
 export const handler: Handlers<null, AuthenticatedState> = {
@@ -9,7 +9,7 @@ export const handler: Handlers<null, AuthenticatedState> = {
     request: Request,
     context: FreshContext<AuthenticatedState>,
   ): Promise<Response> {
-    if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
+    if (!isEmployee(context.state.session)) {
       return new Response(null, { status: 403 });
     }