Bump to @ory/client 1.0.1

package.json

@@ -22,8 +22,8 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@ory/client": "^0.2.0-alpha.48",
-    "@ory/elements-markup": "^0.0.1-alpha.26",
+    "@ory/client": "^1.0.1",
+    "@ory/elements-markup": "^0.0.1-alpha.27",
     "@ory/integrations": "^0.2.8",
     "axios": "^0.27.2",
     "cookie-parser": "^1.4.5",

src/pkg/index.ts

@@ -1,6 +1,6 @@
 // Copyright © 2022 Ory Corp
 // SPDX-License-Identifier: Apache-2.0
-import { UiNode } from "@ory/client"
+import { FrontendApi, UiNode } from "@ory/client"
 import { Typography, Divider, ButtonLink, MenuLink } from "@ory/elements-markup"
 import { filterNodesByGroups, getNodeLabel } from "@ory/integrations/ui"
 import { AxiosError } from "axios"
@@ -23,11 +23,11 @@ export const getUrlForFlow = (
     query ? `?${query.toString()}` : ""
   }`
 
-export const defaultConfig: RouteOptionsCreator = () => {
+export const defaultConfig = () => {
   return {
     apiBaseUrl: apiBaseUrl,
     kratosBrowserUrl: apiBaseUrl,
-    sdk,
+    frontend: new FrontendApi(),
   }
 }
 

src/pkg/middleware.ts

@@ -54,8 +54,8 @@ const addSessionToRequest =
 export const requireAuth =
   (createHelpers: RouteOptionsCreator) =>
   (req: Request, res: Response, next: NextFunction) => {
-    const { sdk, apiBaseUrl } = createHelpers(req)
-    sdk
+    const { frontend, apiBaseUrl } = createHelpers(req)
+    frontend
       .toSession(undefined, req.header("cookie"))
       .then(addSessionToRequest(req))
       .then(() => next())
@@ -78,8 +78,8 @@ export const requireAuth =
 export const setSession =
   (createHelpers: RouteOptionsCreator) =>
   (req: Request, res: Response, next: NextFunction) => {
-    const { sdk, apiBaseUrl } = createHelpers(req)
-    sdk
+    const { frontend, apiBaseUrl } = createHelpers(req)
+    frontend
       .toSession(undefined, req.header("cookie"))
       .then(addSessionToRequest(req))
       .catch(maybeInitiate2FA(res, apiBaseUrl))
@@ -95,8 +95,8 @@ export const setSession =
 export const requireNoAuth =
   (createHelpers: RouteOptionsCreator) =>
   (req: Request, res: Response, next: NextFunction) => {
-    const { sdk } = createHelpers(req)
-    sdk
+    const { frontend } = createHelpers(req)
+    frontend
       .toSession(undefined, req.header("cookie"))
       .then(() => {
         res.redirect("welcome")

src/pkg/route.ts

@@ -1,10 +1,14 @@
 // Copyright © 2022 Ory Corp
 // SPDX-License-Identifier: Apache-2.0
-import { V0alpha2ApiInterface } from "@ory/client"
+import {
+  FrontendApi,
+  FrontendApiInterface,
+  OAuth2ApiInterface,
+} from "@ory/client"
 import { Application, NextFunction, Request, Response } from "express"
 
 export interface RouteOptions {
-  sdk: V0alpha2ApiInterface
+  frontend: FrontendApi
   apiBaseUrl: string
   kratosBrowserUrl: string
   logo?: string

src/pkg/sdk/index.ts

@@ -1,6 +1,6 @@
 // Copyright © 2022 Ory Corp
 // SPDX-License-Identifier: Apache-2.0
-import { Configuration, V0alpha2Api } from "@ory/client"
+import { Configuration, FrontendApi, IdentityApi, OAuth2Api } from "@ory/client"
 
 const apiBaseUrlInternal =
   process.env.KRATOS_PUBLIC_URL ||
@@ -9,12 +9,16 @@ const apiBaseUrlInternal =
 
 export const apiBaseUrl = process.env.KRATOS_BROWSER_URL || apiBaseUrlInternal
 
+const config = new Configuration({
+  basePath: apiBaseUrlInternal,
+  // accessToken: "Your Ory Cloud API Key / Personal Access Token"
+})
+
 // Sets up the SDK
-let sdk = new V0alpha2Api(
-  new Configuration({
-    basePath: apiBaseUrlInternal,
-    // accessToken: "Your Ory Cloud API Key / Personal Access Token"
-  }),
-)
+const sdk = {
+  identity: new IdentityApi(config),
+  frontend: new FrontendApi(config),
+  oauth2: new OAuth2Api(config),
+}
 
 export default sdk

src/routes/error.ts

@@ -16,16 +16,16 @@ export const createErrorRoute: RouteCreator =
     const { id } = req.query
 
     // Get the SDK
-    const { sdk, logo } = createHelpers(req)
+    const { frontend, logo } = createHelpers(req)
 
     if (!isQuerySet(id)) {
       // No error was send, redirecting back to home.
       res.redirect("welcome")
       return
     }
 
-    sdk
-      .getSelfServiceError(id)
+    frontend
+      .getFlowError(id)
       .then(({ data }) => {
         res.status(200).render("error", {
           card: UserErrorCard({

src/routes/login.ts

@@ -1,6 +1,6 @@
 // Copyright © 2022 Ory Corp
 // SPDX-License-Identifier: Apache-2.0
-import { SelfServiceLoginFlow, UiNodeInputAttributes } from "@ory/client"
+import { LoginFlow, UiNodeInputAttributes } from "@ory/client"
 import { UserAuthCard, SelfServiceFlow } from "@ory/elements-markup"
 import {
   filterNodesByGroups,
@@ -27,7 +27,7 @@ export const createLoginRoute: RouteCreator =
       return_to = "",
       login_challenge,
     } = req.query
-    const { sdk, kratosBrowserUrl, logo } = createHelpers(req)
+    const { frontend, kratosBrowserUrl, logo } = createHelpers(req)
 
     const initFlowQuery = new URLSearchParams({
       aal: aal.toString(),
@@ -57,14 +57,14 @@ export const createLoginRoute: RouteCreator =
     // to give the user the option to sign out!
     const logoutUrl =
       (
-        await sdk
-          .createSelfServiceLogoutFlowUrlForBrowsers(req.header("cookie"))
+        await frontend
+          .createBrowserLogoutFlow(req.header("cookie"))
           .catch(() => ({ data: { logout_url: "" } }))
       ).data.logout_url || ""
 
-    return sdk
-      .getSelfServiceLoginFlow(flow, req.header("cookie"))
-      .then(({ data: flow }: { data: SelfServiceLoginFlow & any }) => {
+    return frontend
+      .getLoginFlow(flow, req.header("cookie"))
+      .then(({ data: flow }: { data: LoginFlow & any }) => {
         // Render the data using a view (e.g. Jade Template):
 
         const initRegistrationQuery = new URLSearchParams({

src/routes/recovery.ts

@@ -17,7 +17,7 @@ export const createRecoveryRoute: RouteCreator =
     res.locals.projectName = "Recover account"
 
     const { flow, return_to = "" } = req.query
-    const { sdk, kratosBrowserUrl, logo } = createHelpers(req)
+    const { frontend, kratosBrowserUrl, logo } = createHelpers(req)
     const initFlowUrl = getUrlForFlow(
       kratosBrowserUrl,
       "recovery",
@@ -40,8 +40,8 @@ export const createRecoveryRoute: RouteCreator =
       return
     }
 
-    return sdk
-      .getSelfServiceRecoveryFlow(flow, req.header("cookie"))
+    return frontend
+      .getRecoveryFlow(flow, req.header("cookie"))
       .then(({ data: flow }) => {
         res.render("recovery", {
           card: UserAuthCard({

src/routes/registration.ts

@@ -1,6 +1,6 @@
 // Copyright © 2022 Ory Corp
 // SPDX-License-Identifier: Apache-2.0
-import { SelfServiceRegistrationFlow, UiNodeInputAttributes } from "@ory/client"
+import { RegistrationFlow, UiNodeInputAttributes } from "@ory/client"
 import { UserAuthCard } from "@ory/elements-markup"
 import {
   filterNodesByGroups,
@@ -23,7 +23,7 @@ export const createRegistrationRoute: RouteCreator =
     res.locals.projectName = "Create account"
 
     const { flow, return_to = "", login_challenge } = req.query
-    const { sdk, kratosBrowserUrl, logo } = createHelpers(req)
+    const { frontend, kratosBrowserUrl, logo } = createHelpers(req)
 
     const initFlowQuery = new URLSearchParams({
       return_to: return_to.toString(),
@@ -54,9 +54,9 @@ export const createRegistrationRoute: RouteCreator =
       return
     }
 
-    sdk
-      .getSelfServiceRegistrationFlow(flow, req.header("Cookie"))
-      .then(({ data: flow }: { data: SelfServiceRegistrationFlow & any }) => {
+    frontend
+      .getRegistrationFlow(flow, req.header("Cookie"))
+      .then(({ data: flow }: { data: RegistrationFlow & any }) => {
         // Render the data using a view (e.g. Jade Template):
         const initLoginQuery = new URLSearchParams({
           return_to: return_to.toString(),

src/routes/sessions.ts

@@ -12,14 +12,14 @@ import { navigationMenu } from "../pkg/ui"
 export const createSessionsRoute: RouteCreator =
   (createHelpers) => async (req, res) => {
     res.locals.projectName = "Session Information"
-    const { sdk } = createHelpers(req)
+    const { frontend } = createHelpers(req)
     const session = req.session
 
     // Create a logout URL
     const logoutUrl =
       (
-        await sdk
-          .createSelfServiceLogoutFlowUrlForBrowsers(req.header("cookie"))
+        await frontend
+          .createBrowserLogoutFlow(req.header("cookie"))
           .catch(() => ({ data: { logout_url: "" } }))
       ).data.logout_url || ""
 

src/routes/settings.ts

@@ -36,7 +36,7 @@ export const createSettingsRoute: RouteCreator =
 
     const { flow, return_to = "" } = req.query
     const helpers = createHelpers(req)
-    const { sdk, kratosBrowserUrl } = helpers
+    const { frontend, kratosBrowserUrl } = helpers
     const initFlowUrl = getUrlForFlow(
       kratosBrowserUrl,
       "settings",
@@ -58,8 +58,8 @@ export const createSettingsRoute: RouteCreator =
     // Create a logout URL
     const logoutUrl =
       (
-        await sdk
-          .createSelfServiceLogoutFlowUrlForBrowsers(req.header("cookie"))
+        await frontend
+          .createBrowserLogoutFlow(req.header("cookie"))
           .catch(() => ({ data: { logout_url: "" } }))
       ).data.logout_url || ""
 
@@ -71,8 +71,8 @@ export const createSettingsRoute: RouteCreator =
         ? `You are currently logged in as ${identityCredentialTrait} `
         : ""
 
-    return sdk
-      .getSelfServiceSettingsFlow(flow, undefined, req.header("cookie"))
+    return frontend
+      .getSettingsFlow(flow, undefined, req.header("cookie"))
       .then(({ data: flow }) => {
         const conditionalLinks: NavSectionLinks[] = [
           {

src/routes/static.ts

@@ -13,7 +13,7 @@ export const registerStaticRoutes: RouteRegistrator = (app) => {
   app.use("/", express.static("public"))
   app.use("/.well-known/ory/webauthn.js", (req, res) => {
     res.contentType("text/javascript")
-    sdk.getWebAuthnJavaScript().then(({ data }) => {
+    sdk.frontend.getWebAuthnJavaScript().then(({ data }) => {
       res.send(data)
     })
   })

src/routes/verification.ts

@@ -16,7 +16,7 @@ export const createVerificationRoute: RouteCreator =
     res.locals.projectName = "Verify account"
 
     const { flow, return_to = "" } = req.query
-    const { sdk, kratosBrowserUrl, logo } = createHelpers(req)
+    const { frontend, kratosBrowserUrl, logo } = createHelpers(req)
     const initFlowUrl = getUrlForFlow(
       kratosBrowserUrl,
       "verification",
@@ -42,8 +42,8 @@ export const createVerificationRoute: RouteCreator =
     }
 
     return (
-      sdk
-        .getSelfServiceVerificationFlow(flow, req.header("cookie"))
+      frontend
+        .getVerificationFlow(flow, req.header("cookie"))
         .then(({ data: flow }) => {
           // Render the data using a view (e.g. Jade Template):
           res.render("verification", {

src/routes/welcome.ts

@@ -13,14 +13,14 @@ export const createWelcomeRoute: RouteCreator =
   (createHelpers) => async (req, res) => {
     res.locals.projectName = "Welcome to Ory"
 
-    const { sdk } = createHelpers(req)
+    const { frontend } = createHelpers(req)
     const session = req.session
 
     // Create a logout URL
     const logoutUrl =
       (
-        await sdk
-          .createSelfServiceLogoutFlowUrlForBrowsers(req.header("cookie"))
+        await frontend
+          .createBrowserLogoutFlow(req.header("cookie"))
           .catch(() => ({ data: { logout_url: "" } }))
       ).data.logout_url || ""