Revision baaf1397 pithos-macos/PithosAccount.h

b/pithos-macos/PithosAccount.h
54 54
    BOOL syncSkipHidden;
55 55
    NSDate *syncLastCompleted;
56 56
    PithosSyncDaemon *syncDaemon;
57
        
58
    // Base for all necessary URLs, default "https://pithos.okeanos.grnet.gr"
59
    NSString *serverURL;
60
    // Appended to serverURL to get storageURLPrefix and authURL, default "v1"
61
    // Can be overriden by setting directly storageURLPrefix and authURL
62
    NSString *versionResource;
63
    // Appended to serverURL to get loginURLPrefix, default "login"
64
    // Can be overriden by setting directly loginURLPrefix
65
    NSString *loginResource;
66
    // Appended to serverURL to get publicURLPrefix, default nil
67
    // Can be overriden by setting directly publicURLPrefix
68
    NSString *publicResource;
69
    // Appended to serverURL to get userCatalogURL, default "user_catalogs"
70
    // Can be overriden by setting directly userCatalogURL
71
    NSString *userCatalogResource;
72

  
73
    NSString *authUser;
57
    
58
    NSString *authURLString;
59
    NSString *pithosObjectStoreURLString;
60
    NSString *astakosAccountURLString;
61
    NSString *astakosWebloginURLString;
62
    BOOL manual;
63
    
74 64
    NSString *authToken;
75
    NSString *storageURLPrefix;
76
    NSString *authURL;
77
    NSString *publicURLPrefix;
78
    NSString *loginURLPrefix;
79
    NSString *userCatalogURL;
65
    NSString *authUser;
80 66
    NSMutableDictionary *userCatalog;
81 67
    
68
    BOOL ignoreSSLErrors;
69
    
82 70
    ASIPithos *pithos;
83 71
    PithosAccountNode *accountNode;
84 72
    PithosSharingAccountsNode *sharingAccountsNode;
......
99 87
@property (nonatomic, strong) NSDate *syncLastCompleted;
100 88
@property (nonatomic, strong) PithosSyncDaemon *syncDaemon;
101 89

  
102
@property (nonatomic, strong) NSString *serverURL;
103
@property (nonatomic, strong) NSString *versionResource;
104
@property (nonatomic, strong) NSString *loginResource;
105
@property (strong) NSString *publicResource;
106
@property (nonatomic, strong) NSString *userCatalogResource;
90
@property (nonatomic, strong) NSString *authURLString;
91
@property (nonatomic, strong) NSString *pithosObjectStoreURLString;
92
@property (nonatomic, strong) NSString *astakosAccountURLString;
93
@property (nonatomic, strong) NSString *astakosWebloginURLString;
94
@property (nonatomic, assign) BOOL manual;
107 95

  
108
@property (nonatomic, strong) NSString *authUser;
109 96
@property (nonatomic, strong) NSString *authToken;
110
@property (nonatomic, strong) NSString *storageURLPrefix;
111
@property (nonatomic, strong) NSString *authURL;
112
@property (nonatomic, strong) NSString *publicURLPrefix;
113
@property (nonatomic, strong) NSString *loginURLPrefix;
114
@property (nonatomic, strong) NSString *userCatalogURL;
97
@property (nonatomic, strong) NSString *authUser;
115 98
@property (nonatomic, strong) NSMutableDictionary *userCatalog;
116 99

  
100
@property (nonatomic, assign) BOOL ignoreSSLErrors;
101

  
117 102
@property (strong, readonly) ASIPithos *pithos;
118 103
@property (readonly) PithosAccountNode *accountNode;
119 104
@property (readonly) PithosSharingAccountsNode *sharingAccountsNode;
120 105

  
106
@property (nonatomic, readonly) NSString *tokensURL;
107
@property (nonatomic, readonly) NSString *storageURLPrefix;
108
@property (nonatomic, readonly) NSString *loginURL;
109
@property (nonatomic, readonly) NSString *userCatalogURL;
110
@property (nonatomic, readonly) NSString *publicURLPrefix;
111

  
121 112
+ (id)pithosAccount;
122 113

  
123
- (BOOL)urlIsValid:(NSString *)urlString;
124
- (void)authenticateWithServerURL:(NSString *)aServerURL authUser:(NSString *)anAuthUser authToken:(NSString *)anAuthToken;
125
- (void)loginWithServerURL:(NSString *)aServerURL;
126
- (void)updateSyncWithSyncActive:(BOOL)aSyncActive 
114
- (void)updateWithAuthURLString:(NSString *)anAuthURLString
115
     pithosObjectStoreURLString:(NSString *)aPithosObjectStoreURLString
116
        astakosAccountURLString:(NSString *)anAstakosAccountURLString
117
       astakosWebloginURLString:(NSString *)anAstakosWebloginURLString
118
                         manual:(BOOL)aManual
119
                      authToken:(NSString *)anAuthToken
120
                       authUser:(NSString *)anAuthUser
121
                ignoreSSLErrors:(BOOL)anIgnoreSSLErrors;
122
- (void)updateSyncWithSyncActive:(BOOL)aSyncActive
127 123
               syncDirectoryPath:(NSString *)aSyncDirectoryPath 
128 124
          syncAccountsDictionary:(NSMutableDictionary *)aSyncAccountsDictionary 
129 125
                  syncSkipHidden:(BOOL)aSyncSkipHidden;
130
- (ASIPithosRequest *)updateUserCatalogForForDisplaynames:(NSArray *)displaynames UUIDs:(NSArray *)UUIDs;
126
- (NSMutableDictionary *)servicesFromServiceCatalogRequest:(ASIPithosRequest *)serviceCatalogRequest;
127
- (void)updateServicesFromServiceCatalogRequest:(ASIPithosRequest *)serviceCatalogRequest;
128
- (ASIPithosRequest *)updateUserCatalogForDisplaynames:(NSArray *)displaynames UUIDs:(NSArray *)UUIDs;
131 129
- (NSString *)displaynameForUUID:(NSString *)UUID safe:(BOOL)safe;
132 130
- (NSString *)displaynameForUUID:(NSString *)UUID;
133 131

  

Also available in: Unified diff