Merge pull request #68 from yordis/chore-app-dir-org

chore: move app code into src dir
zitadel · May 15, 2024 · b1473fe · b1473fe
2 parents cd1cbe4 + 2e3c1a8
commit b1473fe
Show file tree

Hide file tree

Showing 104 changed files with 518 additions and 480 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,10 +30,10 @@ jobs:
         with:
           version: 8
 
-      - name: Setup Node.js 18.x
+      - name: Setup Node.js 20.x
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.x
 
       - uses: pnpm/action-setup@v2
         name: Install pnpm

diff --git a/apps/login/__test__/PasswordComplexity.test.tsx b/apps/login/__test__/PasswordComplexity.test.tsx
@@ -1,5 +1,5 @@
 import { render, screen, waitFor, within } from "@testing-library/react";
-import PasswordComplexity from "../ui/PasswordComplexity";
+import PasswordComplexity from "@/ui/PasswordComplexity";
 // TODO: Why does this not compile?
 // import { ResourceOwnerType } from '@zitadel/server';
 
@@ -30,14 +30,14 @@ describe("<PasswordComplexity/>", () => {
               requiresSymbol: false,
               resourceOwnerType: 0, // ResourceOwnerType.RESOURCE_OWNER_TYPE_UNSPECIFIED,
             }}
-          />
+          />,
         );
       });
       if (expectSVGTitle === false) {
         it(`should not render the feedback element`, async () => {
           await waitFor(() => {
             expect(
-              screen.queryByText(feedbackElementLabel)
+              screen.queryByText(feedbackElementLabel),
             ).not.toBeInTheDocument();
           });
         });
@@ -46,12 +46,12 @@ describe("<PasswordComplexity/>", () => {
           await waitFor(async () => {
             const svg = within(
               screen.getByText(feedbackElementLabel)
-                .parentElement as HTMLElement
+                .parentElement as HTMLElement,
             ).findByRole("img");
             expect(await svg).toHaveTextContent(expectSVGTitle);
           });
         });
       }
-    }
+    },
   );
 });
diff --git a/apps/login/cypress/integration/login.cy.ts b/apps/login/cypress/integration/login.cy.ts
@@ -111,7 +111,7 @@ describe("login", () => {
         cy.get('button[type="submit"]').click();
         cy.location("pathname", { timeout: 10_000 }).should(
           "eq",
-          "/passkey/add"
+          "/passkey/add",
         );
       });
     });
@@ -160,7 +160,7 @@ describe("login", () => {
       cy.visit("/loginname?loginName=john%40zitadel.com&submit=true");
       cy.location("pathname", { timeout: 10_000 }).should(
         "eq",
-        "/passkey/login"
+        "/passkey/login",
       );
     });
   });

diff --git a/apps/login/package.json b/apps/login/package.json
@@ -54,6 +54,7 @@
     "tinycolor2": "1.4.2"
   },
   "devDependencies": {
+    "@zitadel/prettier-config": "workspace:*",
     "@bufbuild/buf": "^1.14.0",
     "@jest/types": "^29.5.0",
     "@testing-library/jest-dom": "^5.16.5",

diff --git a/apps/login/prettier.config.mjs b/apps/login/prettier.config.mjs
@@ -0,0 +1 @@
+export { default } from "@zitadel/prettier-config";
diff --git a/apps/login/readme.md b/apps/login/readme.md
@@ -1,11 +1,11 @@
 # ZITADEL Login UI
 
-This is going to be our next UI for the hosted login. It's based on Next.js 13 and its introduced `app/` directory.
+This is going to be our next UI for the hosted login. It's based on Next.js 13 and its introduced `app/` directory.
 
 The Login UI should provide the following functionality:
 
-- **Login API:** Uses the new ZITADEL Login API
-- **Server Components:** Making server-first components
+- **Login API:** Uses the new ZITADEL Login API
+- **Server Components:** Making server-first components
 
 ## Running Locally
 

diff --git a/apps/login/app/(login)/accounts/page.tsx → apps/login/src/app/(login)/accounts/page.tsx b/apps/login/app/(login)/accounts/page.tsx → apps/login/src/app/(login)/accounts/page.tsx
@@ -1,18 +1,18 @@
 import { Session } from "@zitadel/server";
-import { getBrandingSettings, listSessions, server } from "#/lib/zitadel";
-import { getAllSessionCookieIds } from "#/utils/cookies";
+import { getBrandingSettings, listSessions, server } from "@/lib/zitadel";
+import { getAllSessionCookieIds } from "@/utils/cookies";
 import { UserPlusIcon } from "@heroicons/react/24/outline";
 import Link from "next/link";
-import SessionsList from "#/ui/SessionsList";
-import DynamicTheme from "#/ui/DynamicTheme";
+import SessionsList from "@/ui/SessionsList";
+import DynamicTheme from "@/ui/DynamicTheme";
 
 async function loadSessions(): Promise<Session[]> {
   const ids = await getAllSessionCookieIds();
 
   if (ids && ids.length) {
     const response = await listSessions(
       server,
-      ids.filter((id: string | undefined) => !!id)
+      ids.filter((id: string | undefined) => !!id),
     );
     return response?.sessions ?? [];
   } else {

diff --git a/apps/login/app/(login)/error.tsx → apps/login/src/app/(login)/error.tsx b/apps/login/app/(login)/error.tsx → apps/login/src/app/(login)/error.tsx
@@ -1,7 +1,7 @@
 "use client";
 
-import { Boundary } from "#/ui/Boundary";
-import { Button } from "#/ui/Button";
+import { Boundary } from "@/ui/Boundary";
+import { Button } from "@/ui/Button";
 import React from "react";
 
 export default function Error({ error, reset }: any) {

diff --git a/...p/(login)/idp/[provider]/failure/page.tsx → ...p/(login)/idp/[provider]/failure/page.tsx b/...p/(login)/idp/[provider]/failure/page.tsx → ...p/(login)/idp/[provider]/failure/page.tsx
@@ -1,8 +1,8 @@
-import { ProviderSlug } from "#/lib/demos";
-import { getBrandingSettings, server } from "#/lib/zitadel";
-import Alert, { AlertType } from "#/ui/Alert";
-import DynamicTheme from "#/ui/DynamicTheme";
-import IdpSignin from "#/ui/IdpSignin";
+import { ProviderSlug } from "@/lib/demos";
+import { getBrandingSettings, server } from "@/lib/zitadel";
+import Alert, { AlertType } from "@/ui/Alert";
+import DynamicTheme from "@/ui/DynamicTheme";
+import IdpSignin from "@/ui/IdpSignin";
 import {
   AddHumanUserRequest,
   IDPInformation,

diff --git a/...p/(login)/idp/[provider]/success/page.tsx → ...p/(login)/idp/[provider]/success/page.tsx b/...p/(login)/idp/[provider]/success/page.tsx → ...p/(login)/idp/[provider]/success/page.tsx
@@ -1,8 +1,8 @@
-import { ProviderSlug } from "#/lib/demos";
-import { getBrandingSettings, server } from "#/lib/zitadel";
-import Alert, { AlertType } from "#/ui/Alert";
-import DynamicTheme from "#/ui/DynamicTheme";
-import IdpSignin from "#/ui/IdpSignin";
+import { ProviderSlug } from "@/lib/demos";
+import { getBrandingSettings, server } from "@/lib/zitadel";
+import Alert, { AlertType } from "@/ui/Alert";
+import DynamicTheme from "@/ui/DynamicTheme";
+import IdpSignin from "@/ui/IdpSignin";
 import {
   AddHumanUserRequest,
   IDPInformation,
@@ -63,18 +63,18 @@ const PROVIDER_MAPPING: {
 
 function retrieveIDPIntent(
   id: string,
-  token: string
+  token: string,
 ): Promise<RetrieveIdentityProviderIntentResponse> {
   const userService = user.getUser(server);
   return userService.retrieveIdentityProviderIntent(
     { idpIntentId: id, idpIntentToken: token },
-    {}
+    {},
   );
 }
 
 function createUser(
   provider: ProviderSlug,
-  info: IDPInformation
+  info: IDPInformation,
 ): Promise<string> {
   const userData = PROVIDER_MAPPING[provider](info);
   const userService = user.getUser(server);

diff --git a/apps/login/app/(login)/idp/page.tsx → apps/login/src/app/(login)/idp/page.tsx b/apps/login/app/(login)/idp/page.tsx → apps/login/src/app/(login)/idp/page.tsx
@@ -2,9 +2,9 @@ import {
   getBrandingSettings,
   getLegalAndSupportSettings,
   server,
-} from "#/lib/zitadel";
-import DynamicTheme from "#/ui/DynamicTheme";
-import { SignInWithIDP } from "#/ui/SignInWithIDP";
+} from "@/lib/zitadel";
+import DynamicTheme from "@/ui/DynamicTheme";
+import { SignInWithIDP } from "@/ui/SignInWithIDP";
 import {
   GetActiveIdentityProvidersResponse,
   IdentityProvider,
@@ -14,13 +14,13 @@ import {
 
 function getIdentityProviders(
   server: ZitadelServer,
-  orgId?: string
+  orgId?: string,
 ): Promise<IdentityProvider[] | undefined> {
   const settingsService = settings.getSettings(server);
   return settingsService
     .getActiveIdentityProviders(
       orgId ? { ctx: { orgId } } : { ctx: { instance: true } },
-      {}
+      {},
     )
     .then((resp: GetActiveIdentityProvidersResponse) => {
       return resp.identityProviders;

diff --git a/apps/login/app/(login)/loginname/page.tsx → .../login/src/app/(login)/loginname/page.tsx b/apps/login/app/(login)/loginname/page.tsx → .../login/src/app/(login)/loginname/page.tsx
@@ -3,10 +3,10 @@ import {
   getLegalAndSupportSettings,
   getLoginSettings,
   server,
-} from "#/lib/zitadel";
-import DynamicTheme from "#/ui/DynamicTheme";
-import { SignInWithIDP } from "#/ui/SignInWithIDP";
-import UsernameForm from "#/ui/UsernameForm";
+} from "@/lib/zitadel";
+import DynamicTheme from "@/ui/DynamicTheme";
+import { SignInWithIDP } from "@/ui/SignInWithIDP";
+import UsernameForm from "@/ui/UsernameForm";
 import {
   GetActiveIdentityProvidersResponse,
   IdentityProvider,
@@ -16,13 +16,13 @@ import {
 
 function getIdentityProviders(
   server: ZitadelServer,
-  orgId?: string
+  orgId?: string,
 ): Promise<IdentityProvider[] | undefined> {
   const settingsService = settings.getSettings(server);
   return settingsService
     .getActiveIdentityProviders(
       orgId ? { ctx: { orgId } } : { ctx: { instance: true } },
-      {}
+      {},
     )
     .then((resp: GetActiveIdentityProvidersResponse) => {
       return resp.identityProviders;

diff --git a/apps/login/app/(login)/mfa/page.tsx → apps/login/src/app/(login)/mfa/page.tsx b/apps/login/app/(login)/mfa/page.tsx → apps/login/src/app/(login)/mfa/page.tsx
@@ -3,15 +3,15 @@ import {
   getSession,
   listAuthenticationMethodTypes,
   server,
-} from "#/lib/zitadel";
-import Alert from "#/ui/Alert";
-import ChooseSecondFactor from "#/ui/ChooseSecondFactor";
-import DynamicTheme from "#/ui/DynamicTheme";
-import UserAvatar from "#/ui/UserAvatar";
+} from "@/lib/zitadel";
+import Alert from "@/ui/Alert";
+import ChooseSecondFactor from "@/ui/ChooseSecondFactor";
+import DynamicTheme from "@/ui/DynamicTheme";
+import UserAvatar from "@/ui/UserAvatar";
 import {
   getMostRecentCookieWithLoginname,
   getSessionCookieById,
-} from "#/utils/cookies";
+} from "@/utils/cookies";
 
 export default async function Page({
   searchParams,
@@ -27,16 +27,16 @@ export default async function Page({
 
   async function loadSessionByLoginname(
     loginName?: string,
-    organization?: string
+    organization?: string,
   ) {
     const recent = await getMostRecentCookieWithLoginname(
       loginName,
-      organization
+      organization,
     );
     return getSession(server, recent.id, recent.token).then((response) => {
       if (response?.session && response.session.factors?.user?.id) {
         return listAuthenticationMethodTypes(
-          response.session.factors.user.id
+          response.session.factors.user.id,
         ).then((methods) => {
           return {
             factors: response.session?.factors,
@@ -52,7 +52,7 @@ export default async function Page({
     return getSession(server, recent.id, recent.token).then((response) => {
       if (response?.session && response.session.factors?.user?.id) {
         return listAuthenticationMethodTypes(
-          response.session.factors.user.id
+          response.session.factors.user.id,
         ).then((methods) => {
           return {
             factors: response.session?.factors,

diff --git a/apps/login/app/(login)/mfa/set/page.tsx → apps/login/src/app/(login)/mfa/set/page.tsx b/apps/login/app/(login)/mfa/set/page.tsx → apps/login/src/app/(login)/mfa/set/page.tsx
@@ -5,15 +5,15 @@ import {
   getUserByID,
   listAuthenticationMethodTypes,
   server,
-} from "#/lib/zitadel";
-import Alert from "#/ui/Alert";
-import ChooseSecondFactorToSetup from "#/ui/ChooseSecondFactorToSetup";
-import DynamicTheme from "#/ui/DynamicTheme";
-import UserAvatar from "#/ui/UserAvatar";
+} from "@/lib/zitadel";
+import Alert from "@/ui/Alert";
+import ChooseSecondFactorToSetup from "@/ui/ChooseSecondFactorToSetup";
+import DynamicTheme from "@/ui/DynamicTheme";
+import UserAvatar from "@/ui/UserAvatar";
 import {
   getMostRecentCookieWithLoginname,
   getSessionCookieById,
-} from "#/utils/cookies";
+} from "@/utils/cookies";
 import { user } from "@zitadel/server";
 
 export default async function Page({
@@ -30,11 +30,11 @@ export default async function Page({
 
   async function loadSessionByLoginname(
     loginName?: string,
-    organization?: string
+    organization?: string,
   ) {
     const recent = await getMostRecentCookieWithLoginname(
       loginName,
-      organization
+      organization,
     );
     return getSession(server, recent.id, recent.token).then((response) => {
       if (response?.session && response.session.factors?.user?.id) {

diff --git a/apps/login/app/(login)/otp/[method]/page.tsx → ...gin/src/app/(login)/otp/[method]/page.tsx b/apps/login/app/(login)/otp/[method]/page.tsx → ...gin/src/app/(login)/otp/[method]/page.tsx
@@ -3,12 +3,12 @@ import {
   getLoginSettings,
   getSession,
   server,
-} from "#/lib/zitadel";
-import Alert from "#/ui/Alert";
-import DynamicTheme from "#/ui/DynamicTheme";
-import LoginOTP from "#/ui/LoginOTP";
-import UserAvatar from "#/ui/UserAvatar";
-import { getMostRecentCookieWithLoginname } from "#/utils/cookies";
+} from "@/lib/zitadel";
+import Alert from "@/ui/Alert";
+import DynamicTheme from "@/ui/DynamicTheme";
+import LoginOTP from "@/ui/LoginOTP";
+import UserAvatar from "@/ui/UserAvatar";
+import { getMostRecentCookieWithLoginname } from "@/utils/cookies";
 
 export default async function Page({
   searchParams,
@@ -29,7 +29,7 @@ export default async function Page({
   async function loadSession(loginName?: string, organization?: string) {
     const recent = await getMostRecentCookieWithLoginname(
       loginName,
-      organization
+      organization,
     );
 
     return getSession(server, recent.id, recent.token).then((response) => {

diff --git a/...gin/app/(login)/otp/[method]/set/page.tsx → ...src/app/(login)/otp/[method]/set/page.tsx b/...gin/app/(login)/otp/[method]/set/page.tsx → ...src/app/(login)/otp/[method]/set/page.tsx
@@ -5,14 +5,14 @@ import {
   getSession,
   registerTOTP,
   server,
-} from "#/lib/zitadel";
-import Alert from "#/ui/Alert";
-import { Button, ButtonVariants } from "#/ui/Button";
-import DynamicTheme from "#/ui/DynamicTheme";
-import { Spinner } from "#/ui/Spinner";
-import TOTPRegister from "#/ui/TOTPRegister";
-import UserAvatar from "#/ui/UserAvatar";
-import { getMostRecentCookieWithLoginname } from "#/utils/cookies";
+} from "@/lib/zitadel";
+import Alert from "@/ui/Alert";
+import { Button, ButtonVariants } from "@/ui/Button";
+import DynamicTheme from "@/ui/DynamicTheme";
+import { Spinner } from "@/ui/Spinner";
+import TOTPRegister from "@/ui/TOTPRegister";
+import UserAvatar from "@/ui/UserAvatar";
+import { getMostRecentCookieWithLoginname } from "@/utils/cookies";
 import { RegisterTOTPResponse } from "@zitadel/server";
 import Link from "next/link";
 import { ClientError } from "nice-grpc";
@@ -60,7 +60,7 @@ export default async function Page({
   async function loadSession(loginName?: string, organization?: string) {
     const recent = await getMostRecentCookieWithLoginname(
       loginName,
-      organization
+      organization,
     );
 
     return getSession(server, recent.id, recent.token).then((response) => {
@@ -149,8 +149,8 @@ export default async function Page({
               {method === "email"
                 ? "Code via email was successfully added."
                 : method === "sms"
-                ? "Code via SMS was successfully added."
-                : ""}
+                  ? "Code via SMS was successfully added."
+                  : ""}
             </p>
 
             <div className="mt-8 flex w-full flex-row items-center">
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export { default } from "@zitadel/prettier-config";