uibee 2.8.6 → 2.8.7

package/dist/src/utils/auth/callback.d.ts

@@ -1,2 +1,2 @@
 import type { AuthCallbackProps } from 'uibee/utils';
-export default function authCallback({ req, tokenURL, clientID, clientSecret, redirectURL, userInfoURL, tokenRedirectURL }: AuthCallbackProps): Promise<Response>;
+export default function authCallback({ req, tokenURL, clientID, clientSecret, redirectPath, userInfoURL, tokenRedirectPath }: AuthCallbackProps): Promise<Response>;

package/dist/src/utils/auth/callback.js

@@ -1,5 +1,7 @@
 import { NextResponse } from 'next/server';
-export default async function authCallback({ req, tokenURL, clientID, clientSecret, redirectURL, userInfoURL, tokenRedirectURL }) {
+import { getDomain } from './getDomain';
+export default async function authCallback({ req, tokenURL, clientID, clientSecret, redirectPath, userInfoURL, tokenRedirectPath }) {
+    const domain = getDomain(req);
     const searchParams = new URL(req.url).searchParams;
     if (!searchParams) {
         return NextResponse.json({ error: 'No search parameters found.' }, { status: 400 });
@@ -17,7 +19,7 @@ export default async function authCallback({ req, tokenURL, clientID, clientSecr
                 client_id: clientID,
                 client_secret: clientSecret,
                 code: code,
-                redirect_uri: redirectURL,
+                redirect_uri: `${domain}${redirectPath}`,
                 grant_type: 'authorization_code',
             }).toString()
         });
@@ -41,7 +43,7 @@ export default async function authCallback({ req, tokenURL, clientID, clientSecr
             });
         }
         const userInfo = await userInfoResponse.json();
-        const redirectUrl = new URL(tokenRedirectURL);
+        const redirectUrl = new URL(`${domain}${tokenRedirectPath}`);
         const params = new URLSearchParams({
             id: userInfo.sub,
             name: userInfo.name,

package/dist/src/utils/auth/getDomain.d.ts

@@ -0,0 +1,2 @@
+import { NextRequest } from 'next/server';
+export declare function getDomain(req: NextRequest): string;

package/dist/src/utils/auth/getDomain.js

@@ -0,0 +1,5 @@
+export function getDomain(req) {
+    const proto = req.headers.get('x-forwarded-proto') ?? new URL(req.url).protocol.replace(':', '');
+    const host = req.headers.get('x-forwarded-host') ?? req.headers.get('host') ?? new URL(req.url).host;
+    return `${proto}://${host}`;
+}

package/dist/src/utils/auth/login.d.ts

@@ -1,3 +1,3 @@
 import { NextResponse } from 'next/server';
 import type { AuthLoginProps } from 'uibee/utils';
-export default function AuthLogin({ clientID, redirectURL, authURL }: AuthLoginProps): Promise<NextResponse<unknown>>;
+export default function AuthLogin({ req, clientID, redirectPath, authURL }: AuthLoginProps): Promise<NextResponse<unknown>>;

package/dist/src/utils/auth/login.js

@@ -1,9 +1,11 @@
 import { NextResponse } from 'next/server';
-export default async function AuthLogin({ clientID, redirectURL, authURL }) {
+import { getDomain } from './getDomain';
+export default async function AuthLogin({ req, clientID, redirectPath, authURL }) {
+    const domain = getDomain(req);
     const state = Math.random().toString(36).substring(5);
     const authQueryParams = new URLSearchParams({
         client_id: clientID,
-        redirect_uri: redirectURL,
+        redirect_uri: `${domain}${redirectPath}`,
         response_type: 'code',
         scope: 'openid profile email',
         state: state,

package/dist/src/utils/auth/logout.d.ts

@@ -1,3 +1,3 @@
 import { NextResponse } from 'next/server';
 import type { AuthLogoutProps } from 'uibee/utils';
-export default function AuthLogout({ frontendURL, path }: AuthLogoutProps): Promise<NextResponse<unknown>>;
+export default function AuthLogout({ req, path }: AuthLogoutProps): Promise<NextResponse<unknown>>;

package/dist/src/utils/auth/logout.js

@@ -1,6 +1,8 @@
 import { NextResponse } from 'next/server';
-export default async function AuthLogout({ frontendURL, path }) {
-    const response = NextResponse.redirect(new URL(path || '/', frontendURL));
+import { getDomain } from './getDomain';
+export default async function AuthLogout({ req, path }) {
+    const domain = getDomain(req);
+    const response = NextResponse.redirect(new URL(path || '/', domain));
     const cookiesToRemove = [
         'access_token',
         'user_id',

package/dist/src/utils/auth/token.d.ts

@@ -1,3 +1,3 @@
 import { NextResponse } from 'next/server';
 import type { AuthTokenProps } from 'uibee/utils';
-export default function AuthToken({ req, frontendURL, redirectPath }: AuthTokenProps): Promise<NextResponse<unknown>>;
+export default function AuthToken({ req, redirectPath }: AuthTokenProps): Promise<NextResponse<unknown>>;

package/dist/src/utils/auth/token.js

@@ -1,5 +1,7 @@
 import { NextResponse } from 'next/server';
-export default async function AuthToken({ req, frontendURL, redirectPath }) {
+import { getDomain } from './getDomain';
+export default async function AuthToken({ req, redirectPath }) {
+    const domain = getDomain(req);
     const url = new URL(req.url);
     const token = url.searchParams.get('access_token');
     const btg = url.searchParams.get('btg');
@@ -9,7 +11,7 @@ export default async function AuthToken({ req, frontendURL, redirectPath }) {
         return NextResponse.json({ error: 'No access token provided' }, { status: 400 });
     }
     if (btg) {
-        return NextResponse.redirect(new URL(redirect, frontendURL));
+        return NextResponse.redirect(new URL(redirect, domain));
     }
     const accessToken = url.searchParams.get('access_token');
     const userID = url.searchParams.get('id');
@@ -17,7 +19,7 @@ export default async function AuthToken({ req, frontendURL, redirectPath }) {
     const userNickname = url.searchParams.get('username');
     const userEmail = url.searchParams.get('email');
     const userGroups = url.searchParams.get('groups');
-    const response = NextResponse.redirect(new URL(redirect, frontendURL));
+    const response = NextResponse.redirect(new URL(redirect, domain));
     response.cookies.set('access_token', accessToken);
     response.cookies.set('user_id', userID);
     response.cookies.set('user_name', username);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uibee",
-  "version": "2.8.6",
+  "version": "2.8.7",
   "description": "Shared components, functions and hooks for reuse across Login projects",
   "homepage": "https://github.com/Login-Linjeforening-for-IT/uibee#readme",
   "bugs": {

package/src/types/utils.d.ts

@@ -2,30 +2,30 @@
 import { NextRequest } from 'next/server'
 declare module 'uibee/utils' {
     export interface AuthLoginProps {
+        req: NextRequest
         clientID: string
-        redirectURL: string
+        redirectPath: string
         authURL: string
     }
 
     export interface AuthCallbackProps {
-        req: Request
+        req: NextRequest
         tokenURL: string
         clientID: string
         clientSecret: string
-        redirectURL: string
+        redirectPath: string
         userInfoURL: string
-        tokenRedirectURL: string
+        tokenRedirectPath: string
     }
 
     export interface AuthTokenProps {
         req: NextRequest
-        frontendURL: string
         redirectPath?: string
     }
+
     export interface AuthLogoutProps {
-        request: NextRequest
+        req: NextRequest
         path?: string
-        frontendURL: string
     }
 
     export default async function authLogin(props: AuthLoginProps): Promise<Response>;

package/src/utils/auth/callback.ts

@@ -1,5 +1,6 @@
 import { NextResponse } from 'next/server'
 import type { AuthCallbackProps } from 'uibee/utils'
+import { getDomain } from './getDomain'
 
 type UserInfo = {
     sub: string
@@ -14,10 +15,11 @@ export default async function authCallback({
     tokenURL,
     clientID,
     clientSecret,
-    redirectURL,
+    redirectPath,
     userInfoURL,
-    tokenRedirectURL
+    tokenRedirectPath
 }: AuthCallbackProps) {
+    const domain = getDomain(req)
     const searchParams = new URL(req.url).searchParams
 
     if (!searchParams) {
@@ -38,7 +40,7 @@ export default async function authCallback({
                 client_id: clientID,
                 client_secret: clientSecret,
                 code: code as string,
-                redirect_uri: redirectURL,
+                redirect_uri: `${domain}${redirectPath}`,
                 grant_type: 'authorization_code',
             }).toString()
         })
@@ -69,7 +71,7 @@ export default async function authCallback({
 
         const userInfo = await userInfoResponse.json() as UserInfo
 
-        const redirectUrl = new URL(tokenRedirectURL)
+        const redirectUrl = new URL(`${domain}${tokenRedirectPath}`)
         const params = new URLSearchParams({
             id: userInfo.sub,
             name: userInfo.name,

package/src/utils/auth/getDomain.ts

@@ -0,0 +1,7 @@
+import { NextRequest } from 'next/server'
+
+export function getDomain(req: NextRequest): string {
+    const proto = req.headers.get('x-forwarded-proto') ?? new URL(req.url).protocol.replace(':', '')
+    const host = req.headers.get('x-forwarded-host') ?? req.headers.get('host') ?? new URL(req.url).host
+    return `${proto}://${host}`
+}

package/src/utils/auth/login.ts

@@ -1,11 +1,13 @@
 import { NextResponse } from 'next/server'
 import type { AuthLoginProps } from 'uibee/utils'
+import { getDomain } from './getDomain'
 
-export default async function AuthLogin({ clientID, redirectURL, authURL }: AuthLoginProps) {
+export default async function AuthLogin({ req, clientID, redirectPath, authURL }: AuthLoginProps) {
+    const domain = getDomain(req)
     const state = Math.random().toString(36).substring(5)
     const authQueryParams = new URLSearchParams({
         client_id: clientID,
-        redirect_uri: redirectURL,
+        redirect_uri: `${domain}${redirectPath}`,
         response_type: 'code',
         scope: 'openid profile email',
         state: state,

package/src/utils/auth/logout.ts

@@ -1,8 +1,10 @@
 import { NextResponse } from 'next/server'
 import type { AuthLogoutProps } from 'uibee/utils'
+import { getDomain } from './getDomain'
 
-export default async function AuthLogout({ frontendURL, path }: AuthLogoutProps) {
-    const response = NextResponse.redirect(new URL(path || '/', frontendURL))
+export default async function AuthLogout({ req, path }: AuthLogoutProps) {
+    const domain = getDomain(req)
+    const response = NextResponse.redirect(new URL(path || '/', domain))
 
     const cookiesToRemove = [
         'access_token',

package/src/utils/auth/token.ts

@@ -1,7 +1,9 @@
 import { NextResponse } from 'next/server'
 import type { AuthTokenProps } from 'uibee/utils'
+import { getDomain } from './getDomain'
 
-export default async function AuthToken({ req, frontendURL, redirectPath }: AuthTokenProps) {
+export default async function AuthToken({ req, redirectPath }: AuthTokenProps) {
+    const domain = getDomain(req)
     const url = new URL(req.url)
     const token = url.searchParams.get('access_token')
     const btg = url.searchParams.get('btg')
@@ -13,7 +15,7 @@ export default async function AuthToken({ req, frontendURL, redirectPath }: Auth
     }
 
     if (btg) {
-        return NextResponse.redirect(new URL(redirect, frontendURL))
+        return NextResponse.redirect(new URL(redirect, domain))
     }
 
     const accessToken = url.searchParams.get('access_token')!
@@ -23,7 +25,7 @@ export default async function AuthToken({ req, frontendURL, redirectPath }: Auth
     const userEmail = url.searchParams.get('email')!
     const userGroups = url.searchParams.get('groups')!
 
-    const response = NextResponse.redirect(new URL(redirect, frontendURL))
+    const response = NextResponse.redirect(new URL(redirect, domain))
     response.cookies.set('access_token', accessToken)
     response.cookies.set('user_id', userID)
     response.cookies.set('user_name', username)