Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/puny-sloths-joke.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@tern-secure/backend': patch
'@tern-secure/nextjs': patch
---

feat: import retriever user from backend
12 changes: 6 additions & 6 deletions apps/test/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ export default async function RootLayout({
<body className={`${geistSans.variable} ${geistMono.variable} antialiased`}>
<TernSecureProvider
appName='TernSecure'
appCheck={{
provider: 'reCaptchaV3',
siteKey: '6LfzGRgsAAAAAGEvbwbcLgT4IHWmuWv4kEDRA5hi',
//appCheck={{
// provider: 'reCaptchaV3',
// siteKey: '6LfzGRgsAAAAAGEvbwbcLgT4IHWmuWv4kEDRA5hi',
//siteKey: '6Lc2aCIsAAAAAAZ2fYnqkPGqGnlsi6KE94qEzGKX',
//siteKey: '6LfophwsAAAAAMvW43vd87iiuBCWDRYQZGS0rsRH',
isTokenAutoRefreshEnabled: true,
debugToken: process.env.FIREBASE_APPCHECK_DEBUG_TOKEN || false,
}}
// isTokenAutoRefreshEnabled: true,
// debugToken: process.env.FIREBASE_APPCHECK_DEBUG_TOKEN || false,
//</body> }}
//requiresVerification={false}
persistence='browserCookie'
ternUIUrl='http://localhost:4000/ternsecure.browser.js'
Expand Down
2 changes: 1 addition & 1 deletion apps/test/app/protected/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const dynamic = 'force-dynamic';

export default async function ProtectedPage() {
const { user, require, redirectToSignIn } = await auth();
if (!require({ role: 'admin' })) return <div>Access Denied</div>;
if (!require({ role: 'admin' })) return <div>Access Denied now</div>;

if (!user) return redirectToSignIn();

Expand Down
5 changes: 4 additions & 1 deletion apps/test/app/protected/protectedClient.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
"use client";

import { useRouter } from "next/navigation";
import type { TernSecureUser } from "@tern-secure/nextjs";

export type SerializableTernSecureUser = Omit<TernSecureUser, 'delete' | 'getIdToken' | 'getIdTokenResult' | 'reload' | 'toJSON'>;

interface ProtectedPageClientProps {
user: any;
user: SerializableTernSecureUser;
}

export function ProtectedPageClient({
Expand Down
23 changes: 0 additions & 23 deletions apps/test/app/user/page.tsx

This file was deleted.

17 changes: 9 additions & 8 deletions packages/backend/src/admin/index.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
export {
createSessionCookie,
export {
createSessionCookie,
createCustomTokenClaims,
clearSessionCookie
} from './sessionTernSecure'
export {
adminTernSecureAuth,
adminTernSecureDb,
export {
adminTernSecureAuth,
adminTernSecureDb,
appCheckAdmin,
TernSecureTenantManager
TernSecureTenantManager
} from '../utils/admin-init'
export { initializeAdminConfig } from '../utils/config'
export { createTenant, createTenantUser } from './tenant'
export {
export {
CreateNextSessionCookie,
GetNextServerSessionCookie,
GetNextIdToken,
Expand All @@ -24,4 +24,5 @@ export {

export type { SignInAuthObject, RequestState } from '../instance/backendInstance'
export { createBackendInstance, authenticateRequest, signedIn } from '../instance/backendInstance'
export { RetrieveUser } from './user'
export { RetrieveUser } from './user'
export type { UserRecord } from './user'
5 changes: 4 additions & 1 deletion packages/backend/src/admin/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,7 @@ export function RetrieveUser(tenantId?: string) {
getUserByEmail,
getUserByPhoneNumber,
}
}
}


export type { UserRecord }
3 changes: 2 additions & 1 deletion packages/nextjs/src/app-router/admin/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ export {
createSessionCookieServer,
createNextSessionCookie,
setNextServerSession,
setNextServerToken
setNextServerToken,
RetrieveUser
} from './actions'

export { EndpointRouter } from './endpointRouter'
Expand Down
Loading