Fix registration when invite is not required (stashapp#673)

frontend/src/pages/registerUser/Register.tsx

@@ -6,8 +6,9 @@ import { useNavigate } from "react-router-dom";
 import { Button, Form, Row, Col } from "react-bootstrap";
 import cx from "classnames";
 
+import { ErrorMessage, LoadingIndicator } from "src/components/fragments";
 import Title from "src/components/title";
-import { useNewUser } from "src/graphql";
+import { useNewUser, useConfig, ConfigQuery } from "src/graphql";
 import AuthContext, { ContextType } from "src/AuthContext";
 import * as yup from "yup";
 
@@ -19,12 +20,18 @@ const schema = yup.object({
 });
 type RegisterFormData = yup.Asserts<typeof schema>;
 
-const Register: FC = () => {
+interface Props {
+  config: ConfigQuery["getConfig"];
+}
+
+const Register: FC<Props> = ({ config }) => {
   const navigate = useNavigate();
   const [awaitingActivation, setAwaitingActivation] = useState(false);
   const Auth = useContext<ContextType>(AuthContext);
   const [submitError, setSubmitError] = useState<string | undefined>();
 
+  const inviteRequired = config.require_invite ?? true;
+
   const {
     register,
     handleSubmit,
@@ -102,21 +109,25 @@ const Register: FC = () => {
           </Row>
         </Form.Group>
 
-        <Form.Group controlId="inviteKey" className="mt-2">
-          <Row>
-            <Col xs={4}>
-              <Form.Label>Invite Key:</Form.Label>
-            </Col>
-            <Col xs={8}>
-              <Form.Control
-                className={cx({ "is-invalid": errors?.inviteKey })}
-                type="text"
-                placeholder="Invite Key"
-                {...register("inviteKey")}
-              />
-            </Col>
-          </Row>
-        </Form.Group>
+        {inviteRequired ? (
+          <Form.Group controlId="inviteKey" className="mt-2">
+            <Row>
+              <Col xs={4}>
+                <Form.Label>Invite Key:</Form.Label>
+              </Col>
+              <Col xs={8}>
+                <Form.Control
+                  className={cx({ "is-invalid": errors?.inviteKey })}
+                  type="text"
+                  placeholder="Invite Key"
+                  {...register("inviteKey")}
+                />
+              </Col>
+            </Row>
+          </Form.Group>
+        ) : (
+          <Form.Control type="hidden" value="-" {...register("inviteKey")} />
+        )}
 
         {errorList.map((error) => (
           <Row key={error} className="text-end text-danger">
@@ -137,4 +148,14 @@ const Register: FC = () => {
   );
 };
 
-export default Register;
+const ConfigLoader = () => {
+  const { data: config, loading } = useConfig();
+  if (loading) return <LoadingIndicator message="Loading config..." />;
+
+  if (!config)
+    return <ErrorMessage error="Unable to load server configuration" />;
+
+  return <Register config={config.getConfig} />;
+};
+
+export default ConfigLoader;

graphql/schema/schema.graphql

@@ -73,7 +73,7 @@ type Query {
   version: Version! @hasRole(role: READ)
 
   ### Instance Config ###
-  getConfig: StashBoxConfig! @hasRole(role: READ)
+  getConfig: StashBoxConfig!
 }
 
 type Mutation {

pkg/user/activation.go

@@ -174,24 +174,25 @@ func ActivateNewUser(fac models.Repo, name, email, activationKey, password strin
 		return nil, ErrInvalidActivationKey
 	}
 
-	// check expiry
+	var invitedBy *uuid.UUID
+	if config.GetRequireInvite() {
+		i, err := iqb.Find(a.InviteKey.UUID)
+		if err != nil {
+			return nil, err
+		}
 
-	i, err := iqb.Find(a.InviteKey.UUID)
-	if err != nil {
-		return nil, err
-	}
+		if i == nil {
+			return nil, errors.New("cannot find invite key")
+		}
 
-	if i == nil {
-		return nil, errors.New("cannot find invite key")
+		invitedBy = &i.GeneratedBy
 	}
 
-	invitedBy := i.GeneratedBy
-
 	createInput := models.UserCreateInput{
 		Name:        name,
 		Email:       email,
 		Password:    password,
-		InvitedByID: &invitedBy,
+		InvitedByID: invitedBy,
 		Roles:       getDefaultUserRoles(),
 	}
 
@@ -220,8 +221,10 @@ func ActivateNewUser(fac models.Repo, name, email, activationKey, password strin
 	}
 
 	// delete the invite key
-	if err := iqb.Destroy(a.InviteKey.UUID); err != nil {
-		return nil, err
+	if !a.InviteKey.UUID.IsNil() {
+		if err := iqb.Destroy(a.InviteKey.UUID); err != nil {
+			return nil, err
+		}
 	}
 
 	return ret, nil