acinguiux-dnr-utils 0.0.1 → 0.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "acinguiux-dnr-utils",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "dependencies": {
     "@auth/core": "^0.41.1",
     "@grafana/faro-web-sdk": "^1.19.0",

package/src/authentication/auth.ts

@@ -4,11 +4,17 @@ import type { Session } from "next-auth";
 import { callbacks } from "./callbacks";
 import PingID from "./provider";
 
+type AuthSession = Session & {
+  expires_at?: number;
+  access_token?: string;
+  refresh_token?: string;
+};
+
 const isAuthDisabled = ["true", "1", "yes"].includes(
   (process.env.AUTH_DISABLED || "").toLowerCase(),
 );
 
-const mockSession: Session = {
+const mockSession: AuthSession = {
   user: {
     name: "Local User",
     email: "local.user@example.com",

package/src/authentication/callbacks.ts

@@ -2,7 +2,19 @@ import type { NextRequest } from "next/server.js";
 import type { Account, Session } from "next-auth";
 import type { JWT } from "next-auth/jwt";
 
-async function jwt({ token, account }: { token: JWT; account?: Account | null }) {
+type AuthJWT = JWT & {
+  expires_at?: number;
+  access_token?: string;
+  refresh_token?: string;
+};
+
+type AuthSession = Session & {
+  expires_at?: number;
+  access_token?: string;
+  refresh_token?: string;
+};
+
+async function jwt({ token, account }: { token: AuthJWT; account?: Account | null }) {
   // The first time jwt is called, account exists. We map fields from account to token
   // which is passed to the session callback. User is also available in this callback which
   // comes from the profile function in the provider. We can use this in the future to surface
@@ -46,7 +58,7 @@ async function jwt({ token, account }: { token: JWT; account?: Account | null })
   return token;
 }
 
-async function session({ session, token }: { session: Session; token: JWT }) {
+async function session({ session, token }: { session: AuthSession; token: AuthJWT }) {
   // We map fields from token to make them available in the session.
   session.expires_at = token.expires_at;
   session.access_token = token.access_token;
@@ -54,7 +66,7 @@ async function session({ session, token }: { session: Session; token: JWT }) {
   return session;
 }
 
-async function authorized({ auth }: { request: NextRequest; auth: Session | null }) {
+async function authorized({ auth }: { request: NextRequest; auth: AuthSession | null }) {
   // If there is no access token, the user is not authorized. Returning false from this
   // callback will redirect the user to the sign in page.