0.9.1

Ability to show admin scores and bug fixes

Author: Tkaixiang

api/api.js

@@ -141,22 +141,21 @@ MongoDB.MongoClient.connect('mongodb://localhost:27017', {
 		}
 	}
 
-	app.get('/v1/account/disableCreate', async (req, res) => {
+	app.get('/v1/account/disableStates', async (req, res) => {
 		try {
 			if (req.headers.authorization == undefined) throw new Error('MissingToken');
 			const username = signer.unsign(req.headers.authorization);
 			if (await checkPermissions(username) < 2) throw new Error('Permissions');
 			res.send({
 				success: true,
-				state: cache.registerDisable
+				states: {registerDisable: cache.registerDisable, adminShowDisable: cache.adminShowDisable}
 			});
 		}
 		catch (err) {
 			errors(err, res);
 		}
 	});
 
-
 	app.post('/v1/account/disableCreate', async (req, res) => {
 		try {
 			if (req.headers.authorization == undefined) throw new Error('MissingToken');
@@ -178,21 +177,6 @@ MongoDB.MongoClient.connect('mongodb://localhost:27017', {
 		}
 	});
 
-	app.get('/v1/account/adminShowDisable', async (req, res) => {
-		try {
-			if (req.headers.authorization == undefined) throw new Error('MissingToken');
-			const username = signer.unsign(req.headers.authorization);
-			if (await checkPermissions(username) < 2) throw new Error('Permissions');
-			res.send({
-				success: true,
-				state: cache.adminShowDisable
-			});
-		}
-		catch (err) {
-			errors(err, res);
-		}
-	});
-
 
 	app.post('/v1/account/adminShowDisable', async (req, res) => {
 		try {

client/src/App.js

@@ -34,7 +34,7 @@ const Login = lazy(() => import("./login.js"));
 const Admin = lazy(() => import("./admin.js"));
 const Oops = lazy(() => import("./oops.js"));
 
-var ctfxVersion = "0.9"
+var ctfxVersion = "0.9.1"
 
 
 class App extends React.Component {

client/src/adminUsers.js

@@ -105,27 +105,29 @@ class AdminUsers extends React.Component {
             modalLoading: false,
             disableRegisterState: false,
             disableLoading: false,
+            disableLoading2: false,
+            disableAdminShow: false,
             selectedTableKeys: [],
             disableEditButtons: true
         }
     }
 
     componentDidMount() {
         this.fillTableData()
-        this.getDisableRegister()
+        this.getDisableStates()
     }
 
-    getDisableRegister = async () => {
+    getDisableStates = async () => {
         this.setState({ disableLoading: true })
-        await fetch(window.ipAddress + "/v1/account/disableCreate", {
+        await fetch(window.ipAddress + "/v1/account/disableStates", {
             method: 'get',
             headers: { 'Content-Type': 'application/json', "Authorization": localStorage.getItem("IRSCTF-token") },
         }).then((results) => {
             return results.json(); //return data in JSON (since its JSON data)
         }).then((data) => {
             if (data.success === true) {
                 //console.log(data)
-                this.setState({ disableRegisterState: data.state })
+                this.setState({ disableRegisterState: data.states.registerDisable, disableAdminShow: data.states.adminShowDisable  })
             }
             else {
                 message.error({ content: "Oops. Unknown error" })
@@ -193,7 +195,7 @@ class AdminUsers extends React.Component {
 
 
     deleteAccounts = async (close, users) => {
-        this.setState({disableEditButtons: true})
+        this.setState({ disableEditButtons: true })
         await fetch(window.ipAddress + "/v1/account/delete", {
             method: 'post',
             headers: { 'Content-Type': 'application/json', "Authorization": localStorage.getItem("IRSCTF-token") },
@@ -215,16 +217,16 @@ class AdminUsers extends React.Component {
             else {
                 message.error({ content: "Oops. Unknown error" })
             }
-            
+
 
 
         }).catch((error) => {
             console.log(error)
             message.error({ content: "Oops. There was an issue connecting with the server" });
-            
+
         })
         close()
-        this.setState({selectedTableKeys: []})
+        this.setState({ selectedTableKeys: [] })
 
     }
 
@@ -301,6 +303,38 @@ class AdminUsers extends React.Component {
         this.setState({ disableLoading: false })
     }
 
+    disableAdminShow = async (value) => {
+        this.setState({ disableLoading2: true })
+        await fetch(window.ipAddress + "/v1/account/adminShowDisable", {
+            method: 'post',
+            headers: { 'Content-Type': 'application/json', "Authorization": localStorage.getItem("IRSCTF-token") },
+            body: JSON.stringify({
+                disable: value
+            })
+        }).then((results) => {
+            return results.json(); //return data in JSON (since its JSON data)
+        }).then((data) => {
+            if (data.success === true) {
+                if (value) {
+                    message.success("Admin scores disabled")
+                }
+                else {
+                    message.success("Admin scores enabled")
+                }
+                this.setState({ disableAdminShow: value })
+
+            }
+            else {
+                message.error({ content: "Oops. Unknown error" })
+            }
+
+
+        }).catch((error) => {
+            message.error({ content: "Oops. There was an issue connecting with the server" });
+        })
+        this.setState({ disableLoading2: false })
+    }
+
 
     handleTableSelect = (selectedRowKeys) => {
         this.setState({ selectedTableKeys: selectedRowKeys })
@@ -413,7 +447,21 @@ class AdminUsers extends React.Component {
                     />
                 </Table>
                 <Divider />
-                <h3>Disable User Registration:  <Switch disabled={this.state.disableLoading} onClick={this.disableRegister} checked={this.state.disableRegisterState} /></h3>
+
+                <div style={{ display: "flex", justifyContent: "space-between" }}>
+
+                    <div>
+                        <h3>Disable User Registration:  <Switch disabled={this.state.disableLoading} onClick={this.disableRegister} checked={this.state.disableRegisterState} /></h3>
+                        <p>Disables user registration for unregistered users. Admins can still create users from this page.</p>
+                    </div>
+
+                        <Divider type="vertical" style={{ height: "inherit" }} />
+
+                    <div>
+                        <h3>Disable Admin Scores:  <Switch disabled={this.state.disableLoading2} onClick={this.disableAdminShow} checked={this.state.disableAdminShow} /></h3>
+                        <p>Prevents admin scores from showing up on scoreboards and profile pages. Admin solves will still appear under the solve list in challenges.</p>
+                    </div>
+                </div>
 
             </Layout>
         );