@@ -57,7 +59,7 @@ export default async function User({ params }: PropTypes) {
{`${profile.user.firstname} ${profile.user.lastname}`}
-
@@ -67,7 +69,7 @@ export default async function User({ params }: PropTypes) {
-
+ }
{
studyProgramme && (
diff --git a/src/jwt/jwt.ts b/src/jwt/jwt.ts
index beee35138..d9eec9036 100644
--- a/src/jwt/jwt.ts
+++ b/src/jwt/jwt.ts
@@ -29,7 +29,7 @@ export function generateJWT
(
throw new ServerError('INVALID CONFIGURATION', 'Missing secret for JWT generation')
}
- return sign(payload, asymetric ? process.env.JWT_PRIVATE_KEY : process.env.NEXTAUTH_SECRET, {
+ return sign(payload, Buffer.from(asymetric ? process.env.JWT_PRIVATE_KEY : process.env.NEXTAUTH_SECRET), {
audience: aud,
algorithm: asymetric ? 'ES256' : 'HS256',
issuer: JWT_ISSUER,
diff --git a/src/services/omegaid/ConfigVars.ts b/src/services/omegaid/ConfigVars.ts
index 712955b03..dfad0f692 100644
--- a/src/services/omegaid/ConfigVars.ts
+++ b/src/services/omegaid/ConfigVars.ts
@@ -1,11 +1,2 @@
-import type { UserFiltered } from '@/services/users/Types'
-
-
-export const omegaIdFields = [
- 'id',
- 'firstname',
- 'lastname',
- 'username',
-] as const satisfies (keyof UserFiltered)[]
export const OmegaIdExpiryTime = 60 * 5 // 5 minutes
diff --git a/src/services/omegaid/Types.ts b/src/services/omegaid/Types.ts
index 981fe9f8b..3d82cbe70 100644
--- a/src/services/omegaid/Types.ts
+++ b/src/services/omegaid/Types.ts
@@ -1,11 +1,9 @@
-import type { omegaIdFields } from './ConfigVars'
import type { UserFiltered } from '@/services/users/Types'
-export type OmegaId = Pick
+export type OmegaId = Pick
export type OmegaIdJWT = {
+ iat: number,
+ exp: number,
sub: UserFiltered['id'],
- usrnm: UserFiltered['username'],
- gn: UserFiltered['firstname'],
- sn: UserFiltered['lastname'],
}
diff --git a/src/services/omegaid/compress.ts b/src/services/omegaid/compress.ts
new file mode 100644
index 000000000..6f32b56fd
--- /dev/null
+++ b/src/services/omegaid/compress.ts
@@ -0,0 +1,110 @@
+import { JWT_ISSUER } from '@/auth/ConfigVars'
+import type { ActionReturn, ActionReturnError } from '@/actions/Types'
+import type { OmegaIdJWT } from '@/services/omegaid/Types'
+
+/**
+ * This file handles compression and decompression of omegaID
+ */
+export function compressOmegaId(token: string): string {
+ const parts = token.split('.')
+ const payloadCompressed = compressPayload(parts[1])
+ const payload = base64ToBigInt(payloadCompressed)
+ const sign = base64ToBigInt(parts[2])
+ const ret = `${payload}.${sign}`
+ return ret
+}
+
+function decodeBase64Url(base64: string) {
+ return atob(base64.replaceAll('-', '+').replaceAll('_', '/'))
+}
+
+function encodeBase64Url(data: string): string {
+ return btoa(data).replaceAll('+', '-').replaceAll('/', '_').replaceAll('=', '')
+}
+
+function base64ToBigInt(base64: string): string {
+ const binaryString = decodeBase64Url(base64)
+ let bigint = BigInt(0)
+
+ // Convert binary string to BigInt
+ for (let i = 0; i < binaryString.length; i++) {
+ bigint = (bigint << BigInt(8)) | BigInt(binaryString.charCodeAt(i))
+ }
+
+ return bigint.toString()
+}
+
+function bigIntToBase64(bigIntString: string): string {
+ let bigInt = BigInt(bigIntString)
+ let binaryString = ''
+
+ while (bigInt > BigInt(0)) {
+ const nextChar = bigInt & BigInt(0xFF)
+ binaryString += String.fromCharCode(Number(nextChar))
+ bigInt >>= BigInt(8)
+ }
+
+ binaryString = binaryString.split('').reverse().join('')
+
+ return encodeBase64Url(binaryString)
+}
+
+function compressPayload(payload: string): string {
+ const binaryString = decodeBase64Url(payload)
+ const payloadString = binaryString.toString()
+ const payloadJSON = JSON.parse(payloadString) as OmegaIdJWT
+ const shortPayloadString = `${payloadJSON.sub},${payloadJSON.iat},${payloadJSON.exp}`
+ return encodeBase64Url(shortPayloadString)
+}
+
+function decompressPayload(rawdata: string): string {
+ const base64String = bigIntToBase64(rawdata)
+ const byteString = decodeBase64Url(base64String)
+ const dataString = byteString.toString().split(',')
+ const payload = {
+ sub: Number(dataString[0]),
+ iat: Number(dataString[1]),
+ exp: Number(dataString[2]),
+ aud: 'omegaid',
+ iss: JWT_ISSUER,
+ }
+ const payloadString = JSON.stringify(payload)
+
+ return encodeBase64Url(payloadString)
+}
+
+export function decomporessOmegaId(rawdata: string): ActionReturn {
+ const header = {
+ alg: 'ES256',
+ typ: 'JWT'
+ }
+ const headerJSONString = JSON.stringify(header)
+ const headerB64String = encodeBase64Url(headerJSONString)
+
+ const errorReturn: ActionReturnError = {
+ success: false,
+ errorCode: 'JWT INVALID',
+ httpCode: 400,
+ error: [{
+ message: 'QR code is not an OmegaId',
+ }],
+ }
+
+ const rawDataSplit = rawdata.split('.')
+ if (rawDataSplit.length !== 2) {
+ return errorReturn
+ }
+
+ try {
+ const payload = decompressPayload(rawDataSplit[0])
+
+ const signature = bigIntToBase64(rawDataSplit[1])
+
+ return {
+ success: true,
+ data: `${headerB64String}.${payload}.${signature}`,
+ }
+ } catch {
+ return errorReturn
+ }
+}
diff --git a/src/services/omegaid/generate.ts b/src/services/omegaid/generate.ts
index b05f3b141..6a6377016 100644
--- a/src/services/omegaid/generate.ts
+++ b/src/services/omegaid/generate.ts
@@ -1,15 +1,12 @@
import 'server-only'
import { OmegaIdExpiryTime } from './ConfigVars'
import { generateJWT } from '@/jwt/jwt'
-import type { OmegaId, OmegaIdJWT } from './Types'
+import type { OmegaId } from './Types'
export function generateOmegaId(user: OmegaId): string {
- const payload: OmegaIdJWT = {
+ const payload = {
sub: user.id,
- usrnm: user.username,
- gn: user.firstname,
- sn: user.lastname,
}
return generateJWT('omegaid', payload, OmegaIdExpiryTime, true)