Adjust config and JWT endpoint for 55 (#20)

Co-authored-by: Timofei Kachalov <[email protected]>

Author: oisincoveney

docker-compose.yml

@@ -31,7 +31,7 @@ services:
         NEXT_PUBLIC_METABASE_INSTANCE_URL: "http://localhost:${MB_PORT}"
         METABASE_INSTANCE_URL: "http://metabase:${MB_PORT}"
         METABASE_JWT_SHARED_SECRET: "${METABASE_JWT_SHARED_SECRET}"
-        WATCH: '${WATCH}'
+        WATCH: "${WATCH}"
     environment:
       PORT: "${CLIENT_PORT_APP_ROUTER}"
       NEXT_PUBLIC_METABASE_INSTANCE_URL: "http://localhost:${MB_PORT}"
@@ -54,7 +54,7 @@ services:
         NEXT_PUBLIC_METABASE_INSTANCE_URL: "http://localhost:${MB_PORT}"
         METABASE_INSTANCE_URL: "http://metabase:${MB_PORT}"
         METABASE_JWT_SHARED_SECRET: "${METABASE_JWT_SHARED_SECRET}"
-        WATCH: '${WATCH}'
+        WATCH: "${WATCH}"
     environment:
       PORT: "${CLIENT_PORT_PAGES_ROUTER}"
       NEXT_PUBLIC_METABASE_INSTANCE_URL: "http://localhost:${MB_PORT}"
@@ -63,4 +63,4 @@ services:
     ports:
       - "${CLIENT_PORT_PAGES_ROUTER}:${CLIENT_PORT_PAGES_ROUTER}"
     volumes:
-      - ./next-sample-pages-router/src:/app/next-sample-pages-router/src
+      - ./next-sample-pages-router/src:/app/next-sample-pages-router/src

metabase/Dockerfile

@@ -1,4 +1,4 @@
-FROM metabase/metabase-enterprise:v1.54.x
+FROM metabase/metabase-enterprise:v1.55.x
 
 COPY ./metabase /app/
 COPY ./local-dist /app/local-dist

next-sample-app-router/package-lock.json

@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@metabase/embedding-sdk-react": "^0.54.11",
+    "@metabase/embedding-sdk-react": "^0.55.2-nightly",
     "dotenv-cli": "^8.0.0",
     "jsonwebtoken": "^9.0.2",
     "next": "14.2.18",

next-sample-app-router/package.json

@@ -1,4 +1,5 @@
 import jwt from "jsonwebtoken";
+import { NextResponse } from 'next/server';
 
 if (!process.env.METABASE_JWT_SHARED_SECRET) {
   throw new Error("Missing METABASE_JWT_SHARED_SECRET");
@@ -10,7 +11,7 @@ if (!process.env.NEXT_PUBLIC_METABASE_INSTANCE_URL) {
 const METABASE_JWT_SHARED_SECRET = process.env.METABASE_JWT_SHARED_SECRET;
 const METABASE_INSTANCE_URL = process.env.METABASE_INSTANCE_URL;
 
-export async function GET() {
+export async function GET(req: Request) {
   // this should come from the session
   const user = {
     email: "[email protected]",
@@ -30,7 +31,14 @@ export async function GET() {
     METABASE_JWT_SHARED_SECRET
   );
 
-  const ssoUrl = `${METABASE_INSTANCE_URL}/auth/sso?token=true&jwt=${token}`;
+  const url = new URL(req.url)
+  const wantsJson = url.searchParams.get('response') === 'json'
+
+  if (wantsJson) {
+    return NextResponse.json({ jwt: token })
+  }
+
+  const ssoUrl = `${METABASE_INSTANCE_URL}/auth/sso?jwt=${token}`;
 
   try {
     const response = await fetch(ssoUrl);

next-sample-app-router/src/app/api/metabase/auth/route.ts

@@ -3,17 +3,24 @@
 import {
   MetabaseProvider,
   defineMetabaseAuthConfig,
-  defineMetabaseTheme
-} from '@metabase/embedding-sdk-react/nextjs';
-import { PropsWithChildren } from 'react';
+  defineMetabaseTheme,
+} from "@metabase/embedding-sdk-react/nextjs";
+import { PropsWithChildren } from "react";
 
 if (!process.env.NEXT_PUBLIC_METABASE_INSTANCE_URL) {
   throw new Error("Missing NEXT_PUBLIC_METABASE_INSTANCE_URL");
 }
 
 const authConfig = defineMetabaseAuthConfig({
   metabaseInstanceUrl: process.env.NEXT_PUBLIC_METABASE_INSTANCE_URL,
-  authProviderUri: `/api/metabase/auth`,
+  fetchRequestToken: async () => {
+    const response = await fetch('/api/metabase/auth?response=json', {
+      method: "GET",
+      credentials: "include",
+    });
+
+    return await response.json();
+  },
 });
 
 const theme = defineMetabaseTheme({
@@ -57,11 +64,8 @@ const theme = defineMetabaseTheme({
   },
 });
 
-export const AppProvider = ({children}: PropsWithChildren) => (
-  <MetabaseProvider
-    authConfig={authConfig}
-    theme={theme}
-  >
+export const AppProvider = ({ children }: PropsWithChildren) => (
+  <MetabaseProvider authConfig={authConfig} theme={theme}>
     {children}
   </MetabaseProvider>
-)
+);

next-sample-app-router/src/app/app-provider.tsx

@@ -3,8 +3,8 @@ import type { Metadata } from "next";
 import localFont from "next/font/local";
 import "./globals.css";
 import Link from "next/link";
-import { AppProvider } from '@/app/app-provider';
-import { Suspense } from 'react';
+import { AppProvider } from "@/app/app-provider";
+import { Suspense } from "react";
 
 const geistSans = localFont({
   src: "./fonts/GeistVF.woff",

next-sample-app-router/src/app/layout.tsx

@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@metabase/embedding-sdk-react": "^0.54.11",
+    "@metabase/embedding-sdk-react": "^0.55.2-nightly",
     "dotenv-cli": "^8.0.0",
     "jsonwebtoken": "^9.0.2",
     "next": "14.2.18",

next-sample-pages-router/package-lock.json

@@ -11,7 +11,14 @@ if (!process.env.NEXT_PUBLIC_METABASE_INSTANCE_URL) {
 
 const authConfig = defineMetabaseAuthConfig({
   metabaseInstanceUrl: process.env.NEXT_PUBLIC_METABASE_INSTANCE_URL,
-  authProviderUri: `/api/metabase/auth`,
+  fetchRequestToken: async () => {
+    const response = await fetch('/api/metabase/auth?response=json', {
+      method: "GET",
+      credentials: "include",
+    });
+
+    return await response.json();
+  },
 });
 
 const theme = defineMetabaseTheme({