amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-04 06:36:24 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 05c004606ea7630c74dd1bb97957bc57215c5e55

Browse Source 
Monotone-Revision: b3104cb2f524576b6a02514df135076db60274ea

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-09T19:23:09
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-05-09 19:23:09 +00:00
parent 98b2014f6b
commit fbd7354fff
3 changed files with 158 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,5 +1,12 @@
2007-05-09 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoUser.m ([SOGoUser -primaryEmail]): new name
for "mail" method.
([SOGoUser -systemEmail]): returns the email formed from the
username and the default mail domain.
([SOGoUser -hasEmail:email]): test whether the user has the
specified email, in a case-insensitive way.
* SoObjects/SOGo/SOGoAuthenticator.m ([SOGoAuthenticator
-LDAPCheckLogin:_loginpassword:_pwd]): use the user manager to
check login information.

25
SoObjects/SOGo/SOGoUser.h
View File

@@ -45,30 +45,35 @@
@interface SOGoUser : SoUser
{
NSString *cn;
NSString *email;
NSString *systemEMail;
NSArray *allEmails;
NSUserDefaults *userDefaults;
NSUserDefaults *userSettings;
NSTimeZone *userTimeZone;
}
+ (SOGoUser *) userWithLogin: (NSString *) login
andRoles: (NSArray *) roles;
roles: (NSArray *) roles;
/* properties */
- (NSString *) email;
- (NSString *) systemEMail;
- (NSString *) primaryEmail;
- (NSString *) systemEmail;
- (NSArray *) allEmails;
- (BOOL) hasEmail: (NSString *) email;
- (NSString *) cn;
- (NSURL *) freeBusyURL;
/* shares and identities */
- (NSString *) primaryIMAP4AccountString;
- (NSString *) primaryMailServer;
- (NSArray *) additionalIMAP4AccountStrings;
- (NSArray *) additionalEMailAddresses;
- (NSDictionary *) additionalIMAP4AccountsAndEMails;
// - (NSString *) primaryIMAP4AccountString;
// - (NSString *) primaryMailServer;
// - (NSArray *) additionalIMAP4AccountStrings;
// - (NSArray *) additionalEMailAddresses;
// - (NSDictionary *) additionalIMAP4AccountsAndEMails;
/* defaults */
@@ -81,7 +86,7 @@
/* folders */
- (id) homeFolderInContext: (id) _ctx;
- (id) schedulingCalendarInContext: (id) _ctx;
// - (id) schedulingCalendarInContext: (id) _ctx;
- (NSArray *) rolesForObject: (NSObject *) object
inContext: (WOContext *) context;

210
SoObjects/SOGo/SOGoUser.m
View File

@@ -27,12 +27,15 @@
#import <NGObjWeb/SoObject.h>
#import <NGExtensions/NSNull+misc.h>
#import "AgenorUserManager.h"
#import "AgenorUserDefaults.h"
#import "LDAPUserManager.h"
#import "SOGoContentObject.h"
#import "SOGoUser.h"
#import "SOGoPermissions.h"
static NSTimeZone *serverTimeZone = nil;
static NSString *fallbackIMAP4Server = nil;
static NSURL *AgenorProfileURL = nil;
@interface NSObject (SOGoRoles)
@@ -45,20 +48,29 @@ static NSTimeZone *serverTimeZone = nil;
+ (void) initialize
{
NSString *tzName;
NSUserDefaults *ud;
NSString *profileURL;
ud = [NSUserDefaults standardUserDefaults];
if (!serverTimeZone)
{
tzName = [[NSUserDefaults standardUserDefaults]
stringForKey: @"SOGoServerTimeZone"];
tzName = [ud stringForKey: @"SOGoServerTimeZone"];
if (!tzName)
tzName = @"Canada/Eastern";
serverTimeZone = [NSTimeZone timeZoneWithName: tzName];
[serverTimeZone retain];
}
if (!AgenorProfileURL)
{
profileURL = [ud stringForKey: @"AgenorProfileURL"];
AgenorProfileURL = [[NSURL alloc] initWithString: profileURL];
}
if (!fallbackIMAP4Server)
ASSIGN (fallbackIMAP4Server, [ud stringForKey: @"SOGoFallbackIMAP4Server"]);
}
+ (SOGoUser *) userWithLogin: (NSString *) login
andRoles: (NSArray *) roles
roles: (NSArray *) roles
{
SOGoUser *user;
@@ -74,6 +86,27 @@ static NSTimeZone *serverTimeZone = nil;
{
userDefaults = nil;
userSettings = nil;
allEmails = nil;
}
return self;
}
- (id) initWithLogin: (NSString *) newLogin
roles: (NSArray *) newRoles
{
LDAPUserManager *um;
NSDictionary *user;
if ([newLogin isEqualToString: @"anonymous"]
|| [newLogin isEqualToString: @"freebusy"])
self = [super initWithLogin: newLogin roles: newRoles];
else
{
um = [LDAPUserManager sharedUserManager];
user = [um contactInfosForUserWithUIDorEmail: newLogin];
self = [super initWithLogin: [user objectForKey: @"c_uid"]
roles: newRoles];
}
return self;
@@ -83,84 +116,115 @@ static NSTimeZone *serverTimeZone = nil;
{
[userDefaults release];
[userSettings release];
[cn release];
[email release];
[super dealloc];
}
/* internals */
- (AgenorUserManager *) userManager
- (id) _fetchFieldForUser: (NSString *) field
{
static AgenorUserManager *um = nil;
if (um == nil) um = [[AgenorUserManager sharedUserManager] retain];
NSDictionary *contactInfos;
LDAPUserManager *um;
return um;
um = [LDAPUserManager sharedUserManager];
contactInfos = [um contactInfosForUserWithUIDorEmail: login];
return [contactInfos objectForKey: field];
}
- (void) _fetchAllEmails
{
allEmails = [self _fetchFieldForUser: @"emails"];
[allEmails retain];
}
- (void) _fetchCN
{
cn = [self _fetchFieldForUser: @"cn"];
[cn retain];
}
/* properties */
- (NSString *) email
- (NSString *) primaryEmail
{
if (!email)
{
email = [[self userManager] getEmailForUID: [self login]];
[email retain];
}
if (!allEmails)
[self _fetchAllEmails];
return email;
return [allEmails objectAtIndex: 0];
}
- (NSString *) systemEMail
- (NSString *) systemEmail
{
if (!systemEMail)
{
systemEMail = [[self userManager] getSystemEMailForUID: [self login]];
[systemEMail retain];
}
if (!allEmails)
[self _fetchAllEmails];
return systemEMail;
return [allEmails lastObject];
}
- (NSArray *) allEmails
{
if (!allEmails)
[self _fetchAllEmails];
return allEmails;
}
- (BOOL) hasEmail: (NSString *) email
{
BOOL hasEmail;
NSString *currentEmail, *cmpEmail;
NSEnumerator *emails;
hasEmail = NO;
if (!allEmails)
[self _fetchAllEmails];
cmpEmail = [email lowercaseString];
emails = [allEmails objectEnumerator];
currentEmail = [emails nextObject];
while (currentEmail && !hasEmail)
if ([[currentEmail lowercaseString] isEqualToString: cmpEmail])
hasEmail = YES;
else
currentEmail = [emails nextObject];
return hasEmail;
}
- (NSString *) cn
{
if (cn == nil)
{
cn = [[self userManager] getCNForUID: [self login]];
[cn retain];
}
if (!cn)
[self _fetchCN];
return cn;
}
- (NSString *) primaryIMAP4AccountString
{
return [[self userManager] getIMAPAccountStringForUID: [self login]];
return [NSString stringWithFormat: @"%@@%@", login, fallbackIMAP4Server];
}
- (NSString *) primaryMailServer
{
return [[self userManager] getServerForUID: [self login]];
}
// - (NSString *) primaryMailServer
// {
// return [[self userManager] getServerForUID: [self login]];
// }
- (NSArray *) additionalIMAP4AccountStrings
{
return [[self userManager]getSharedMailboxAccountStringsForUID: [self login]];
}
// - (NSArray *) additionalIMAP4AccountStrings
// {
// return [[self userManager]getSharedMailboxAccountStringsForUID: [self login]];
// }
- (NSArray *) additionalEMailAddresses
{
return [[self userManager] getSharedMailboxEMailsForUID: [self login]];
}
// - (NSArray *) additionalEMailAddresses
// {
// return [[self userManager] getSharedMailboxEMailsForUID: [self login]];
// }
- (NSDictionary *) additionalIMAP4AccountsAndEMails
{
return [[self userManager] getSharedMailboxesAndEMailsForUID: [self login]];
}
// - (NSDictionary *) additionalIMAP4AccountsAndEMails
// {
// return [[self userManager] getSharedMailboxesAndEMailsForUID: [self login]];
// }
- (NSURL *) freeBusyURL
{
return [[self userManager] getFreeBusyURLForUID: [self login]];
return nil;
}
/* defaults */
@@ -168,10 +232,9 @@ static NSTimeZone *serverTimeZone = nil;
- (NSUserDefaults *) userDefaults
{
if (!userDefaults)
{
userDefaults = [[self userManager] getUserDefaultsForUID: [self login]];
[userDefaults retain];
}
userDefaults = [[AgenorUserDefaults alloc] initWithTableURL: AgenorProfileURL
uid: login
fieldName: @"defaults"];
return userDefaults;
}
@@ -179,10 +242,9 @@ static NSTimeZone *serverTimeZone = nil;
- (NSUserDefaults *) userSettings
{
if (!userSettings)
{
userSettings = [[self userManager] getUserSettingsForUID: [self login]];
[userSettings retain];
}
userSettings = [[AgenorUserDefaults alloc] initWithTableURL: AgenorProfileURL
uid: login
fieldName: @"settings"];
return userSettings;
}
@@ -234,27 +296,27 @@ static NSTimeZone *serverTimeZone = nil;
return folder;
}
- (id) schedulingCalendarInContext: (id) _ctx
{
/* Note: watch out for cyclic references */
id folder;
// - (id) schedulingCalendarInContext: (id) _ctx
// {
// /* Note: watch out for cyclic references */
// id folder;
folder = [(WOContext *)_ctx objectForKey:@"ActiveUserCalendar"];
if (folder != nil)
return [folder isNotNull] ? folder : nil;
// folder = [(WOContext *)_ctx objectForKey:@"ActiveUserCalendar"];
// if (folder != nil)
// return [folder isNotNull] ? folder : nil;
folder = [self homeFolderInContext:_ctx];
if ([folder isKindOfClass:[NSException class]])
return folder;
// folder = [self homeFolderInContext:_ctx];
// if ([folder isKindOfClass:[NSException class]])
// return folder;
folder = [folder lookupName:@"Calendar" inContext:_ctx acquire:NO];
if ([folder isKindOfClass:[NSException class]])
return folder;
// folder = [folder lookupName:@"Calendar" inContext:_ctx acquire:NO];
// if ([folder isKindOfClass:[NSException class]])
// return folder;
[(WOContext *)_ctx setObject:folder ? folder : [NSNull null]
forKey:@"ActiveUserCalendar"];
return folder;
}
// [(WOContext *)_ctx setObject:folder ? folder : [NSNull null]
// forKey:@"ActiveUserCalendar"];
// return folder;
// }
- (NSArray *) rolesForObject: (NSObject *) object
inContext: (WOContext *) context