Fix Sign in button

Signed-off-by: Rafi <[email protected]>

src/decorators/withOrganization.ts

@@ -31,7 +31,7 @@ export async function withOrganization(ctx: GetServerSidePropsContext) {
     const organization: OrganizationDetailsDTO = await r.json();
 
     if (!r.ok) {
-      console.log("LOGIN REDIRECT");
+      console.log("LOGIN REDIRECT", r);
       // it must be an 500
       throw new HttpError({
         redirect: {

src/decorators/withOrgs.ts

@@ -26,7 +26,7 @@ export async function withOrgs(ctx: GetServerSidePropsContext) {
   const r = await devGuardApiClient("/organizations/");
 
   if (!r.ok) {
-    console.log("LOGIN REDIRECT");
+    console.log("LOGIN REDIRECT", r);
     // it must be an 500
     throw new HttpError({
       redirect: {

src/pages/[organizationSlug]/projects/[projectSlug]/assets/[assetSlug]/settings.tsx

@@ -53,6 +53,7 @@ const Index: FunctionComponent<Props> = ({ repositories }: Props) => {
   const [editRepo, setEditRepo] = useState(!Boolean(asset.repositoryId));
 
   const handleUpdate = async (data: Partial<AssetDTO>) => {
+    console.log("update project");
     const resp = await browserApiClient(
       "/organizations/" +
         activeOrg.slug +

src/pages/[organizationSlug]/projects/[projectSlug]/settings.tsx

@@ -10,19 +10,58 @@ import Link from "next/link";
 import { withOrgs } from "../../../../decorators/withOrgs";
 import { withSession } from "../../../../decorators/withSession";
 import { useActiveOrg } from "../../../../hooks/useActiveOrg";
-import { getApiClientFromContext } from "../../../../services/devGuardApi";
+import { browserApiClient, getApiClientFromContext } from "../../../../services/devGuardApi";
 import { AssetDTO, ProjectDTO } from "../../../../types/api/api";
 import { withOrganization } from "@/decorators/withOrganization";
 
+import { useActiveProject } from "@/hooks/useActiveProject";
+import { useForm } from "react-hook-form";
+import Section from "@/components/common/Section";
+import { ProjectForm } from "@/components/project/ProjectForm";
+import { Form } from "@/components/ui/form";
+import { withProject } from "@/decorators/withProject";
+import { useStore } from "@/zustand/globalStoreProvider";
+import { useRouter } from "next/router";
+import { Button } from "@/components/ui/button";
 interface Props {
   project: ProjectDTO & {
     assets: Array<AssetDTO>;
   };
 }
 
-const Index: FunctionComponent<Props> = ({ project }) => {
+const Index: FunctionComponent<Props> = ({ project }: Props) => {
   const activeOrg = useActiveOrg();
   const projectMenu = useProjectMenu();
+  //const updateProject =  useStore((state) => state.updateProject);
+  const router = useRouter();
+
+  const form = useForm<ProjectDTO>({ defaultValues: project });
+
+  const handleUpdate = async (data: Partial<ProjectDTO>) => {
+    console.log("update project");
+    const resp = await browserApiClient(
+      "/organizations/" + activeOrg.slug + "/projects/" + project.slug + "/",
+      {
+        method: "PATCH",
+        body: JSON.stringify(data),
+      },
+    );
+
+    if (!resp.ok) {
+      console.error("Failed to update project");
+    }
+/*
+    const newProject = await resp.json();
+    updateProject(newProject);
+    if (newProject.slug !== project.slug) {
+      router.push(
+        "/"+ activeOrg.slug + "/projects/" + newProject.slug + "/settings",
+      );
+    }
+    */
+  };
+
+
 
   return (
     <Page
@@ -57,7 +96,21 @@ const Index: FunctionComponent<Props> = ({ project }) => {
           </Link>
         </span>
       }
-    ></Page>
+    >
+      <div>
+        Settings
+        <Form {...form}>
+        <form onSubmit={form.handleSubmit(handleUpdate)}>
+        <Section title="Project"  >
+          <ProjectForm form={form} />
+        </Section>
+        <div className="mt-4 flex flex-row justify-end">
+              <Button>Update</Button>
+            </div>
+        </form>
+        </Form>
+      </div>
+    </Page>
   );
 };
 
@@ -82,6 +135,8 @@ export const getServerSideProps = middleware(
     session: withSession,
     organizations: withOrgs,
     organization: withOrganization,
+    organizations: withOrg,
+
   },
 );
 

src/pages/registration.tsx

@@ -177,13 +177,15 @@ const Registration: NextPage = () => {
     };
   }, [flow]);
 
+  console.log(flow)
+
   const passwordFlow = useMemo(() => {
     return {
       ...flow,
       ui: {
         ...flow?.ui,
         nodes:
-          flow?.ui.nodes?.filter((n) => n.group === UiNodeGroupEnum.Default) ??
+          flow?.ui.nodes?.filter((n) => n.group === UiNodeGroupEnum.Default || n.group === UiNodeGroupEnum.Password) ??
           [],
       },
     };

src/zustand/globalStore.ts

@@ -16,6 +16,7 @@ export interface InitialState {
 
 export interface GlobalStoreActions {
   updateAsset: (asset: AssetDTO) => void;
+  updateProject: (project: ProjectDTO) => void;
 }
 
 export interface GlobalStore extends InitialState, GlobalStoreActions {