mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-07 18:25:23 +00:00
47880: Create branch for Cloud Convergence from the latest state of HEAD (Revision 47874) 47886: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 33052: (RECORD ONLY) Branch for Enterprise 4.0 service pack development 38002: (RECORD ONLY) Create branch for 4.1 Enterprise releases, based on 4.0.2 38003: (RECORD ONLY) Update version to 4.1.0 38079: (RECORD ONLY) Updated schema version to 5100 38536: (RECORD ONLY) Merged V4.1-BUG-FIX to V4.1 38219: ALF-14674: DOS voodoo to make start_deployment.bat work, as installed by Bitrock 38344: ALF-14674: Deployment installer still doesn't work - Use ${installdir.escape_backslashes} instead of ${installdir} 38471: ALF-14674: Deployment installer still doesn't work - Correction to use of ${installdir.escape_backslashes} 39519: (RECORD ONLY) Merged PATCHES/V4.0.2 to V4.1 38899: ALF-15005: Merged V4.0-BUG-FIX to PATCHES/V4.0.2 37920: ALF-13816: Permission Denied on web-client browsing if parent does not inherit permissions - FileFolderService getNamePath() now performs toFileInfo() as SystemUser. 38900: ALF-15005: Merged V4.1-BUG-FIX to PATCHES/V4.0.2 38549: ALF-11861: Maintain the same defuault root of WebDav for Alfresco 4.0 as was in pre-4.0 Removed overriding protocols.rootPath property from installer and enterprise overlay versions of alfresco-global.properties so that correct setting in repository.properties is used. 39494: ALF-15213 / ALF-15170: Can't change folder permissions in Private or Public-moderated sites - Fix by Dmitry V 44843: (RECORD ONLY) Created hotfix branch off V4.1 build 372 revision 44743 (candidate 4.1.2 release) 45708: (RECORD ONLY) Merged PATCHES/V4.1.2 to PATCHES/V4.1.3 45570: Merged V3.4-BUG-FIX to PATCHES/V4.1.2 43939: ALF-17197 / ALF-16917: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX 43896: MNT-198: Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters - Now we can cope with a runAs where the username is in the wrong case 45714: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/DEV/V4.1.3 45513: MNT-279: Use binary search in cached authority search to cut down search time when a group contains an astronomical number of authorities - Experimental fix to cut down on severe profiling hit 45715: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3 44848: Fix for ALF-17178 SolrLuceneAnalyser.findAnalyser generating InavlidQNameExceptions wher they are easily protected. 46188: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3 46014: Fix for ALF-17732 - SWF files are considered insecure content and should not be displayed directly in the browser. 46160: Fix for ALF-17759 - HTML files are stripped from metadata and style information after they are uploaded. 46165: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately 46169: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately - missing file 46186: Fix for ALF-17786 - Site dashboard page issues too many requests (Site Members dashlet issues avatar requests when it doesn't need too) 46242: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3: 46184: Refactoring a test class to use JUnit Rules - as part of attempt to reproduce ALF-17797. 46192: Enhancement to JUnit Rule TemporaryNodes.java as required by fix for ALF-17797. 46194: Fix for ALF-17797. AddFailedThumbnailActionExecuter is failing. 46710: (RECORD ONLY) Create branch for Cloud Convergence from the latest state of 4.1.3 (RC5, Build 85, Revision 46648) 47908: Merged from DEV/CONV_V143 to DEV/CONV_HEAD 46788: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30323: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30171: ALF-9613: caching content store. Various improvements and bug fixes. Including: 30325: THOR-114: S3 content store 30326: THOR-128: S3 content store 30333: THOR-139 F101: Get account for user e-mail id 30335: Merge from THOR0 to THOR1 r30274: THOR-135 is email address accepted by Alfresco? Part One. 30340: THOR-99: Thor module - enable tests 30341: Removing duplicate account-service-context.xml file. 30343: Merge THOR0 to THOR1 30339: Test email singup in Share complete 30338: New form runtime features: - Yellow background is displayed for mandatory fields without value - Red background dis displayed for fields with validation errors - Error message is displayed in a balloon when fields with error has focus - Using balloons is now the default method of displaying errors - Removed balloon code form create site menu since its now handled automatically - An alternative to balloons are "error containers" (div with clickable red text labels focusing the field): setErrorContainer(divEl) - Its possible to setMultipleErrors(true) to display all the forms/fields errors in the "error container"/ballon. - Its possible to turn of the balloons and error containers complete by setting setErrorContainer(null) - js validation handlers no longer needs to handle the messages OR the css classes for mandatory & invalid 30344: Missing value check caused js undefined error 30346: Minor css form fixes 30347: THOR-126: S3 content store - do not swallow exceptions 30348: THOR-66: disable unused services/features 30349: THOR-137 F88: Add existing external user (from another network) checkpoint 30350: THOR-135 Is email address accepted by Alfresco. 46789: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35594: Fix merge issue 47930: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46762: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46768: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46769: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46778: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46780: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46786: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46791: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46792: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46808: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46809: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46819: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46829: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46839: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46842: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46844: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46846: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46847: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46876: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46877: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46878: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46879: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46880: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46881: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47947: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46737: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35288: Alfresco Cloud (from BRANCHES/V4.0) 35389: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30170: Thor branch based on Swift feature complete 30185: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 28973: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle) 28999: THOR-3: Tenant Routing Data Source (dynamic tenant-aware DB connection pools) 29022: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle) 29031: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle) 30186: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: (3 conflicts resolved) 29116: THOR-3: Tenant Routing Data Source (dynamic tenant-aware DB connection pools) 29174: THOR-24 Set up new Alfresco AMP module project. 29186: THOR-25 Copy and refactor Account Service from SambaJAM 29193: ImporterComponent - prep for THOR-7 29198: THOR-7: Tenant Service API - Create Tenant (using separate DB schema) 29204: THOR-29 Account Type Registry 29234: THOR-7: Tenant Service API - Create Tenant (using separate DB schema) 29246: THOR-7: Tenant Service API - Create Tenant (using separate DB schema) 29251: THOR-30 Added AccountDAO interface along with two implementations: AccountDAOImpl (not implemented) which will manage Account data in an RDB via iBatis. AccountDAO_InMemory which manages AccountInfo in simple HashMaps for testing purposes only. 29258: THOR-28 29259: Addendum to THOR-25. Moved account-service spring config into a subfolder. (trivial) 35393: (RECORD ONLY) Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: - fix up classpath (remove mybatis 1.0.0 -> 1.0.1 and chemistry 0.4.0 -> 0.6.0) 35411: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUD1: 35409: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX: 35399: ALF-12874: Schema reference files are out of date. 35452: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUD1: 34219: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/V4.0-BUG-FIX: 32096: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)" 32125: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)" 34220: Minor: follow-on to r34219 (ALF-11563) 34747: ALF-13262: adding missing indexes for new schema's (activiti-schema create) + schema patch for existing schema 35417: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/V4.0-BUG-FIX: (THOR-6 / ALF-13755) 29356: THOR-6: MT is configured (but not enabled) by default - will be auto-enabled when first tenant is created 29455: THOR-6: build test/fix 29471: THOR-6: build test/fix 35423: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/V4.0-BUG-FIX: (THOR-4 / ALF-13756) 29500: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 29501: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 29503: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 47949: Merged HEAD to BRANCHES/DEV/CONV_HEAD: 47914: Merge fix for org.alfresco.repo.cache.AbstractAsynchronouslyRefreshedCache<T> R 46078, 46079, 46121 47958: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46746: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35455: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30187: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29260: THOR: Initial Tenant Admin Service REST API - create, delete, get (list) web scripts 29356: THOR-6: MT is configured by default 29366: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29377: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29398: Refactoring of code to remove deprecation warnings. Replaced lots of object.field accesses with object.getField() calls.Trivial changes, but with so many warnings I can't see the wood for the trees. 29400: THOR-59: selectively disable certain test suites (for THOR dev build plan) 35456: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30188: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29442: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29453: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29455: THOR-76: track THOR build test failures and fix-up 29471: THOR-76: track THOR build test failures and fix-up 35459: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30189: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29473: Preliminary checkin for THOR-44. Created placeholder interface/impl/spring config for a new UserService. 29497: THOR-76: track THOR build test failures and fix-up ( LicenseComponentTest) 29500: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 29501: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 29503: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 29511: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29512: Adding a new JUnit4 test class with an @Ignore'd test in it - to see how Bamboo reports these. 29514: THOR: Initial Tenant Admin Service REST API - create, delete, list web scripts 29515: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29521: THOR-79 - mark AVM sitestore as unindexed 35461: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30190: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29533: THOR-59: exclude certain N/A tests 29555: THOR-76: track THOR build test failures 29630: Added ant build targets for Cloud Module and a new executable for the Alfresco devenv. 29664: THOR-76: exclude system test suites 29667: THOR-64: add initial support for tenant routing data source 29676: THOR-76: exclude intermittent ActionTrackingServiceImplTest (pending ALF-9773 & ALF-9774) 29677: THOR-80: MT-aware S3 content store 29678: THOR-80: MT-aware S3 content store 29680: THOR-80: MT-aware S3 content store 29693: THOR-80: MT-aware S3 content store 29694: THOR-80: MT-aware S3 content store 47959: CONV_HEAD: CLOUD-1348 - comment back in MultiTDemoTest.testDeleteAllTenants 47967: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46748: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35464: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30195: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29774: Refactor Account DAO and Service. Boost Tests. Add appropriate headers. 29776: THOR-76: exclude intermittent ActionTrackingServiceImplTest (pending ALF-9773 & ALF-9774) 29795: Implemented MyBatis-backed Account DAO: 29817: Move (and rename) user service from repository to thor 30196: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29827: THOR-69: TenantAdminDAO 29832: THOR-78: fix tenantEntityCache (shared) 29834: THOR-111: experimental config option for S3 content store to support flat root (ie. all tenant files in single folder) 29856: THOR updates 29857: THOR-76: exclude build components/projects 46761: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35478: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30198: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29869: THOR-92. BPMN2.0 workflow definition for account self-signup. 29871: THOR-93. REST API for self signup (and miscellaneous related items). 29882: THOR-102: Faster CreateTenant 29888: THOR-95. Placeholder email template for self-signup. 29889: Completion of THOR-95. Placeholder emails for self-signup. Added a 'you've already registered' template. 29896: THOR-89F100: Create User Foundation API… 29912: Fix issue where module believed it was still executed after delete tenant 29940: THOR-96. First cut of a signup email sender delegate. This will be refined later - probably both in this sprint and the next. 29966: Fixing InvitationServiceImplTest failing tests, which are failing because the email templates are not there. 29978: THOR-89: Switch tenant for person creation 29982: THOR-89: Fix multi-domain account creation test after review with Jan 29983: THOR-102: Faster CreateTenant 29985: THOR-90: F99 Is email address already registred foundation API 29991: THOR-99: Thor module build/packaging 29994: Changes for THOR-92, THOR-93 and THOR-96. 30199: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29995: THOR-93. Use the proper sspring config in the test case. 29996: THOR-99: Thor module build/packaging 29997: Consolidated DaveC's EmailAddressService and my EMailUtil into a single feature. 29998: Follow-on to previous check-in (29997). Deletion of now-unused folder. 30000: Blatant attempt to get svn r=30k. Removing some dead config. 30001: THOR-96. Ensure that we get a meaningful exception when attempting to activate an account with no pending workflow for that email. 30036: Resolve issues with tenant-independent user store - can now login via Share 30041: Package and auto deploy of license with Thor module 30048: Ensure that when a duplicate email prevents a workflow from creating an account, that the workflow still ends gracefully. 30049: Removing a dead class that I'd used to see how our Bamboo handles @Ignore(message=msg) @Test annotations. 30054: THOR-84 F82: List Accounts Foundation API 30067: THOR-87 List Accounts REST API. 30069: THOR-87. Completion of listAccounts REST API. Fixed the problems in the JUnit test case and tweaked the FTL slightly. 30071: Cosmetic changes as part of THOR-93. 30072: Oops. Broke a test case. Follow-on to previous (30071) check-in which cosmetically changed JSON as part of THOR-93. 30073: As part of THOR-93 (REST API signup) I have made the 2 webscripts usable without any authentication. 30074: Trivial fix to an error string. 30076: THOR-93. The account-activation.post webscript now includes the provided workflowInstanceId when identifying the ongoing workflow. 30077: Fix Email validator to allow for example domains 30202: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 30140: Refactor of account signup workflow 30142: No longer require email address for activation step of sign-up 30143: Remove use of task query in account signup workflow 30146: thor-share project structure 30147: Buildfix (removed modules not used by THOR) 30151: Incorporate already registered use case into account signup workflow 30152: Finally resolve license loading in Eclipse based tests 30203: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 30184: Build box fix as a result of not including certian components 30206: Fix blatant merge issues 47972: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46766: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35497: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/CLOUD1: 29723: THOR-31: MT-aware shared caches 29749: THOR-5: MT-aware immutable singletons 29762: THOR-31: MT-aware shared cache 46767: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35507: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30237: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29532: THOR-79 - add ability to disable Lucene indexes (so that IndexInfo / IndexInfoBackup files are not created per store per tenant) 29723: THOR-31: MT-aware shared caches 29749: THOR-5: MT-aware immutable singletons 29762: THOR-31: MT-aware shared cache 47973: CONV_HEAD: CLOUD-1348 - comment back in MultiTDemoTest tests (testNonSharedGroupDeletion & testSharedGroupDeletion) 47975: CONV_HEAD: CLOUD-1348 - comment back in FeedNotifierTest.testFailedNotifications 47988: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46775: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35531: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30449: F66: add option to configure a common "contentRootContainerPath" 30564: THOR-156: prep - consolidate runAsSystemTenant/runAsPrimaryTenant 35532: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30777: THOR-201: temporarily comment-out MultiTDemoTest.testDeleteArchiveAndRestoreContent (pending fix for THOR-201) 48008: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46844: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46895: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46903: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46907: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46922: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46974: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46991: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46992: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46994: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47107: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47265: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47267: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47272: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47277: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47284: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47286: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47289: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47292: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 48009: Merged DEV/CONV_V413 to DEV/CONV_HEAD 46801: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35602: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30513: Cloud Share module 30515: Fix issue with person replication between tenants. 30516: Slight mod to email validation web script response. 30518: Quick fix for workflow id generation in sign email 30534: THOR-163: Unable to get license file 30535: Fix Thor build process. 30536: Refine user's home site name and description 30539: THOR-96. When sending the signup email, execute the mail action asynchronously. 30542: Replace placeholder text in sign-up email 30543: Account Activation 46802: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35643: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30544: Account activation 30545: Account activation 30550: AMP build targets 30554: THOR-94. Cloud site invitation workflow. 30555: AMP build targets - added client side resources 48011: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47056: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47087: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47228: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47271: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47297: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47299: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47300: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47301: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47304: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47328: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47330: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47339: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 48013: Merged DEV/CONV_V413 to DEV/CONV_HEAD (commiting the missing merge info for r48009) 46801: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35602: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30513: Cloud Share module 30515: Fix issue with person replication between tenants. 30516: Slight mod to email validation web script response. 30518: Quick fix for workflow id generation in sign email 30534: THOR-163: Unable to get license file 30535: Fix Thor build process. 30536: Refine user's home site name and description 30539: THOR-96. When sending the signup email, execute the mail action asynchronously. 30542: Replace placeholder text in sign-up email 30543: Account Activation 46802: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35643: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30544: Account activation 30545: Account activation 30550: AMP build targets 30554: THOR-94. Cloud site invitation workflow. 30555: AMP build targets - added client side resources 48015: Merged DEV/CONV_V413 to DEV/CONV_HEAD 46841: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35684: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30904: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30270 ALF-9492 Can now update task properties through the Workflow JavaScript API. ALF-10087 Fixed failing Multi-tenancy tests. 30288 ALF-9492 Can now update task properties through the Workflow JavaScript API. 30309 Fixed failing MultiTDemoTest and re-enabled. 30356 ALF-10117: JBPM workflows should be hidden. 30358 Build fix, fallout from ALF-10117 (JBPM workflows should be hidden) 30415 Added parseRootElement() method to Activiti's BPMNParseListener. 30452 ALF-10276: Reject flow didn't set bpm_assignee property properly 30563 Added tests to ensure multi-tenancy works and fixed several multi-tenancy issues in workflow. 30698 ALF-9541: Fixed HistoricTaskEntity update when TaskEntity is loaded from DB 30699 ALF-10084, ALF-10242. Fixed issues and added WorkflowService methods to get workflow instances without filtering by definition id. 30750 ALF-10197, Added the ability to auto-complete Start Tasks in Activiti. If a start task extends the bpm:activitiStartTask type or implements the bpm:endAutomatically aspect then the task will be ended as soon as the workflow instance is started. 30796 ALF-10374 Fixed failing MultiTDemoTest 30908: Add logging for failed email domain lookups: 30922: Rolling back .classpath changes to Data Model. 30930: Basic version of site invite working 30931: THOR-172: Switch Tenant via public API 30936: Allow for repo web scripts to switch to user's default tenant via -default- tenant id: 30937: Implementation of THOR-214. There is now a new repo webscript to retrieve signup status for a given {id, key} pair. 30938: Allow dev email address to be specified in properties file: 30945: THOR-221: Add (EntityLookup) cache to AccountDAO 30946: Build fix. Renaming a test infrastructure class so that it doesn't get picked up by the ant test targets. 30955: THOR-222. Added inviter first and last name to invitation-status.get webscript. 46843: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35694: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30997: Firefox scrollbars removed on "invitation" and "signup" pages (now using new helper method Alfresco.util.createYUIOverlay) 31001: Impl of THOR-223. Webscripts for getting pending invitations. 31002: Invite - redirect bug fixed, removed old code matching previous webscript api, email picker style fixes 31003: Addendum for THOR-223. I've added an explicit test to record the fact that pending-invitations.get to a non-existent site returns 200 and an empty collection rather than a 404. 31004: Adding REST-client .rcq files as part of THOR-223 46848: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35700: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31014: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30999: ALF-9957 - MT: test and fix subscriptions (followers) 31020: Update invite email template to bring in line with wireframe and text 31021: Apply latest sanitized email blacklist: 31030: Fixed THOR-226 "DocLib "Detailed View" (default) does not list items - note: "Simple View" seems to be OK" 31033: THOR-228: Update aws sample file with quota config for cachingcontentstore 31036: Fixed THOR-236 "Webscript URL clash in signup" 31037: THOR-175: set and enforce per-tenant quota 31043: Fixed THOR-174 "F27: User can switch between networks they belong to" 46854: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35725: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31124: Fix for THOR-145. This check-in makes the Cloud Signup and Invitation workflows hidden within Share - users can't initiate them via "Start workflow..." 48016: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46793: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46795: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46796: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 48030: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46820: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35657: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30556: THOR-135F103: Is e-mail address accepted by Alfresco? 30562: Fixing a typo in the email-validation FTL. It was returning invalid JSON - no opening " on a string. 30569: THOR-156: switch to secondary tenant (initially via @@login) 30571: THOR-99: Thor build 48037: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46821: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35659: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30586: THOR-166. I've added an additional check at the start of the signup workflow that checks if the email is blocked. 30587: THOR-163: S3ContentReader fails to getObjectDetails 30592: THOR-156: switch to secondary tenant (initially via @@login) 35660: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30607: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30208: Remaining commits for ALF-9510 30218: Fix build - add missing files 30254: Encryption related documentation, source code comments 30392: Fix for ALF-10205 30405: Fix for ALF-10189 30406: Fix for ALF-10189: part 2 - minor update 30613: THOR-148. The cloud test target was accidentally excluding *RestTest.java. 30613: THOR-148. The cloud test target was accidentally excluding *RestTest.java. 30614: Revert some of the additional email checks in registration process 30615: Set ignore patterns for build dir in thor module 30619: Merged HEAD to BRANCHES/DEV/THOR1: 30618: Additional test classes that allow for easier testing of Notifications (emails mostly). 30622: Ensure use of System user, not system user 30624: Removed deep merge info 30625: Switch off creation of missing people, use Admin instead of System 46824: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46828: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 48038: Merged DEV/CONV_V413 to DEV/CONV_HEAD (ui-only) 46830: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30737: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30736: ALF-6706 - MT: activities not generated (for tenants) 30738: Site invite (rough version, not finished) 30741: THOR-175: Set and enforce file space quota for tenant 30752: Site invite - added som padding to user suggestion list 30753: Disabling 2 tests while I fix them. 30758: THOR-172 F63: Switch Tenant via public REST API: 30764: Tweak to Activiti integration code to prevent it from trying to create person nodes for the System user. 30766: Implementation of THOR-196. Inviting multiple email addresses in a single call. 30769: Re-enable MultiTDemoTest 30775: Site invite 30776: THOR-172: Switch Tenant via public API 30785: Add tenant id to account info returned in Thor responses 48043: Merged DEV/CONV_V413 to DEV/CONV_HEAD 46831: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30813: Add Eclipse project for Thor-Share module: 30815: THOR-175: Set and enforce file space quota for tenant 30817: Switch network skeleton code and minor fixes 30818: Update Share Node Browser (at least for THOR) to allow option to retrieve "storeroot" via DB query 30826: Add distribute-solr to Thor builds 48045: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30737: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30736: ALF-6706 - MT: activities not generated (for tenants) 30738: Site invite (rough version, not finished) 30741: THOR-175: Set and enforce file space quota for tenant 30752: Site invite - added som padding to user suggestion list 30753: Disabling 2 tests while I fix them. 30758: THOR-172 F63: Switch Tenant via public REST API: 30764: Tweak to Activiti integration code to prevent it from trying to create person nodes for the System user. 30766: Implementation of THOR-196. Inviting multiple email addresses in a single call. 30769: Re-enable MultiTDemoTest 30775: Site invite 30776: THOR-172: Switch Tenant via public API 30785: Add tenant id to account info returned in Thor responses git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48251 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
1557 lines
64 KiB
Java
1557 lines
64 KiB
Java
/*
|
|
* Copyright (C) 2005-2013 Alfresco Software Limited.
|
|
*
|
|
* This file is part of Alfresco
|
|
*
|
|
* Alfresco is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Alfresco is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
package org.alfresco.repo.invitation;
|
|
|
|
import java.io.Serializable;
|
|
import java.util.ArrayList;
|
|
import java.util.Arrays;
|
|
import java.util.Collections;
|
|
import java.util.Date;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Set;
|
|
|
|
import org.alfresco.model.ContentModel;
|
|
import org.alfresco.repo.admin.SysAdminParams;
|
|
import org.alfresco.repo.node.NodeServicePolicies;
|
|
import org.alfresco.repo.node.NodeServicePolicies.BeforeDeleteNodePolicy;
|
|
import org.alfresco.repo.policy.JavaBehaviour;
|
|
import org.alfresco.repo.policy.PolicyComponent;
|
|
import org.alfresco.repo.security.authentication.AuthenticationException;
|
|
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
|
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
|
|
import org.alfresco.repo.security.authentication.PasswordGenerator;
|
|
import org.alfresco.repo.security.authentication.UserNameGenerator;
|
|
import org.alfresco.repo.site.SiteModel;
|
|
import org.alfresco.repo.transaction.TransactionalResourceHelper;
|
|
import org.alfresco.repo.workflow.CancelWorkflowActionExecuter;
|
|
import org.alfresco.repo.workflow.WorkflowModel;
|
|
import org.alfresco.repo.workflow.activiti.ActivitiConstants;
|
|
import org.alfresco.repo.workflow.jbpm.JBPMEngine;
|
|
import org.alfresco.service.cmr.action.Action;
|
|
import org.alfresco.service.cmr.action.ActionService;
|
|
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
|
import org.alfresco.service.cmr.invitation.Invitation;
|
|
import org.alfresco.service.cmr.invitation.InvitationException;
|
|
import org.alfresco.service.cmr.invitation.InvitationExceptionForbidden;
|
|
import org.alfresco.service.cmr.invitation.InvitationExceptionNotFound;
|
|
import org.alfresco.service.cmr.invitation.InvitationExceptionUserError;
|
|
import org.alfresco.service.cmr.invitation.InvitationSearchCriteria;
|
|
import org.alfresco.service.cmr.invitation.InvitationService;
|
|
import org.alfresco.service.cmr.invitation.ModeratedInvitation;
|
|
import org.alfresco.service.cmr.invitation.NominatedInvitation;
|
|
import org.alfresco.service.cmr.repository.NodeRef;
|
|
import org.alfresco.service.cmr.repository.NodeService;
|
|
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
|
|
import org.alfresco.service.cmr.security.MutableAuthenticationService;
|
|
import org.alfresco.service.cmr.security.PermissionService;
|
|
import org.alfresco.service.cmr.security.PersonService;
|
|
import org.alfresco.service.cmr.site.SiteInfo;
|
|
import org.alfresco.service.cmr.site.SiteService;
|
|
import org.alfresco.service.cmr.workflow.WorkflowAdminService;
|
|
import org.alfresco.service.cmr.workflow.WorkflowDefinition;
|
|
import org.alfresco.service.cmr.workflow.WorkflowException;
|
|
import org.alfresco.service.cmr.workflow.WorkflowPath;
|
|
import org.alfresco.service.cmr.workflow.WorkflowService;
|
|
import org.alfresco.service.cmr.workflow.WorkflowTask;
|
|
import org.alfresco.service.cmr.workflow.WorkflowTaskQuery;
|
|
import org.alfresco.service.cmr.workflow.WorkflowTaskState;
|
|
import org.alfresco.service.namespace.NamespaceService;
|
|
import org.alfresco.service.namespace.QName;
|
|
import org.alfresco.util.GUID;
|
|
import org.alfresco.util.PropertyCheck;
|
|
import org.alfresco.util.UrlUtil;
|
|
import org.alfresco.util.collections.CollectionUtils;
|
|
import org.alfresco.util.collections.Function;
|
|
import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.LogFactory;
|
|
import org.springframework.extensions.surf.util.I18NUtil;
|
|
|
|
/**
|
|
* Implementation of invitation service.
|
|
*
|
|
* @see org.alfresco.service.cmr.invitation.Invitation
|
|
* @author mrogers
|
|
* @author Nick Smith
|
|
*/
|
|
public class InvitationServiceImpl implements InvitationService, NodeServicePolicies.BeforeDeleteNodePolicy
|
|
{
|
|
private static final Log logger = LogFactory.getLog(InvitationServiceImpl.class);
|
|
|
|
/**
|
|
* Services
|
|
*/
|
|
private WorkflowService workflowService;
|
|
private WorkflowAdminService workflowAdminService;
|
|
private ActionService actionService;
|
|
private PersonService personService;
|
|
private SiteService siteService;
|
|
private MutableAuthenticationService authenticationService;
|
|
private PermissionService permissionService;
|
|
private DictionaryService dictionaryService;
|
|
private NamespaceService namespaceService;
|
|
private NodeService nodeService;
|
|
// user name and password generation beans
|
|
private UserNameGenerator usernameGenerator;
|
|
private PasswordGenerator passwordGenerator;
|
|
private PolicyComponent policyComponent;
|
|
private SysAdminParams sysAdminParams;
|
|
|
|
// maximum number of tries to generate a invitee user name which
|
|
// does not already belong to an existing person
|
|
public static final int MAX_NUM_INVITEE_USER_NAME_GEN_TRIES = 10;
|
|
|
|
private int maxUserNameGenRetries = MAX_NUM_INVITEE_USER_NAME_GEN_TRIES;
|
|
|
|
// Property determining whether emails should be sent.
|
|
private boolean sendEmails = true;
|
|
/**
|
|
* Set the policy component
|
|
*
|
|
* @param policyComponent policy component
|
|
*/
|
|
public void setPolicyComponent(PolicyComponent policyComponent)
|
|
{
|
|
this.policyComponent = policyComponent;
|
|
}
|
|
|
|
/**
|
|
* Checks that all necessary properties and services have been provided.
|
|
*/
|
|
public void init()
|
|
{
|
|
PropertyCheck.mandatory(this, "nodeService", nodeService);
|
|
PropertyCheck.mandatory(this, "WorkflowService", workflowService);
|
|
PropertyCheck.mandatory(this, "ActionService", actionService);
|
|
PropertyCheck.mandatory(this, "PersonService", personService);
|
|
PropertyCheck.mandatory(this, "SiteService", siteService);
|
|
PropertyCheck.mandatory(this, "AuthenticationService", authenticationService);
|
|
PropertyCheck.mandatory(this, "PermissionService", permissionService);
|
|
PropertyCheck.mandatory(this, "NamespaceService", namespaceService);
|
|
PropertyCheck.mandatory(this, "NodeService", nodeService);
|
|
PropertyCheck.mandatory(this, "UserNameGenerator", usernameGenerator);
|
|
PropertyCheck.mandatory(this, "PasswordGenerator", passwordGenerator);
|
|
PropertyCheck.mandatory(this, "PolicyComponent", policyComponent);
|
|
|
|
//
|
|
this.policyComponent.bindClassBehaviour(QName.createQName(NamespaceService.ALFRESCO_URI, "beforeDeleteNode"),
|
|
SiteModel.TYPE_SITE, new JavaBehaviour(this, "beforeDeleteNode"));
|
|
this.policyComponent.bindClassBehaviour(BeforeDeleteNodePolicy.QNAME, ContentModel.TYPE_PERSON, new JavaBehaviour(this, "beforeDeleteNode"));
|
|
}
|
|
|
|
/**
|
|
* Get the names of the workflows which are managed by the invitation
|
|
* service
|
|
*
|
|
* @return the workflows which are managed by the invitation service
|
|
*/
|
|
public List<String> getInvitationServiceWorkflowNames()
|
|
{
|
|
List<String> ret = new ArrayList<String>(3);
|
|
ret.add(WorkflowModelNominatedInvitation.WORKFLOW_DEFINITION_NAME);
|
|
ret.add(WorkflowModelNominatedInvitation.WORKFLOW_DEFINITION_NAME_ACTIVITI);
|
|
ret.add(WorkflowModelModeratedInvitation.WORKFLOW_DEFINITION_NAME);
|
|
ret.add(WorkflowModelModeratedInvitation.WORKFLOW_DEFINITION_NAME_ACTIVITI);
|
|
// old deprecated invitation workflow.
|
|
ret.add("jbpm$wf:invite");
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* Start the invitation process for a NominatedInvitation
|
|
*
|
|
* @param inviteeUserName Alfresco user name of the invitee
|
|
* @param Invitation
|
|
* @param ResourceType resourceType
|
|
* @param resourceName
|
|
* @param inviteeRole
|
|
* @param serverPath
|
|
* @param acceptUrl
|
|
* @param rejectUrl
|
|
* @return the nominated invitation which will contain the invitationId and
|
|
* ticket which will uniqely identify this invitation for the rest
|
|
* of the workflow.
|
|
* @throws InvitationException
|
|
* @throws InvitationExceptionUserError
|
|
* @throws InvitationExceptionForbidden
|
|
*/
|
|
public NominatedInvitation inviteNominated(String inviteeUserName, Invitation.ResourceType resourceType,
|
|
String resourceName, String inviteeRole, String serverPath, String acceptUrl, String rejectUrl)
|
|
{
|
|
// inviteeUserName was specified
|
|
NodeRef person = this.personService.getPerson(inviteeUserName);
|
|
|
|
Serializable firstNameVal = this.getNodeService().getProperty(person, ContentModel.PROP_FIRSTNAME);
|
|
Serializable lastNameVal = this.getNodeService().getProperty(person, ContentModel.PROP_LASTNAME);
|
|
Serializable emailVal = this.getNodeService().getProperty(person, ContentModel.PROP_EMAIL);
|
|
String firstName = DefaultTypeConverter.INSTANCE.convert(String.class, firstNameVal);
|
|
String lastName = DefaultTypeConverter.INSTANCE.convert(String.class, lastNameVal);
|
|
String email = DefaultTypeConverter.INSTANCE.convert(String.class, emailVal);
|
|
|
|
return inviteNominated(firstName, lastName, email, inviteeUserName, resourceType, resourceName, inviteeRole,
|
|
serverPath, acceptUrl, rejectUrl);
|
|
}
|
|
/**
|
|
* Start the invitation process for a NominatedInvitation
|
|
*
|
|
* @param inviteeUserName Alfresco user name of the invitee
|
|
* @param Invitation
|
|
* @param ResourceType resourceType
|
|
* @param resourceName
|
|
* @param inviteeRole
|
|
* @param acceptUrl
|
|
* @param rejectUrl
|
|
* @return the nominated invitation which will contain the invitationId and
|
|
* ticket which will uniqely identify this invitation for the rest
|
|
* of the workflow.
|
|
* @throws InvitationException
|
|
* @throws InvitationExceptionUserError
|
|
* @throws InvitationExceptionForbidden
|
|
*/
|
|
public NominatedInvitation inviteNominated(String inviteeUserName, Invitation.ResourceType resourceType,
|
|
String resourceName, String inviteeRole, String acceptUrl, String rejectUrl)
|
|
{
|
|
// inviteeUserName was specified
|
|
NodeRef person = this.personService.getPerson(inviteeUserName);
|
|
|
|
Serializable firstNameVal = this.getNodeService().getProperty(person, ContentModel.PROP_FIRSTNAME);
|
|
Serializable lastNameVal = this.getNodeService().getProperty(person, ContentModel.PROP_LASTNAME);
|
|
Serializable emailVal = this.getNodeService().getProperty(person, ContentModel.PROP_EMAIL);
|
|
String firstName = DefaultTypeConverter.INSTANCE.convert(String.class, firstNameVal);
|
|
String lastName = DefaultTypeConverter.INSTANCE.convert(String.class, lastNameVal);
|
|
String email = DefaultTypeConverter.INSTANCE.convert(String.class, emailVal);
|
|
String serverPath = UrlUtil.getShareUrl(sysAdminParams);
|
|
|
|
return inviteNominated(firstName, lastName, email, inviteeUserName, resourceType, resourceName, inviteeRole,
|
|
serverPath, acceptUrl, rejectUrl);
|
|
}
|
|
/**
|
|
* Start the invitation process for a NominatedInvitation
|
|
*
|
|
* @param inviteeFirstName
|
|
* @param inviteeLastName
|
|
* @param inviteeEmail
|
|
* @param inviteeUserName optional Alfresco user name of the invitee, null
|
|
* if not on system.
|
|
* @param Invitation .ResourceType resourceType
|
|
* @param resourceName
|
|
* @param inviteeRole
|
|
* @param acceptUrl
|
|
* @param rejectUrl
|
|
* @return the nominated invitation which will contain the invitationId and
|
|
* ticket which will uniqely identify this invitation for the rest
|
|
* of the workflow.
|
|
* @throws InvitationException
|
|
* @throws InvitationExceptionUserError
|
|
* @throws InvitationExceptionForbidden
|
|
*/
|
|
public NominatedInvitation inviteNominated(String inviteeFirstName, String inviteeLastName, String inviteeEmail,
|
|
Invitation.ResourceType resourceType, String resourceName, String inviteeRole, String acceptUrl, String rejectUrl)
|
|
{
|
|
String serverPath = UrlUtil.getShareUrl(sysAdminParams);
|
|
return inviteNominated(inviteeFirstName, inviteeLastName, inviteeEmail, null, resourceType, resourceName,
|
|
inviteeRole, serverPath, acceptUrl, rejectUrl);
|
|
}
|
|
|
|
/**
|
|
* Start the invitation process for a NominatedInvitation
|
|
*
|
|
* @param inviteeFirstName
|
|
* @param inviteeLastName
|
|
* @param inviteeEmail
|
|
* @param inviteeUserName optional Alfresco user name of the invitee, null
|
|
* if not on system.
|
|
* @param Invitation .ResourceType resourceType
|
|
* @param resourceName
|
|
* @param inviteeRole
|
|
* @param serverPath
|
|
* @param acceptUrl
|
|
* @param rejectUrl
|
|
* @return the nominated invitation which will contain the invitationId and
|
|
* ticket which will uniqely identify this invitation for the rest
|
|
* of the workflow.
|
|
* @throws InvitationException
|
|
* @throws InvitationExceptionUserError
|
|
* @throws InvitationExceptionForbidden
|
|
*/
|
|
public NominatedInvitation inviteNominated(String inviteeFirstName, String inviteeLastName, String inviteeEmail,
|
|
Invitation.ResourceType resourceType, String resourceName, String inviteeRole, String serverPath,
|
|
String acceptUrl, String rejectUrl)
|
|
{
|
|
return inviteNominated(inviteeFirstName, inviteeLastName, inviteeEmail, null, resourceType, resourceName,
|
|
inviteeRole, serverPath, acceptUrl, rejectUrl);
|
|
}
|
|
|
|
// Temporary method
|
|
private NominatedInvitation inviteNominated(String inviteeFirstName, String inviteeLastName, String inviteeEmail,
|
|
String inviteeUserName, Invitation.ResourceType resourceType, String resourceName, String inviteeRole,
|
|
String serverPath, String acceptUrl, String rejectUrl)
|
|
{
|
|
// Validate the request
|
|
|
|
// Check resource exists
|
|
|
|
if (resourceType == Invitation.ResourceType.WEB_SITE)
|
|
{
|
|
return startNominatedInvite(inviteeFirstName, inviteeLastName, inviteeEmail, inviteeUserName, resourceType,
|
|
resourceName, inviteeRole, serverPath, acceptUrl, rejectUrl);
|
|
}
|
|
|
|
throw new InvitationException("unknown resource type");
|
|
}
|
|
|
|
/**
|
|
* Start the invitation process for a ModeratedInvitation
|
|
*
|
|
* @param comments why does the invitee want access to the resource ?
|
|
* @param inviteeUserName who is to be invited
|
|
* @param Invitation .ResourceType resourceType what resource type ?
|
|
* @param resourceName which resource
|
|
* @param inviteeRole which role ?
|
|
*/
|
|
public ModeratedInvitation inviteModerated(String inviteeComments, String inviteeUserName,
|
|
Invitation.ResourceType resourceType, String resourceName, String inviteeRole)
|
|
{
|
|
if (resourceType == Invitation.ResourceType.WEB_SITE)
|
|
{
|
|
return startModeratedInvite(inviteeComments, inviteeUserName, resourceType, resourceName, inviteeRole);
|
|
}
|
|
throw new InvitationException("unknown resource type");
|
|
}
|
|
|
|
/**
|
|
* Invitee accepts this invitation Nominated Invitaton process only
|
|
*
|
|
* @param invitationId the invitation id
|
|
* @param ticket the ticket produced when creating the invitation.
|
|
*/
|
|
public Invitation accept(String invitationId, String ticket)
|
|
{
|
|
WorkflowTask startTask = getStartTask(invitationId);
|
|
NominatedInvitation invitation = getNominatedInvitation(startTask);
|
|
if(invitation == null)
|
|
{
|
|
throw new InvitationException("State error, accept may only be called on a nominated invitation.");
|
|
}
|
|
// Check invitationId and ticket match
|
|
if(invitation.getTicket().equals(ticket)==false)
|
|
{
|
|
//TODO localise msg
|
|
String msg = "Response to invite has supplied an invalid ticket. The response to the invitation could thus not be processed";
|
|
throw new InvitationException(msg);
|
|
}
|
|
endInvitation(startTask,
|
|
WorkflowModelNominatedInvitation.WF_TRANSITION_ACCEPT, null,
|
|
WorkflowModelNominatedInvitation.WF_TASK_INVITE_PENDING, WorkflowModelNominatedInvitation.WF_TASK_ACTIVIT_INVITE_PENDING);
|
|
return invitation;
|
|
}
|
|
|
|
private void endInvitation(WorkflowTask startTask, String transition, Map<QName, Serializable> properties, QName... taskTypes )
|
|
{
|
|
// Deleting a person can cancel their invitations. Cancelling invitations can delete inactive persons! So prevent infinite looping here
|
|
if (TransactionalResourceHelper.getSet(getClass().getName()).add(startTask.getPath().getInstance().getId()))
|
|
{
|
|
List<WorkflowTask> tasks = workflowService.getTasksForWorkflowPath(startTask.getPath().getId());
|
|
if(tasks.size()==1)
|
|
{
|
|
WorkflowTask task = tasks.get(0);
|
|
if(taskTypeMatches(task, taskTypes))
|
|
{
|
|
if(properties != null)
|
|
{
|
|
workflowService.updateTask(task.getId(), properties, null, null);
|
|
}
|
|
workflowService.endTask(task.getId(), transition);
|
|
return;
|
|
}
|
|
}
|
|
// Throw exception if the task not found.
|
|
Object objs[] = { startTask.getPath().getInstance().getId() };
|
|
throw new InvitationExceptionUserError("invitation.invite.already_finished", objs);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Moderator approves this invitation
|
|
*
|
|
* @param request the request to approve
|
|
* @param reason comments about the acceptance
|
|
*/
|
|
public Invitation approve(String invitationId, String reason)
|
|
{
|
|
WorkflowTask startTask = getStartTask(invitationId);
|
|
ModeratedInvitation invitation = getModeratedInvitation(startTask);
|
|
if(invitation == null)
|
|
{
|
|
String msg = "State error, can only call approve on a Moderated invitation.";
|
|
throw new InvitationException(msg);
|
|
}
|
|
|
|
// Check approver is a site manager
|
|
String currentUser = this.authenticationService.getCurrentUserName();
|
|
checkManagerRole(currentUser, invitation.getResourceType(), invitation.getResourceName());
|
|
Map<QName, Serializable> wfReviewProps = new HashMap<QName, Serializable>();
|
|
wfReviewProps.put(ContentModel.PROP_OWNER, currentUser);
|
|
wfReviewProps.put(WorkflowModelModeratedInvitation.WF_PROP_REVIEW_COMMENTS, reason);
|
|
endInvitation(startTask,
|
|
WorkflowModelModeratedInvitation.WF_TRANSITION_APPROVE,
|
|
wfReviewProps,
|
|
WorkflowModelModeratedInvitation.WF_ACTIVITI_REVIEW_TASK, WorkflowModelModeratedInvitation.WF_REVIEW_TASK);
|
|
return invitation;
|
|
}
|
|
|
|
/**
|
|
* User or moderator rejects this request
|
|
*
|
|
* @param invitationId
|
|
* @param reason , optional reason for rejection
|
|
*/
|
|
public Invitation reject(String invitationId, String reason)
|
|
{
|
|
WorkflowTask startTask = getStartTask(invitationId);
|
|
if(taskTypeMatches(startTask, WorkflowModelModeratedInvitation.WF_START_TASK))
|
|
{
|
|
return rejectModeratedInvitation(startTask, reason);
|
|
}
|
|
else
|
|
{
|
|
return rejectNominatedInvitation(startTask);
|
|
}
|
|
}
|
|
|
|
private Invitation rejectModeratedInvitation(WorkflowTask startTask, String reason)
|
|
{
|
|
ModeratedInvitation invitation = getModeratedInvitation(startTask);
|
|
// Check rejecter is a site manager and throw and exception if not
|
|
String rejecterUserName = this.authenticationService.getCurrentUserName();
|
|
checkManagerRole(rejecterUserName, invitation.getResourceType(), invitation.getResourceName());
|
|
|
|
Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
|
|
properties.put(ContentModel.PROP_OWNER, rejecterUserName);
|
|
properties.put(WorkflowModelModeratedInvitation.WF_PROP_REVIEW_COMMENTS, reason);
|
|
|
|
endInvitation(startTask,
|
|
WorkflowModelModeratedInvitation.WF_TRANSITION_REJECT,
|
|
properties,
|
|
WorkflowModelModeratedInvitation.WF_ACTIVITI_REVIEW_TASK, WorkflowModelModeratedInvitation.WF_REVIEW_TASK);
|
|
return invitation;
|
|
}
|
|
|
|
private Invitation rejectNominatedInvitation(WorkflowTask startTask)
|
|
{
|
|
NominatedInvitation invitation = getNominatedInvitation(startTask);
|
|
endInvitation(startTask,
|
|
WorkflowModelNominatedInvitation.WF_TRANSITION_REJECT, null,
|
|
WorkflowModelNominatedInvitation.WF_TASK_INVITE_PENDING, WorkflowModelNominatedInvitation.WF_TASK_ACTIVIT_INVITE_PENDING);
|
|
return invitation;
|
|
}
|
|
|
|
/**
|
|
* {@inheritDoc}
|
|
*/
|
|
public Invitation cancel(String invitationId)
|
|
{
|
|
try
|
|
{
|
|
WorkflowTask startTask = getStartTask(invitationId);
|
|
if (taskTypeMatches(startTask, WorkflowModelModeratedInvitation.WF_START_TASK))
|
|
{
|
|
return cancelModeratedInvitation(startTask);
|
|
}
|
|
else
|
|
{
|
|
return cancelNominatedInvitation(startTask);
|
|
}
|
|
}
|
|
catch (InvitationExceptionNotFound e)
|
|
{
|
|
// Invitation already deleted or deleted in background
|
|
return null;
|
|
}
|
|
}
|
|
|
|
private Invitation cancelModeratedInvitation(WorkflowTask startTask)
|
|
{
|
|
ModeratedInvitation invitation = getModeratedInvitation(startTask);
|
|
String currentUserName = this.authenticationService.getCurrentUserName();
|
|
if (!AuthenticationUtil.isRunAsUserTheSystemUser())
|
|
{
|
|
if (false == currentUserName.equals(invitation.getInviteeUserName()))
|
|
{
|
|
checkManagerRole(currentUserName, invitation.getResourceType(), invitation.getResourceName());
|
|
}
|
|
}
|
|
// Only proceed with the cancel if the site still exists (the site may have been deleted and invitations may be
|
|
// getting cancelled in the background)
|
|
if (this.siteService.getSite(invitation.getResourceName()) != null)
|
|
{
|
|
workflowService.cancelWorkflow(invitation.getInviteId());
|
|
}
|
|
return invitation;
|
|
}
|
|
|
|
private Invitation cancelNominatedInvitation(WorkflowTask startTask)
|
|
{
|
|
NominatedInvitation invitation = getNominatedInvitation(startTask);
|
|
String currentUserName = this.authenticationService.getCurrentUserName();
|
|
if (!AuthenticationUtil.isRunAsUserTheSystemUser())
|
|
{
|
|
if (false == currentUserName.equals(invitation.getInviterUserName()))
|
|
{
|
|
checkManagerRole(currentUserName, invitation.getResourceType(), invitation.getResourceName());
|
|
}
|
|
}
|
|
// Only proceed with the cancel if the site still exists (the site may have been deleted and invitations may be
|
|
// getting cancelled in the background)
|
|
if (this.siteService.getSite(invitation.getResourceName()) != null)
|
|
{
|
|
endInvitation(startTask, WorkflowModelNominatedInvitation.WF_TRANSITION_CANCEL, null,
|
|
WorkflowModelNominatedInvitation.WF_TASK_INVITE_PENDING,
|
|
WorkflowModelNominatedInvitation.WF_TASK_ACTIVIT_INVITE_PENDING);
|
|
}
|
|
return invitation;
|
|
}
|
|
|
|
/**
|
|
* Get an invitation from its invitation id <BR />
|
|
* Invitations are returned which may be in progress or completed.
|
|
*
|
|
* @throws InvitationExceptionNotFound the invitation does not exist.
|
|
* @throws InvitationExceptionUserError
|
|
* @return the invitation.
|
|
*/
|
|
public Invitation getInvitation(String invitationId)
|
|
{
|
|
WorkflowTask startTask = getStartTask(invitationId);
|
|
return getInvitation(startTask);
|
|
}
|
|
|
|
private Invitation getInvitation(WorkflowTask startTask)
|
|
{
|
|
Invitation invitation = getNominatedInvitation(startTask);
|
|
if(invitation == null)
|
|
{
|
|
invitation = getModeratedInvitation(startTask);
|
|
}
|
|
return invitation;
|
|
}
|
|
|
|
private Map<String, WorkflowTask> getInvitationTasks(List<String> invitationIds)
|
|
{
|
|
for (String invitationId: invitationIds)
|
|
{
|
|
validateInvitationId(invitationId);
|
|
}
|
|
|
|
// query for invite workflow task associate
|
|
long start = (logger.isDebugEnabled()) ? System.currentTimeMillis() : 0;
|
|
List<WorkflowTask> inviteStartTasks = workflowService.getStartTasks(invitationIds, true);
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
logger.debug(" getInvitationTask("+invitationIds.size()+") in "+ (System.currentTimeMillis()-start) + " ms");
|
|
}
|
|
|
|
Map<String, WorkflowTask> result = new HashMap<String, WorkflowTask>(inviteStartTasks.size() * 2);
|
|
for(WorkflowTask inviteStartTask: inviteStartTasks)
|
|
{
|
|
String invitationId = inviteStartTask.getPath().getInstance().getId();
|
|
// The following does not work for moderated tasks
|
|
// String invitationId = (String)
|
|
// inviteStartTask.getProperties().get(WorkflowModel.PROP_WORKFLOW_INSTANCE_ID);
|
|
result.put(invitationId, inviteStartTask);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
private ModeratedInvitation getModeratedInvitation(WorkflowTask startTask)
|
|
{
|
|
ModeratedInvitation invitation = null;
|
|
if (taskTypeMatches(startTask, WorkflowModelModeratedInvitation.WF_START_TASK))
|
|
{
|
|
String invitationId = startTask.getPath().getInstance().getId();
|
|
invitation = new ModeratedInvitationImpl(invitationId, startTask.getProperties());
|
|
}
|
|
return invitation;
|
|
}
|
|
|
|
private NominatedInvitation getNominatedInvitation(WorkflowTask startTask)
|
|
{
|
|
NominatedInvitation invitation = null;
|
|
if (taskTypeMatches(startTask, WorkflowModelNominatedInvitation.WF_TASK_INVITE_TO_SITE))
|
|
{
|
|
Date inviteDate = startTask.getPath().getInstance().getStartDate();
|
|
String invitationId = startTask.getPath().getInstance().getId();
|
|
invitation = new NominatedInvitationImpl(invitationId, inviteDate, startTask.getProperties());
|
|
}
|
|
return invitation;
|
|
}
|
|
|
|
private boolean taskTypeMatches(WorkflowTask task, QName... types)
|
|
{
|
|
QName taskDefName = task.getDefinition().getMetadata().getName();
|
|
return Arrays.asList(types).contains(taskDefName);
|
|
}
|
|
|
|
private WorkflowTask getStartTask(String invitationId)
|
|
{
|
|
validateInvitationId(invitationId);
|
|
WorkflowTask startTask = null;
|
|
try
|
|
{
|
|
startTask = workflowService.getStartTask(invitationId);
|
|
}
|
|
catch (WorkflowException we)
|
|
{
|
|
// Do nothing
|
|
}
|
|
if (startTask == null)
|
|
{
|
|
Object objs[] = { invitationId };
|
|
throw new InvitationExceptionNotFound("invitation.error.not_found", objs);
|
|
}
|
|
return startTask;
|
|
}
|
|
|
|
/**
|
|
* list Invitations for a specific person/invitee
|
|
*
|
|
* @param invitee alfresco user id of person being invited
|
|
*/
|
|
public List<Invitation> listPendingInvitationsForInvitee(String invitee)
|
|
{
|
|
InvitationSearchCriteriaImpl crit = new InvitationSearchCriteriaImpl();
|
|
crit.setInvitationType(InvitationSearchCriteria.InvitationType.ALL);
|
|
crit.setInvitee(invitee);
|
|
return searchInvitation(crit);
|
|
}
|
|
|
|
/**
|
|
* list Invitations for a specific resource
|
|
*
|
|
* @param resourceType
|
|
* @param resourceName
|
|
*/
|
|
public List<Invitation> listPendingInvitationsForResource(Invitation.ResourceType resourceType, String resourceName)
|
|
{
|
|
InvitationSearchCriteriaImpl criteria = getPendingInvitationCriteriaForResource(resourceType, resourceName);
|
|
return searchInvitation(criteria);
|
|
}
|
|
|
|
/**
|
|
* Returns search criteria to find pending invitations
|
|
* @param resourceType
|
|
* @param resourceName
|
|
* @return search criteria
|
|
*/
|
|
private InvitationSearchCriteriaImpl getPendingInvitationCriteriaForResource(
|
|
Invitation.ResourceType resourceType, String resourceName)
|
|
{
|
|
InvitationSearchCriteriaImpl criteria = new InvitationSearchCriteriaImpl();
|
|
criteria.setInvitationType(InvitationSearchCriteria.InvitationType.ALL);
|
|
criteria.setResourceType(resourceType);
|
|
criteria.setResourceName(resourceName);
|
|
return criteria;
|
|
}
|
|
|
|
/**
|
|
* This is the general search invitation method returning {@link Invitation}s
|
|
*
|
|
* @param criteria
|
|
* @return the list of start tasks for invitations
|
|
*/
|
|
public List<Invitation> searchInvitation(final InvitationSearchCriteria criteria)
|
|
{
|
|
int limit = 200;
|
|
List<String> invitationIds = searchInvitationsForIds(criteria, limit);
|
|
return invitationIds.isEmpty() ? Collections.<Invitation>emptyList() : searchInvitation(criteria, invitationIds);
|
|
}
|
|
|
|
private List<Invitation> searchInvitation(final InvitationSearchCriteria criteria, List<String> invitationIds)
|
|
{
|
|
final Map<String, WorkflowTask> taskCache = getInvitationTasks(invitationIds);
|
|
return CollectionUtils.transform(invitationIds, new Function<String, Invitation>()
|
|
{
|
|
public Invitation apply(String invitationId)
|
|
{
|
|
WorkflowTask startTask = taskCache.get(invitationId);
|
|
if (startTask == null)
|
|
{
|
|
return null;
|
|
}
|
|
Invitation invitation = getInvitation(startTask);
|
|
return invitationMatches(invitation, criteria) ? invitation : null;
|
|
}
|
|
});
|
|
}
|
|
|
|
/**
|
|
* This is a general search invitation method returning IDs
|
|
*
|
|
* @param criteria
|
|
* @param limit maximum number of IDs to return. If less than 1, there is no limit.
|
|
* @return the list of invitation IDs (the IDs of the invitations not the IDs of the invitation start tasks)
|
|
*/
|
|
private List<String> searchInvitationsForIds(final InvitationSearchCriteria criteria, int limit)
|
|
{
|
|
List<String> invitationIds = new ArrayList<String>();
|
|
InvitationSearchCriteria.InvitationType toSearch = criteria.getInvitationType();
|
|
if (toSearch == InvitationSearchCriteria.InvitationType.ALL
|
|
|| toSearch == InvitationSearchCriteria.InvitationType.NOMINATED)
|
|
{
|
|
for (WorkflowTask task : searchNominatedInvitations(criteria))
|
|
{
|
|
String invitationId = task.getPath().getInstance().getId();
|
|
invitationIds.add(invitationId);
|
|
if (limit > 0 && invitationIds.size() >= limit)
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
if ((limit <= 0 || invitationIds.size() < limit) &&
|
|
(toSearch == InvitationSearchCriteria.InvitationType.ALL
|
|
|| toSearch == InvitationSearchCriteria.InvitationType.MODERATED))
|
|
{
|
|
for (WorkflowTask task: searchModeratedInvitations(criteria))
|
|
{
|
|
String invitationId = task.getPath().getInstance().getId();
|
|
invitationIds.add(invitationId);
|
|
if (limit > 0 && invitationIds.size() >= limit)
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
return invitationIds;
|
|
|
|
}
|
|
|
|
/**
|
|
* Fix for ALF-2598
|
|
* @param invitation
|
|
* @param criteria
|
|
* @return
|
|
*/
|
|
private boolean invitationMatches(Invitation invitation, InvitationSearchCriteria criteria)
|
|
{
|
|
String invitee = criteria.getInvitee();
|
|
if (invitee!= null && false == invitee.equals(invitation.getInviteeUserName()))
|
|
{
|
|
return false;
|
|
}
|
|
String inviter = criteria.getInviter();
|
|
if(inviter!= null)
|
|
{
|
|
if (invitation instanceof NominatedInvitation)
|
|
{
|
|
NominatedInvitation modInvite = (NominatedInvitation) invitation;
|
|
if(false == inviter.equals(modInvite.getInviterUserName()))
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
String resourceName= criteria.getResourceName();
|
|
if (resourceName!= null && false == resourceName.equals(invitation.getResourceName()))
|
|
{
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
private List<WorkflowTask> searchModeratedInvitations(InvitationSearchCriteria criteria)
|
|
{
|
|
long start = (logger.isDebugEnabled()) ? System.currentTimeMillis() : 0;
|
|
|
|
WorkflowTaskQuery query = new WorkflowTaskQuery();
|
|
query.setTaskState(WorkflowTaskState.IN_PROGRESS);
|
|
|
|
Map<QName, Object> properties = new HashMap<QName, Object>();
|
|
String invitee = criteria.getInvitee();
|
|
if (invitee != null)
|
|
{
|
|
properties.put(WorkflowModelModeratedInvitation.WF_PROP_INVITEE_USER_NAME, invitee);
|
|
}
|
|
//TODO Uncomment if more than one ResourceType added.
|
|
// ResourceType resourceType = criteria.getResourceType();
|
|
// if (resourceType != null)
|
|
// {
|
|
// properties.put(WorkflowModelModeratedInvitation.WF_PROP_RESOURCE_TYPE, resourceType.toString());
|
|
// }
|
|
String resourceName = criteria.getResourceName();
|
|
if (resourceName != null)
|
|
{
|
|
properties.put(WorkflowModelModeratedInvitation.WF_PROP_RESOURCE_NAME, resourceName);
|
|
}
|
|
query.setProcessCustomProps(properties);
|
|
|
|
query.setTaskName(WorkflowModelModeratedInvitation.WF_REVIEW_TASK);
|
|
|
|
// query for invite workflow tasks
|
|
List<WorkflowTask> results = new ArrayList<WorkflowTask>();
|
|
if(workflowAdminService.isEngineEnabled(JBPMEngine.ENGINE_ID))
|
|
{
|
|
query.setTaskName(WorkflowModelModeratedInvitation.WF_REVIEW_TASK);
|
|
List<WorkflowTask> jbpmTasks = this.workflowService.queryTasks(query, true);
|
|
|
|
if(jbpmTasks !=null)
|
|
{
|
|
results.addAll(jbpmTasks);
|
|
}
|
|
}
|
|
if(workflowAdminService.isEngineEnabled(ActivitiConstants.ENGINE_ID))
|
|
{
|
|
query.setTaskName(WorkflowModelModeratedInvitation.WF_ACTIVITI_REVIEW_TASK);
|
|
List<WorkflowTask> jbpmTasks = this.workflowService.queryTasks(query, true);
|
|
if(jbpmTasks !=null)
|
|
{
|
|
results.addAll(jbpmTasks);
|
|
}
|
|
}
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
logger.debug(" searchModeratedInvitations in "+ (System.currentTimeMillis()-start) + " ms");
|
|
}
|
|
return results;
|
|
}
|
|
|
|
private List<WorkflowTask> searchNominatedInvitations(InvitationSearchCriteria criteria)
|
|
{
|
|
long start = (logger.isDebugEnabled()) ? System.currentTimeMillis() : 0;
|
|
|
|
WorkflowTaskQuery query = new WorkflowTaskQuery();
|
|
query.setTaskState(WorkflowTaskState.IN_PROGRESS);
|
|
|
|
String invitee = criteria.getInvitee();
|
|
if(invitee != null)
|
|
{
|
|
query.setActorId(invitee);
|
|
}
|
|
|
|
Map<QName, Object> queryProps = new HashMap<QName, Object>();
|
|
String inviter = criteria.getInviter();
|
|
if (inviter != null)
|
|
{
|
|
queryProps.put(WorkflowModelNominatedInvitation.WF_PROP_INVITER_USER_NAME, inviter);
|
|
}
|
|
String resourceName = criteria.getResourceName();
|
|
if (resourceName != null)
|
|
{
|
|
queryProps.put(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_NAME, resourceName);
|
|
}
|
|
|
|
//TODO uncomment if more ResourceTypes are created.
|
|
// ResourceType resourceType = criteria.getResourceType();
|
|
// if (resourceType != null)
|
|
// {
|
|
// wfNominatedQueryProps.put(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_TYPE,
|
|
// resourceType.name());
|
|
// }
|
|
// set workflow task query parameters
|
|
query.setProcessCustomProps(queryProps);
|
|
|
|
List<WorkflowTask> results = new ArrayList<WorkflowTask>();
|
|
if(workflowAdminService.isEngineEnabled(JBPMEngine.ENGINE_ID))
|
|
{
|
|
query.setTaskName(WorkflowModelNominatedInvitation.WF_TASK_INVITE_PENDING);
|
|
List<WorkflowTask> jbpmTasks = this.workflowService.queryTasks(query, true);
|
|
if(jbpmTasks !=null)
|
|
{
|
|
results.addAll(jbpmTasks);
|
|
}
|
|
}
|
|
if(workflowAdminService.isEngineEnabled(ActivitiConstants.ENGINE_ID))
|
|
{
|
|
query.setTaskName(WorkflowModelNominatedInvitation.WF_TASK_ACTIVIT_INVITE_PENDING);
|
|
List<WorkflowTask> jbpmTasks = this.workflowService.queryTasks(query, true);
|
|
if(jbpmTasks !=null)
|
|
{
|
|
results.addAll(jbpmTasks);
|
|
}
|
|
}
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
logger.debug(" searchNominatedInvitations in "+ (System.currentTimeMillis()-start) + " ms");
|
|
}
|
|
return results;
|
|
}
|
|
|
|
// Implementation methods below
|
|
|
|
/**
|
|
* Set the workflow service
|
|
*
|
|
* @param workflowService
|
|
*/
|
|
public void setWorkflowService(WorkflowService workflowService)
|
|
{
|
|
this.workflowService = workflowService;
|
|
}
|
|
|
|
/**
|
|
* @param workflowAdminService the workflowAdminService to set
|
|
*/
|
|
public void setWorkflowAdminService(WorkflowAdminService workflowAdminService)
|
|
{
|
|
this.workflowAdminService = workflowAdminService;
|
|
}
|
|
|
|
/**
|
|
* @return the workflow service
|
|
*/
|
|
public WorkflowService getWorkflowService()
|
|
{
|
|
return workflowService;
|
|
}
|
|
|
|
/**
|
|
* @param actionService the actionService to set
|
|
*/
|
|
public void setActionService(ActionService actionService)
|
|
{
|
|
this.actionService = actionService;
|
|
}
|
|
|
|
public void setPersonService(PersonService personService)
|
|
{
|
|
this.personService = personService;
|
|
}
|
|
|
|
public PersonService getPersonService()
|
|
{
|
|
return personService;
|
|
}
|
|
|
|
public void setSiteService(SiteService siteService)
|
|
{
|
|
this.siteService = siteService;
|
|
}
|
|
|
|
public SiteService getSiteService()
|
|
{
|
|
return siteService;
|
|
}
|
|
|
|
public void setAuthenticationService(MutableAuthenticationService authenticationService)
|
|
{
|
|
this.authenticationService = authenticationService;
|
|
}
|
|
|
|
public MutableAuthenticationService getAuthenticationService()
|
|
{
|
|
return authenticationService;
|
|
}
|
|
|
|
public void setUserNameGenerator(UserNameGenerator usernameGenerator)
|
|
{
|
|
this.usernameGenerator = usernameGenerator;
|
|
}
|
|
|
|
public UserNameGenerator getUserNameGenerator()
|
|
{
|
|
return usernameGenerator;
|
|
}
|
|
|
|
public void setPasswordGenerator(PasswordGenerator passwordGenerator)
|
|
{
|
|
this.passwordGenerator = passwordGenerator;
|
|
}
|
|
|
|
public PasswordGenerator getPasswordGenerator()
|
|
{
|
|
return passwordGenerator;
|
|
}
|
|
|
|
public void setDictionaryService(DictionaryService dictionaryService)
|
|
{
|
|
this.dictionaryService = dictionaryService;
|
|
}
|
|
|
|
public void setNamespaceService(NamespaceService namespaceService)
|
|
{
|
|
this.namespaceService = namespaceService;
|
|
}
|
|
|
|
public NamespaceService getNamespaceService()
|
|
{
|
|
return namespaceService;
|
|
}
|
|
|
|
public void setPermissionService(PermissionService permissionService)
|
|
{
|
|
this.permissionService = permissionService;
|
|
}
|
|
|
|
public PermissionService getPermissionService()
|
|
{
|
|
return permissionService;
|
|
}
|
|
|
|
public void setNodeService(NodeService nodeService)
|
|
{
|
|
this.nodeService = nodeService;
|
|
}
|
|
|
|
public NodeService getNodeService()
|
|
{
|
|
return nodeService;
|
|
}
|
|
|
|
/**
|
|
* Creates a person for the invitee with a generated user name.
|
|
*
|
|
* @param inviteeFirstName first name of invitee
|
|
* @param inviteeLastName last name of invitee
|
|
* @param inviteeEmail email address of invitee
|
|
* @return invitee user name
|
|
*/
|
|
private String createInviteePerson(String inviteeFirstName, String inviteeLastName, String inviteeEmail)
|
|
{
|
|
// Attempt to generate user name for invitee
|
|
// which does not belong to an existing person
|
|
// Tries up to MAX_NUM_INVITEE_USER_NAME_GEN_TRIES
|
|
// at which point a web script exception is thrown
|
|
String inviteeUserName = null;
|
|
int i = 0;
|
|
do
|
|
{
|
|
inviteeUserName = usernameGenerator.generateUserName(inviteeFirstName, inviteeLastName, inviteeEmail, i);
|
|
i++;
|
|
} while (this.personService.personExists(inviteeUserName) && (i < getMaxUserNameGenRetries()));
|
|
|
|
// if after 10 tries is not able to generate a user name for a
|
|
// person who doesn't already exist, then throw a web script exception
|
|
if (this.personService.personExists(inviteeUserName))
|
|
{
|
|
|
|
logger.debug("Failed - unable to generate username for invitee.");
|
|
|
|
Object[] objs = { inviteeFirstName, inviteeLastName, inviteeEmail };
|
|
throw new InvitationException("invitation.invite.unable_generate_id", objs);
|
|
}
|
|
|
|
// create a person node for the invitee with generated invitee user name
|
|
// and other provided person property values
|
|
final Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
|
|
properties.put(ContentModel.PROP_USERNAME, inviteeUserName);
|
|
properties.put(ContentModel.PROP_FIRSTNAME, inviteeFirstName);
|
|
properties.put(ContentModel.PROP_LASTNAME, inviteeLastName);
|
|
properties.put(ContentModel.PROP_EMAIL, inviteeEmail);
|
|
|
|
final String finalUserName = inviteeUserName;
|
|
AuthenticationUtil.runAs(new RunAsWork<Object>()
|
|
{
|
|
@SuppressWarnings("synthetic-access")
|
|
public Object doWork() throws Exception
|
|
{
|
|
NodeRef person = personService.createPerson(properties);
|
|
permissionService.setPermission(person, finalUserName, PermissionService.ALL_PERMISSIONS, true);
|
|
|
|
return null;
|
|
}
|
|
|
|
}, AuthenticationUtil.getSystemUserName());
|
|
|
|
return inviteeUserName;
|
|
}
|
|
|
|
/**
|
|
* Creates a disabled user account for the given invitee user name with a
|
|
* generated password
|
|
*
|
|
* @param inviteeUserName
|
|
* @return password generated for invitee user account
|
|
*/
|
|
private String createInviteeDisabledAccount(String inviteeUserName)
|
|
{
|
|
// generate password using password generator
|
|
char[] generatedPassword = passwordGenerator.generatePassword().toCharArray();
|
|
|
|
// create disabled user account for invitee user name with generated
|
|
// password
|
|
this.authenticationService.createAuthentication(inviteeUserName, generatedPassword);
|
|
this.authenticationService.setAuthenticationEnabled(inviteeUserName, false);
|
|
|
|
return String.valueOf(generatedPassword);
|
|
}
|
|
|
|
/**
|
|
* Moderated invitation implementation
|
|
*
|
|
* @return the new moderated invitation
|
|
*/
|
|
private ModeratedInvitation startModeratedInvite(String inviteeComments, String inviteeUserName,
|
|
Invitation.ResourceType resourceType, String resourceName, String inviteeRole)
|
|
{
|
|
SiteInfo siteInfo = siteService.getSite(resourceName);
|
|
|
|
if (siteService.isMember(resourceName, inviteeUserName))
|
|
{
|
|
if (logger.isDebugEnabled())
|
|
logger.debug("Failed - invitee user is already a member of the site.");
|
|
|
|
Object objs[] = { inviteeUserName, "", resourceName };
|
|
throw new InvitationExceptionUserError("invitation.invite.already_member", objs);
|
|
}
|
|
|
|
String roleGroup = siteService.getSiteRoleGroup(resourceName, SiteModel.SITE_MANAGER);
|
|
|
|
// get the workflow description
|
|
String workflowDescription = generateWorkflowDescription(siteInfo, "invitation.moderated.workflow.description");
|
|
|
|
Map<QName, Serializable> workflowProps = new HashMap<QName, Serializable>(16);
|
|
workflowProps.put(WorkflowModel.PROP_WORKFLOW_DESCRIPTION, workflowDescription);
|
|
workflowProps.put(WorkflowModelModeratedInvitation.ASSOC_GROUP_ASSIGNEE, roleGroup);
|
|
workflowProps.put(WorkflowModelModeratedInvitation.WF_PROP_INVITEE_COMMENTS, inviteeComments);
|
|
workflowProps.put(WorkflowModelModeratedInvitation.WF_PROP_INVITEE_ROLE, inviteeRole);
|
|
workflowProps.put(WorkflowModelModeratedInvitation.WF_PROP_INVITEE_USER_NAME, inviteeUserName);
|
|
workflowProps.put(WorkflowModelModeratedInvitation.WF_PROP_RESOURCE_NAME, resourceName);
|
|
workflowProps.put(WorkflowModelModeratedInvitation.WF_PROP_RESOURCE_TYPE, resourceType.toString());
|
|
|
|
// get the moderated workflow
|
|
|
|
WorkflowDefinition wfDefinition = getWorkflowDefinition(false);
|
|
return (ModeratedInvitation) startWorkflow(wfDefinition, workflowProps);
|
|
}
|
|
|
|
/**
|
|
* Starts the Invite workflow
|
|
*
|
|
* @param inviteeFirstName first name of invitee
|
|
* @param inviteeLastNamme last name of invitee
|
|
* @param inviteeEmail email address of invitee
|
|
* @param siteShortName short name of site that the invitee is being invited
|
|
* to by the inviter
|
|
* @param inviteeSiteRole role under which invitee is being invited to the
|
|
* site by the inviter
|
|
* @param serverPath externally accessible server address of server hosting
|
|
* invite web scripts
|
|
*/
|
|
private NominatedInvitation startNominatedInvite(String inviteeFirstName, String inviteeLastName,
|
|
String inviteeEmail, String inviteeUserName, Invitation.ResourceType resourceType,
|
|
String siteShortName, String inviteeSiteRole, String serverPath, String acceptUrl, String rejectUrl)
|
|
{
|
|
|
|
// get the inviter user name (the name of user web script is executed
|
|
// under)
|
|
String inviterUserName = authenticationService.getCurrentUserName();
|
|
boolean created = false;
|
|
|
|
checkManagerRole(inviterUserName, resourceType, siteShortName);
|
|
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
logger.debug("startInvite() inviterUserName=" + inviterUserName + " inviteeUserName=" + inviteeUserName
|
|
+ " inviteeFirstName=" + inviteeFirstName + " inviteeLastName=" + inviteeLastName
|
|
+ " inviteeEmail=" + inviteeEmail + " siteShortName=" + siteShortName + " inviteeSiteRole="
|
|
+ inviteeSiteRole);
|
|
}
|
|
//
|
|
// if we have not explicitly been passed an existing user's user name
|
|
// then ....
|
|
//
|
|
// if a person already exists who has the given invitee email address
|
|
//
|
|
// 1) obtain invitee user name from first person found having the
|
|
// invitee email address, first name and last name
|
|
// 2) handle error conditions -
|
|
// (invitee already has an invitation in progress for the given site,
|
|
// or he/she is already a member of the given site
|
|
//
|
|
if (inviteeUserName == null || inviteeUserName.trim().length() == 0)
|
|
{
|
|
|
|
inviteeUserName = null;
|
|
|
|
Set<NodeRef> peopleWithInviteeEmail = personService.getPeopleFilteredByProperty(ContentModel.PROP_EMAIL, inviteeEmail, 100);
|
|
|
|
if (peopleWithInviteeEmail.size() > 0)
|
|
{
|
|
// get person already existing who has the given
|
|
// invitee email address
|
|
for (NodeRef personRef : peopleWithInviteeEmail)
|
|
{
|
|
Serializable firstNameVal = this.getNodeService().getProperty(personRef,
|
|
ContentModel.PROP_FIRSTNAME);
|
|
Serializable lastNameVal = this.getNodeService().getProperty(personRef, ContentModel.PROP_LASTNAME);
|
|
|
|
String personFirstName = DefaultTypeConverter.INSTANCE.convert(String.class, firstNameVal);
|
|
String personLastName = DefaultTypeConverter.INSTANCE.convert(String.class, lastNameVal);
|
|
|
|
if (personFirstName != null && personFirstName.equalsIgnoreCase(inviteeFirstName))
|
|
{
|
|
if (personLastName != null && personLastName.equalsIgnoreCase(inviteeLastName))
|
|
{
|
|
// got a match on email, lastname, firstname
|
|
// get invitee user name of that person
|
|
Serializable userNamePropertyVal = this.getNodeService().getProperty(personRef,
|
|
ContentModel.PROP_USERNAME);
|
|
inviteeUserName = DefaultTypeConverter.INSTANCE.convert(String.class, userNamePropertyVal);
|
|
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
logger
|
|
.debug("not explictly passed username - found matching email, resolved inviteeUserName="
|
|
+ inviteeUserName);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if (inviteeUserName == null)
|
|
{
|
|
// This shouldn't normally happen. Due to the fix for ETHREEOH-3268, the link to invite external users
|
|
// should be disabled when the authentication chain does not allow it.
|
|
if (!authenticationService.isAuthenticationCreationAllowed())
|
|
{
|
|
throw new InvitationException("invitation.invite.authentication_chain");
|
|
}
|
|
// else there are no existing people who have the given invitee
|
|
// email address so create new person
|
|
inviteeUserName = createInviteePerson(inviteeFirstName, inviteeLastName, inviteeEmail);
|
|
created = true;
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
logger.debug("not explictly passed username - created new person, inviteeUserName="
|
|
+ inviteeUserName);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* throw exception if person is already a member of the given site
|
|
*/
|
|
if (this.siteService.isMember(siteShortName, inviteeUserName))
|
|
{
|
|
if (logger.isDebugEnabled())
|
|
logger.debug("Failed - invitee user is already a member of the site.");
|
|
|
|
Object objs[] = { inviteeUserName, inviteeEmail, siteShortName };
|
|
throw new InvitationExceptionUserError("invitation.invite.already_member", objs);
|
|
}
|
|
|
|
//
|
|
// If a user account does not already exist for invitee user name
|
|
// then create a disabled user account for the invitee.
|
|
// Hold a local reference to generated password if disabled invitee
|
|
// account
|
|
// is created, otherwise if a user account already exists for invitee
|
|
// user name, then local reference to invitee password will be "null"
|
|
//
|
|
final String initeeUserNameFinal = inviteeUserName;
|
|
|
|
String inviteePassword = created ? AuthenticationUtil.runAs(new RunAsWork<String>()
|
|
{
|
|
@SuppressWarnings("synthetic-access")
|
|
public String doWork()
|
|
{
|
|
return createInviteeDisabledAccount(initeeUserNameFinal);
|
|
}
|
|
}, AuthenticationUtil.getSystemUserName()) : null;
|
|
|
|
// create a ticket for the invite - this is used
|
|
String inviteTicket = GUID.generate();
|
|
|
|
//
|
|
// Start the invite workflow with inviter, invitee and site properties
|
|
//
|
|
|
|
WorkflowDefinition wfDefinition = getWorkflowDefinition(true);
|
|
|
|
// Get invitee person NodeRef to add as assignee
|
|
NodeRef inviteeNodeRef = personService.getPerson(inviteeUserName);
|
|
SiteInfo siteInfo = this.siteService.getSite(siteShortName);
|
|
String siteDescription = siteInfo.getDescription();
|
|
if (siteDescription == null)
|
|
{
|
|
siteDescription = "";
|
|
}
|
|
else if (siteDescription.length() > 255)
|
|
{
|
|
siteDescription = siteDescription.substring(0, 255);
|
|
}
|
|
|
|
// get the workflow description
|
|
String workflowDescription = generateWorkflowDescription(siteInfo, "invitation.nominated.workflow.description");
|
|
|
|
// create workflow properties
|
|
Map<QName, Serializable> workflowProps = new HashMap<QName, Serializable>(32);
|
|
workflowProps.put(WorkflowModel.PROP_WORKFLOW_DESCRIPTION, workflowDescription);
|
|
workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_INVITER_USER_NAME, inviterUserName);
|
|
workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_USER_NAME, inviteeUserName);
|
|
workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_EMAIL, inviteeEmail);
|
|
workflowProps.put(WorkflowModel.ASSOC_ASSIGNEE, inviteeNodeRef);
|
|
workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_FIRSTNAME, inviteeFirstName);
|
|
workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_LASTNAME, inviteeLastName);
|
|
workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_GEN_PASSWORD, inviteePassword);
|
|
workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_NAME, siteShortName);
|
|
workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_TITLE, siteInfo.getTitle());
|
|
workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_DESCRIPTION, siteDescription);
|
|
workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_TYPE, resourceType.toString());
|
|
workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_ROLE, inviteeSiteRole);
|
|
workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_SERVER_PATH, serverPath);
|
|
workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_ACCEPT_URL, acceptUrl);
|
|
workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_REJECT_URL, rejectUrl);
|
|
workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_INVITE_TICKET, inviteTicket);
|
|
|
|
return (NominatedInvitation) startWorkflow(wfDefinition, workflowProps);
|
|
}
|
|
|
|
private Invitation startWorkflow(WorkflowDefinition wfDefinition, Map<QName, Serializable> workflowProps)
|
|
{
|
|
NodeRef wfPackage = workflowService.createPackage(null);
|
|
workflowProps.put(WorkflowModel.ASSOC_PACKAGE, wfPackage);
|
|
|
|
// start the workflow
|
|
WorkflowPath wfPath = this.workflowService.startWorkflow(wfDefinition.getId(), workflowProps);
|
|
|
|
//
|
|
// complete invite workflow start task to send out the invite email
|
|
//
|
|
|
|
// get the workflow tasks
|
|
String workflowId = wfPath.getInstance().getId();
|
|
WorkflowTask startTask = workflowService.getStartTask(workflowId);
|
|
|
|
// attach empty package to start task, end it and follow with transition
|
|
// that sends out the invite
|
|
if (logger.isDebugEnabled())
|
|
logger.debug("Starting Invite workflow task by attaching empty package...");
|
|
|
|
if (logger.isDebugEnabled())
|
|
logger.debug("Transitioning Invite workflow task...");
|
|
try
|
|
{
|
|
workflowService.endTask(startTask.getId(), null);
|
|
}
|
|
catch (RuntimeException err)
|
|
{
|
|
if (logger.isDebugEnabled())
|
|
logger.debug("Failed - caught error during Invite workflow transition: " + err.getMessage());
|
|
throw err;
|
|
}
|
|
Invitation invitation = getInvitation(startTask);
|
|
return invitation;
|
|
}
|
|
|
|
/**
|
|
* Return Activiti workflow definition unless Activiti engine is disabled.
|
|
* @param isNominated TODO
|
|
* @return
|
|
*/
|
|
private WorkflowDefinition getWorkflowDefinition(boolean isNominated)
|
|
{
|
|
String workflowName = isNominated ? getNominatedDefinitionName() : getModeratedDefinitionName();
|
|
WorkflowDefinition definition = workflowService.getDefinitionByName(workflowName);
|
|
if (definition == null)
|
|
{
|
|
// handle workflow definition does not exist
|
|
Object objs[] = {workflowName};
|
|
throw new InvitationException("invitation.error.noworkflow", objs);
|
|
}
|
|
return definition;
|
|
}
|
|
|
|
private String getNominatedDefinitionName()
|
|
{
|
|
if(workflowAdminService.isEngineEnabled(ActivitiConstants.ENGINE_ID))
|
|
{
|
|
return WorkflowModelNominatedInvitation.WORKFLOW_DEFINITION_NAME_ACTIVITI;
|
|
}
|
|
else if(workflowAdminService.isEngineEnabled(JBPMEngine.ENGINE_ID))
|
|
{
|
|
return WorkflowModelNominatedInvitation.WORKFLOW_DEFINITION_NAME;
|
|
}
|
|
throw new IllegalStateException("None of the Workflow engines supported by teh InvitationService are currently enabled!");
|
|
}
|
|
|
|
private String getModeratedDefinitionName()
|
|
{
|
|
if(workflowAdminService.isEngineEnabled(ActivitiConstants.ENGINE_ID))
|
|
{
|
|
return WorkflowModelModeratedInvitation.WORKFLOW_DEFINITION_NAME_ACTIVITI;
|
|
}
|
|
else if(workflowAdminService.isEngineEnabled(JBPMEngine.ENGINE_ID))
|
|
{
|
|
return WorkflowModelModeratedInvitation.WORKFLOW_DEFINITION_NAME;
|
|
}
|
|
throw new IllegalStateException("None of the Workflow engines supported by teh InvitationService are currently enabled!");
|
|
}
|
|
|
|
/**
|
|
* Check that the specified user has manager role over the resource.
|
|
*
|
|
* @param userId
|
|
* @throws InvitationException
|
|
*/
|
|
private void checkManagerRole(String userId, Invitation.ResourceType resourceType, String siteShortName)
|
|
{
|
|
// if inviter is not the site manager then throw web script exception
|
|
String inviterRole = this.siteService.getMembersRole(siteShortName, userId);
|
|
if ((inviterRole == null) || (inviterRole.equals(SiteModel.SITE_MANAGER) == false))
|
|
{
|
|
|
|
Object objs[] = { userId, siteShortName };
|
|
throw new InvitationExceptionForbidden("invitation.invite.not_site_manager", objs);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Validator for invitationId
|
|
*
|
|
* @param invitationId
|
|
*/
|
|
private void validateInvitationId(String invitationId)
|
|
{
|
|
final String ID_SEPERATOR_REGEX = "\\$";
|
|
String[] parts = invitationId.split(ID_SEPERATOR_REGEX);
|
|
if (parts.length != 2)
|
|
{
|
|
Object objs[] = { invitationId };
|
|
throw new InvitationExceptionUserError("invitation.error.invalid_inviteId_format", objs);
|
|
}
|
|
}
|
|
|
|
private int getMaxUserNameGenRetries()
|
|
{
|
|
return maxUserNameGenRetries;
|
|
}
|
|
|
|
/**
|
|
* NodeServicePolicies.BeforeDeleteNodePolicy Called immediatly prior to
|
|
* deletion of a web site.
|
|
*/
|
|
public void beforeDeleteNode(NodeRef nodeRef)
|
|
{
|
|
logger.debug("beforeDeleteNode");
|
|
|
|
final NodeRef siteRef = nodeRef;
|
|
|
|
// Run as system user
|
|
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
|
|
{
|
|
@SuppressWarnings("synthetic-access")
|
|
public Object doWork() throws Exception
|
|
{
|
|
QName type = nodeService.getType(siteRef);
|
|
if (dictionaryService.isSubClass(type, SiteModel.TYPE_SITE))
|
|
{
|
|
// this is a web site being deleted.
|
|
String siteName = (String) nodeService.getProperty(siteRef, ContentModel.PROP_NAME);
|
|
if (siteName != null)
|
|
{
|
|
long start =0;
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
logger.debug("Invitation service delete node fired " + type + ", " + siteName);
|
|
start = System.currentTimeMillis();
|
|
}
|
|
InvitationSearchCriteriaImpl criteria =
|
|
getPendingInvitationCriteriaForResource(Invitation.ResourceType.WEB_SITE, siteName);
|
|
List<String> invitationIds = searchInvitationsForIds(criteria, -1);
|
|
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
long end = System.currentTimeMillis();
|
|
logger.debug("Invitations found: " + invitationIds.size() + " in "+ ((end-start)/1000) + " seconds");
|
|
start = System.currentTimeMillis();
|
|
}
|
|
|
|
// Create the action
|
|
Action action = actionService.createAction(CancelWorkflowActionExecuter.NAME);
|
|
action.setParameterValue(CancelWorkflowActionExecuter.PARAM_WORKFLOW_ID_LIST, (Serializable)invitationIds);
|
|
|
|
// Cancel the workflows asynchronously
|
|
actionService.executeAction(action, siteRef, false, true);
|
|
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
long end = System.currentTimeMillis();
|
|
logger.debug("Invitations cancelled: " + invitationIds.size() + " in "+ (end-start) + " ms");
|
|
}
|
|
}
|
|
}
|
|
else if (dictionaryService.isSubClass(type, ContentModel.TYPE_PERSON))
|
|
{
|
|
// this is a user being deleted.
|
|
String userName = (String) nodeService.getProperty(siteRef, ContentModel.PROP_USERNAME);
|
|
invalidateTasksByUser(userName);
|
|
}
|
|
return null;
|
|
}
|
|
}, AuthenticationUtil.SYSTEM_USER_NAME);
|
|
}
|
|
|
|
private void invalidateTasksByUser(String userName) throws AuthenticationException
|
|
{
|
|
List<Invitation> listForInvitee = listPendingInvitationsForInvitee(userName);
|
|
for (Invitation inv : listForInvitee)
|
|
{
|
|
cancel(inv.getInviteId());
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Generates a description for the workflow
|
|
*
|
|
* @param siteInfo The site to generate a description for
|
|
* @param messageId The resource bundle key to use for the description
|
|
* @return The workflow description
|
|
*/
|
|
protected String generateWorkflowDescription(SiteInfo siteInfo, String messageId)
|
|
{
|
|
String siteTitle = siteInfo.getTitle();
|
|
if (siteTitle == null || siteTitle.length() == 0)
|
|
{
|
|
siteTitle = siteInfo.getShortName();
|
|
}
|
|
|
|
return I18NUtil.getMessage(messageId, siteTitle);
|
|
}
|
|
|
|
/**
|
|
* @param sendEmails the sendEmails to set
|
|
*/
|
|
public void setSendEmails(boolean sendEmails)
|
|
{
|
|
this.sendEmails = sendEmails;
|
|
}
|
|
|
|
/**
|
|
* @return true if emails are sent on invite.
|
|
*/
|
|
public boolean isSendEmails()
|
|
{
|
|
return sendEmails;
|
|
}
|
|
|
|
public void setSysAdminParams(SysAdminParams sysAdminParams)
|
|
{
|
|
this.sysAdminParams = sysAdminParams;
|
|
}
|
|
}
|