Merge pull request #246 from jerebtw/main

feat: add app & admin cookie secure variable to dashboard

dashboard/src/components/EnvComponents/Features.tsx

@@ -1,16 +1,40 @@
-import React from 'react';
+import React from "react";
-import { Divider, Flex, Stack, Text } from '@chakra-ui/react';
+import { Divider, Flex, Stack, Text } from "@chakra-ui/react";
-import InputField from '../InputField';
+import InputField from "../InputField";
-import { SwitchInputType } from '../../constants';
+import { SwitchInputType } from "../../constants";
 
 const Features = ({ variables, setVariables }: any) => {
   return (
     <div>
-			{' '}
+      {" "}
       <Text fontSize="md" paddingTop="2%" fontWeight="bold" mb={5}>
         Disable Features
       </Text>
       <Stack spacing={6}>
+        <Flex>
+          <Flex w="100%" justifyContent="start" alignItems="center">
+            <Text fontSize="sm">Disable secure app cookie:</Text>
+          </Flex>
+          <Flex justifyContent="start">
+            <InputField
+              variables={variables}
+              setVariables={setVariables}
+              inputType={SwitchInputType.DISABLE_APP_COOKIE_SECURE}
+            />
+          </Flex>
+        </Flex>
+        <Flex>
+          <Flex w="100%" justifyContent="start" alignItems="center">
+            <Text fontSize="sm">Disable secure admin cookie:</Text>
+          </Flex>
+          <Flex justifyContent="start">
+            <InputField
+              variables={variables}
+              setVariables={setVariables}
+              inputType={SwitchInputType.DISABLE_ADMIN_COOKIE_SECURE}
+            />
+          </Flex>
+        </Flex>
         <Flex>
           <Flex w="100%" justifyContent="start" alignItems="center">
             <Text fontSize="sm">Disable Login Page:</Text>

dashboard/src/constants.ts

@@ -63,6 +63,8 @@ export const TextAreaInputType = {
 };
 
 export const SwitchInputType = {
+	DISABLE_APP_COOKIE_SECURE: 'DISABLE_APP_COOKIE_SECURE',
+	DISABLE_ADMIN_COOKIE_SECURE: 'DISABLE_ADMIN_COOKIE_SECURE',
 	DISABLE_LOGIN_PAGE: 'DISABLE_LOGIN_PAGE',
 	DISABLE_MAGIC_LINK_LOGIN: 'DISABLE_MAGIC_LINK_LOGIN',
 	DISABLE_EMAIL_VERIFICATION: 'DISABLE_EMAIL_VERIFICATION',
@@ -133,6 +135,8 @@ export interface envVarTypes {
 	ORGANIZATION_LOGO: string;
 	CUSTOM_ACCESS_TOKEN_SCRIPT: string;
 	ADMIN_SECRET: string;
+	DISABLE_APP_COOKIE_SECURE: boolean;
+	DISABLE_ADMIN_COOKIE_SECURE: boolean;
 	DISABLE_LOGIN_PAGE: boolean;
 	DISABLE_MAGIC_LINK_LOGIN: boolean;
 	DISABLE_EMAIL_VERIFICATION: boolean;

dashboard/src/graphql/queries/index.ts

@@ -50,6 +50,8 @@ export const EnvVariablesQuery = `
       ORGANIZATION_NAME
       ORGANIZATION_LOGO
       ADMIN_SECRET
+      DISABLE_APP_COOKIE_SECURE
+      DISABLE_ADMIN_COOKIE_SECURE
       DISABLE_LOGIN_PAGE
       DISABLE_MAGIC_LINK_LOGIN
       DISABLE_EMAIL_VERIFICATION

dashboard/src/pages/Environment.tsx

@@ -71,6 +71,8 @@ const Environment = () => {
 		ORGANIZATION_LOGO: '',
 		CUSTOM_ACCESS_TOKEN_SCRIPT: '',
 		ADMIN_SECRET: '',
+		DISABLE_APP_COOKIE_SECURE: false,
+		DISABLE_ADMIN_COOKIE_SECURE: false,
 		DISABLE_LOGIN_PAGE: false,
 		DISABLE_MAGIC_LINK_LOGIN: false,
 		DISABLE_EMAIL_VERIFICATION: false,

server/graph/generated/generated.go

@@ -2158,6 +2158,8 @@ input UpdateEnvInput {
   ALLOWED_ORIGINS: [String!]
   APP_URL: String
   RESET_PASSWORD_URL: String
+  DISABLE_APP_COOKIE_SECURE: Boolean!
+  DISABLE_ADMIN_COOKIE_SECURE: Boolean!
   DISABLE_EMAIL_VERIFICATION: Boolean
   DISABLE_BASIC_AUTHENTICATION: Boolean
   DISABLE_MAGIC_LINK_LOGIN: Boolean
@@ -14858,7 +14860,7 @@ func (ec *executionContext) unmarshalInputUpdateEnvInput(ctx context.Context, ob
 		asMap[k] = v
 	}
 
-	fieldsInOrder := [...]string{"ACCESS_TOKEN_EXPIRY_TIME", "ADMIN_SECRET", "CUSTOM_ACCESS_TOKEN_SCRIPT", "OLD_ADMIN_SECRET", "SMTP_HOST", "SMTP_PORT", "SMTP_USERNAME", "SMTP_PASSWORD", "SENDER_EMAIL", "JWT_TYPE", "JWT_SECRET", "JWT_PRIVATE_KEY", "JWT_PUBLIC_KEY", "ALLOWED_ORIGINS", "APP_URL", "RESET_PASSWORD_URL", "DISABLE_EMAIL_VERIFICATION", "DISABLE_BASIC_AUTHENTICATION", "DISABLE_MAGIC_LINK_LOGIN", "DISABLE_LOGIN_PAGE", "DISABLE_SIGN_UP", "DISABLE_REDIS_FOR_ENV", "DISABLE_STRONG_PASSWORD", "DISABLE_MULTI_FACTOR_AUTHENTICATION", "ENFORCE_MULTI_FACTOR_AUTHENTICATION", "ROLES", "PROTECTED_ROLES", "DEFAULT_ROLES", "JWT_ROLE_CLAIM", "GOOGLE_CLIENT_ID", "GOOGLE_CLIENT_SECRET", "GITHUB_CLIENT_ID", "GITHUB_CLIENT_SECRET", "FACEBOOK_CLIENT_ID", "FACEBOOK_CLIENT_SECRET", "LINKEDIN_CLIENT_ID", "LINKEDIN_CLIENT_SECRET", "APPLE_CLIENT_ID", "APPLE_CLIENT_SECRET", "TWITTER_CLIENT_ID", "TWITTER_CLIENT_SECRET", "ORGANIZATION_NAME", "ORGANIZATION_LOGO"}
+	fieldsInOrder := [...]string{"ACCESS_TOKEN_EXPIRY_TIME", "ADMIN_SECRET", "CUSTOM_ACCESS_TOKEN_SCRIPT", "OLD_ADMIN_SECRET", "SMTP_HOST", "SMTP_PORT", "SMTP_USERNAME", "SMTP_PASSWORD", "SENDER_EMAIL", "JWT_TYPE", "JWT_SECRET", "JWT_PRIVATE_KEY", "JWT_PUBLIC_KEY", "ALLOWED_ORIGINS", "APP_URL", "RESET_PASSWORD_URL", "DISABLE_APP_COOKIE_SECURE", "DISABLE_ADMIN_COOKIE_SECURE", "DISABLE_EMAIL_VERIFICATION", "DISABLE_BASIC_AUTHENTICATION", "DISABLE_MAGIC_LINK_LOGIN", "DISABLE_LOGIN_PAGE", "DISABLE_SIGN_UP", "DISABLE_REDIS_FOR_ENV", "DISABLE_STRONG_PASSWORD", "DISABLE_MULTI_FACTOR_AUTHENTICATION", "ENFORCE_MULTI_FACTOR_AUTHENTICATION", "ROLES", "PROTECTED_ROLES", "DEFAULT_ROLES", "JWT_ROLE_CLAIM", "GOOGLE_CLIENT_ID", "GOOGLE_CLIENT_SECRET", "GITHUB_CLIENT_ID", "GITHUB_CLIENT_SECRET", "FACEBOOK_CLIENT_ID", "FACEBOOK_CLIENT_SECRET", "LINKEDIN_CLIENT_ID", "LINKEDIN_CLIENT_SECRET", "APPLE_CLIENT_ID", "APPLE_CLIENT_SECRET", "TWITTER_CLIENT_ID", "TWITTER_CLIENT_SECRET", "ORGANIZATION_NAME", "ORGANIZATION_LOGO"}
 	for _, k := range fieldsInOrder {
 		v, ok := asMap[k]
 		if !ok {
@@ -14993,6 +14995,22 @@ func (ec *executionContext) unmarshalInputUpdateEnvInput(ctx context.Context, ob
 			if err != nil {
 				return it, err
 			}
+		case "DISABLE_APP_COOKIE_SECURE":
+			var err error
+
+			ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("DISABLE_APP_COOKIE_SECURE"))
+			it.DisableAppCookieSecure, err = ec.unmarshalNBoolean2bool(ctx, v)
+			if err != nil {
+				return it, err
+			}
+		case "DISABLE_ADMIN_COOKIE_SECURE":
+			var err error
+
+			ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("DISABLE_ADMIN_COOKIE_SECURE"))
+			it.DisableAdminCookieSecure, err = ec.unmarshalNBoolean2bool(ctx, v)
+			if err != nil {
+				return it, err
+			}
 		case "DISABLE_EMAIL_VERIFICATION":
 			var err error
 

server/graph/model/models_gen.go

@@ -277,6 +277,8 @@ type UpdateEnvInput struct {
 	AllowedOrigins                   []string `json:"ALLOWED_ORIGINS"`
 	AppURL                           *string  `json:"APP_URL"`
 	ResetPasswordURL                 *string  `json:"RESET_PASSWORD_URL"`
+	DisableAppCookieSecure           bool     `json:"DISABLE_APP_COOKIE_SECURE"`
+	DisableAdminCookieSecure         bool     `json:"DISABLE_ADMIN_COOKIE_SECURE"`
 	DisableEmailVerification         *bool    `json:"DISABLE_EMAIL_VERIFICATION"`
 	DisableBasicAuthentication       *bool    `json:"DISABLE_BASIC_AUTHENTICATION"`
 	DisableMagicLinkLogin            *bool    `json:"DISABLE_MAGIC_LINK_LOGIN"`

server/graph/schema.graphqls

@@ -225,6 +225,8 @@ input UpdateEnvInput {
   ALLOWED_ORIGINS: [String!]
   APP_URL: String
   RESET_PASSWORD_URL: String
+  DISABLE_APP_COOKIE_SECURE: Boolean!
+  DISABLE_ADMIN_COOKIE_SECURE: Boolean!
   DISABLE_EMAIL_VERIFICATION: Boolean
   DISABLE_BASIC_AUTHENTICATION: Boolean
   DISABLE_MAGIC_LINK_LOGIN: Boolean