refactor: Remove earlier handling of personal API tokens

As the API tokens won't be personal tokens anymore, remove the logic to
add and edit them.

Signed-off-by: Johanna Lamppu <johanna.lamppu@doubleopen.org>

Author: lamppu

apps/api/src/helpers/keycloak_queries.ts

@@ -155,9 +155,6 @@ export const createUser = async (data: {
         value: string;
         temporary: boolean;
     }[];
-    attributes: {
-        dosApiToken: string;
-    };
     enabled?: boolean;
     firstName?: string;
     lastName?: string;
@@ -221,7 +218,7 @@ export const createUser = async (data: {
         }
     }
 
-    const user = (await getUsers(data.username, undefined, true))[0];
+    const user = (await getUsers(data.username, true))[0];
 
     if (!user) {
         throw new CustomError("Failed to create user. User not found", 500);
@@ -407,7 +404,6 @@ export const addRealmRolesToUser = async (
 
 export const getUsers = async (
     username?: string,
-    dosApiToken?: string,
     exact?: boolean,
 ): Promise<User[]> => {
     let retries = 3;
@@ -423,7 +419,6 @@ export const getUsers = async (
                 queries: {
                     username: username,
                     exact: exact,
-                    q: dosApiToken ? "dosApiToken:" + dosApiToken : undefined,
                 },
                 headers: {
                     Authorization: "Bearer " + token.access_token,
@@ -477,9 +472,6 @@ export const updateUser = async (
             temporary: boolean;
         }[];
         realmRoles?: string[];
-        attributes?: {
-            dosApiToken?: string;
-        };
         enabled?: boolean;
         firstName?: string;
         lastName?: string;

apps/api/src/routes/admin_router.ts

@@ -2,7 +2,6 @@
 //
 // SPDX-License-Identifier: MIT
 
-import crypto from "crypto";
 import { zodiosRouter } from "@zodios/express";
 import { Prisma } from "database";
 import { adminAPI } from "validation-helpers";
@@ -38,8 +37,6 @@ adminRouter.post(
             const role = req.body.role ? req.body.role : "USER";
             const realmRoles =
                 role === "USER" ? ["app-user"] : ["app-user", "app-admin"];
-            const dosApiToken =
-                req.body.dosApiToken || crypto.randomBytes(16).toString("hex");
 
             const newUser = await createUser({
                 username,
@@ -53,9 +50,6 @@ adminRouter.post(
                                 : true,
                     },
                 ],
-                attributes: {
-                    dosApiToken: dosApiToken,
-                },
                 enabled: true,
                 firstName: req.body.firstName,
                 lastName: req.body.lastName,
@@ -68,7 +62,6 @@ adminRouter.post(
             res.status(200).send({
                 id: newUser.id,
                 username: newUser.username,
-                dosApiToken: dosApiToken,
                 realmRoles: realmRoles,
                 firstName: newUser.firstName,
                 lastName: newUser.lastName,

apps/api/src/routes/user_router.ts

@@ -2,7 +2,6 @@
 //
 // SPDX-License-Identifier: MIT
 
-import crypto from "crypto";
 import { zodiosRouter } from "@zodios/express";
 import { Package, Prisma } from "database";
 import { getPresignedGetUrl } from "s3-helpers";
@@ -58,31 +57,11 @@ userRouter.put("/user", async (req, res) => {
     }
 });
 
-userRouter.put("/token", async (req, res) => {
-    try {
-        const token = crypto.randomBytes(16).toString("hex");
-
-        // Update user token
-        await updateUser(req.kauth.grant.access_token.content.sub, {
-            username: req.kauth.grant.access_token.content.preferred_username,
-            email: req.kauth.grant.access_token.content.email,
-            firstName: req.kauth.grant.access_token.content.given_name,
-            lastName: req.kauth.grant.access_token.content.family_name,
-            attributes: { dosApiToken: token },
-        });
-
-        res.status(200).json({ token: token });
-    } catch (error) {
-        console.log("Error: ", error);
-        res.status(500).json({ message: "Internal server error" });
-    }
-});
-
 const getUserIdArray = async (username: string, usernameStrict?: boolean) => {
     let userIds: string[] = [];
 
     if (usernameStrict) {
-        const matchingUsers = await getUsers(username, undefined, true);
+        const matchingUsers = await getUsers(username, true);
         if (matchingUsers.length === 1) userIds = [matchingUsers[0].id];
         else if (matchingUsers.length > 1)
             throw new CustomError(

apps/clearance_ui/src/components/navigation/UserMenuItem.tsx

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import { useQueryClient } from "@tanstack/react-query";
-import { KeyRound, LogOut, UserRound, UsersRound } from "lucide-react";
+import { LogOut, UserRound, UsersRound } from "lucide-react";
 import { signIn, signOut } from "next-auth/react";
 import Link from "next/link";
 import { GrLogin } from "react-icons/gr";
@@ -85,15 +85,6 @@ const UserMenuItem = ({ className }: UserMenuItemProps) => {
                                 <span>Profile</span>
                             </Link>
                         </DropdownMenuItem>
-                        <DropdownMenuItem>
-                            <Link
-                                href="/settings?section=tokens"
-                                className="w-full"
-                            >
-                                <KeyRound className="mr-2 inline-block h-4 w-4" />
-                                <span>Tokens</span>
-                            </Link>
-                        </DropdownMenuItem>
                     </DropdownMenuGroup>
                     {user.permissions &&
                         hasPermission(user.permissions, "Users", "POST") && (

apps/clearance_ui/src/components/user_management/AddUserForm.tsx

@@ -44,7 +44,6 @@ const addUserFormSchema = z.object({
     firstName: z.string().optional(),
     lastName: z.string().optional(),
     email: z.string().email().optional(),
-    dosApiToken: z.string().optional(),
 });
 
 type AddUserDataType = z.infer<typeof addUserFormSchema>;
@@ -56,7 +55,6 @@ type AddUserFormProps = {
             username: string;
             password: string;
             realmRoles: string[];
-            dosApiToken?: string;
             firstName?: string;
             lastName?: string;
             email?: string;
@@ -79,7 +77,6 @@ const AddUserForm = ({ onNewUserCreated }: AddUserFormProps) => {
                 username: data.username,
                 password: form.getValues("password"),
                 realmRoles: data.realmRoles,
-                dosApiToken: data.dosApiToken,
                 firstName: data.firstName,
                 lastName: data.lastName,
                 email: data.email,

apps/clearance_ui/src/components/user_management/TokenDialog.tsx

@@ -5,7 +5,6 @@
 import { Loader2 } from "lucide-react";
 import { useUser } from "@/hooks/useUser";
 import MultiSection from "@/components/common/MultiSection";
-import TokenDialog from "@/components/user_management/TokenDialog";
 import UserDataForm from "@/components/user_management/UserDataForm";
 
 export default function Settings() {
@@ -17,22 +16,6 @@ export default function Settings() {
         return <UserDataForm />;
     }
 
-    function Tokens() {
-        return (
-            <>
-                <p className="pt-4">
-                    Here you can create a token you will need for running ORT
-                    with DOS Scanner, or to use the scanner via the API.
-                </p>
-                <p className="pt-4 pb-8">
-                    Please note that your previous token will be invalidated
-                    when you create a new one.
-                </p>
-                <TokenDialog />
-            </>
-        );
-    }
-
     return (
         <>
             {user ? (
@@ -46,12 +29,6 @@ export default function Settings() {
                             href: "/settings?section=profile",
                             content: Profile,
                         },
-                        {
-                            title: "Tokens",
-                            tag: "tokens",
-                            href: "/settings?section=tokens",
-                            content: Tokens,
-                        },
                     ]}
                 />
             ) : (