Fix merge conflicts

backend/src/ee/services/ldap-config/ldap-config-service.ts

@@ -284,30 +284,11 @@ export const ldapConfigServiceFactory = ({
       organizationSlug: string;
     };
 
-    // req.ldapConfig = getLdapCfg2(organization.id);
-
     const boot = async () => {
       const organization = await orgDAL.findOne({ slug: organizationSlug });
       const ldapConfig = await getLdapCfg2(organization.id); // repeat?
       req.ldapConfig = ldapConfig;
 
-      // example
-      // var opts = {
-      //     server: {
-      //         // url: 'ldaps://openldap:636', // connection over SSL/TLS
-      //         url: 'ldap://openldap:389',
-      //         bindDN: 'cn=admin,dc=acme,dc=com',
-      //         bindCredentials: 'admin',
-      //         searchBase: 'ou=people,dc=acme,dc=com',
-      //         searchFilter: '(uid={{username}})',
-      //         searchAttributes: ['uid', 'givenName', 'sn'], // optional, defaults to all (get username too)
-      //         // tlsOptions: {
-      //         //     ca: [caCert]
-      //         // }
-      //     },
-      //     passReqToCallback: true
-      // };
-
       const opts = {
         server: {
           url: ldapConfig.url,

backend/src/ee/services/permission/permission-service.ts

@@ -177,6 +177,8 @@ export const permissionServiceFactory = ({
 
   const getServiceTokenProjectPermission = async (serviceTokenId: string, projectId: string) => {
     const serviceToken = await serviceTokenDAL.findById(serviceTokenId);
+    if (!serviceToken) throw new BadRequestError({ message: "Service token not found" });
+
     if (serviceToken.projectId !== projectId)
       throw new UnauthorizedError({
         message: "Failed to find service authorization for given project"