@open-xchange/soap-client 0.0.5 → 0.0.7

package/bin/provision.js

@@ -6,8 +6,7 @@ import * as secondaryAccountService from '../services/secondaryAccount.js'
 import * as userService from '../services/common/user.js'
 import * as contextService from '../services/common/context.js'
 
-dotenv.config({ path: '.env' })
-dotenv.config({ path: '.env.defaults' })
+dotenv.config({ path: ['.env', '.env.defaults'], quiet: true })
 
 const contextAdmin = {
   admin: {
@@ -31,7 +30,7 @@ function checkEnvironmentVariables () {
   }
 }
 
-async function getOrCreateContext (data) {
+async function getOrCreateContext (data, accessCombinationName = 'all') {
   const contextData = {
     ...{ maxQuota: -1 },
     ...data
@@ -45,7 +44,7 @@ async function getOrCreateContext (data) {
       context = existingContext[0]
     } else {
       console.log('Creating new context')
-      context = await contextService.create(contextData, contextAdmin.admin)
+      context = await contextService.create(contextData, contextAdmin.admin, accessCombinationName)
     }
     return {
       ...context,
@@ -59,12 +58,15 @@ async function getOrCreateContext (data) {
 
 async function getOrCreateUser (context, userData) {
   try {
-    const existingUser = await userService.list(context, userData.display_name)
-    if (existingUser?.length > 0) {
-      console.log('User already exists, using existing one')
-      return existingUser[0]
+    const existingUsers = (await Promise.all([
+      userService.list(context, userData.name),
+      userService.list(context, userData.display_name)
+    ])).flat().filter(Boolean)
+    if (existingUsers?.length > 0) {
+      console.log('User already exists', userData.name)
+      return existingUsers[0]
     }
-    console.log('Creating new user')
+    console.log('Creating new user', userData.name)
     userData = {
       imapServer: process.env.IMAP_SERVER || 'main-dovecot',
       smtpServer: process.env.SMTP_SERVER || 'main-postfix',
@@ -114,10 +116,10 @@ async function provisionFromFile (configPath) {
   for (const contexts of config.contexts || []) {
     try {
       const contextData = contexts.data
-      const context = await getOrCreateContext({ name: contexts.data.name, admin: contexts.data.admin })
-      if (contextData.capabilities) {
+      const context = await getOrCreateContext({ name: contexts.data.name, admin: contexts.data.admin, }, contextData.accessCombinationName || 'all')
+      if (contextData.capabilities || contextData.capabilitiesToRemove) {
         try {
-          await contextService.changeCapabilities(context.id, contextData.capabilities, undefined)
+          await contextService.changeCapabilities(context.id, contextData.capabilities, contextData.capabilitiesToRemove)
           console.log('Changed capabilities for context:', context.id)
         } catch (capError) {
           console.error('Error changing capabilities for context', context.id, capError)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-xchange/soap-client",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "SOAP client for OX App Suite",
   "main": "index.js",
   "type": "module",
@@ -22,7 +22,7 @@
   "dependencies": {
     "commander": "^14.0.0",
     "dotenv": "^17.2.1",
-    "p-retry": "^6.2.1",
+    "p-retry": "^7.0.0",
     "soap": "^1.3.0"
   },
   "devDependencies": {

package/services/common/context.js

@@ -58,7 +58,7 @@ export async function remove (id) {
       ```
  * @returns {Promise<Object>} The created context.
  */
-export async function create (ctx = {}, adminUser = {}) {
+export async function create (ctx = {}, adminUser = {}, accessCombinationName = 'all') {
   return await (await OXContextService)
     .createAsync({
       ctx,
@@ -73,7 +73,7 @@ export async function create (ctx = {}, adminUser = {}) {
       }, adminUser)
     })
     .then(async context => {
-      await changeModuleAccessByName(context.id, 'all')
+      await changeModuleAccessByName(context.id, accessCombinationName)
       return context
     })
     .catch(e => {

package/services/common/user.js

@@ -119,3 +119,12 @@ export async function list (context, searchPattern, includeGuests = false) {
     auth: context.admin
   })
 }
+
+export async function listAll (context, includeGuests = false, excludeUsers = []) {
+  return await (await OXUserService).listAsync({
+    ctx: { id: context.id },
+    include_guests: includeGuests,
+    exclude_users: excludeUsers,
+    auth: context.admin
+  })
+}