From ed2e5e25ab10e8be5d7b6697c9a8ef0058fd8c0c Mon Sep 17 00:00:00 2001 From: Tim Garrels Date: Wed, 10 Jul 2019 17:20:15 +0200 Subject: [PATCH 01/12] Literally just merged ICAuthenticationInfo with ICServerInfo. Had to change constructors of course --- .../ICAccountInfo.class/README.md | 0 .../ICAccountInfo.class/class/defaultHost.st | 4 ++++ .../ICAccountInfo.class/class/defaultPort.st | 4 ++++ .../ICAccountInfo.class/class/for.using..st | 6 +++++ .../class/initialPassword.st | 4 ++++ .../class/initialUsername.st | 4 ++++ .../class/newWithHost.port..st | 6 +++++ .../class/newWithUsername.password..st | 6 +++++ .../instance/canConvert..st | 4 ++++ .../ICAccountInfo.class/instance/host..st | 4 ++++ .../ICAccountInfo.class/instance/host.st | 4 ++++ .../ICAccountInfo.class/instance/isValid.st | 4 ++++ .../ICAccountInfo.class/instance/password..st | 5 +++++ .../ICAccountInfo.class/instance/password.st | 6 +++++ .../instance/passwordAsIMAPString.st | 4 ++++ .../ICAccountInfo.class/instance/port..st | 4 ++++ .../ICAccountInfo.class/instance/port.st | 4 ++++ .../ICAccountInfo.class/instance/username..st | 5 +++++ .../ICAccountInfo.class/instance/username.st | 6 +++++ .../instance/usernameAsIMAPString.st | 4 ++++ .../ICAccountInfo.class/methodProperties.json | 22 +++++++++++++++++++ .../ICAccountInfo.class/properties.json | 18 +++++++++++++++ 22 files changed, 128 insertions(+) create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/README.md create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/class/defaultHost.st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/class/defaultPort.st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/class/for.using..st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialPassword.st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialUsername.st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithHost.port..st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithUsername.password..st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/canConvert..st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/host..st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/host.st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/isValid.st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/password..st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/password.st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/passwordAsIMAPString.st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/port..st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/port.st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/username..st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/username.st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/usernameAsIMAPString.st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/properties.json diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/README.md b/packages/IMAPClient-Core.package/ICAccountInfo.class/README.md new file mode 100644 index 00000000..e69de29b diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/defaultHost.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/defaultHost.st new file mode 100644 index 00000000..7e08bc2e --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/defaultHost.st @@ -0,0 +1,4 @@ +constants +defaultHost + + ^ 'unknown' \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/defaultPort.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/defaultPort.st new file mode 100644 index 00000000..602a5a35 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/defaultPort.st @@ -0,0 +1,4 @@ +constants +defaultPort + + ^ -1 \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/for.using..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/for.using..st new file mode 100644 index 00000000..6a915ae9 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/for.using..st @@ -0,0 +1,6 @@ +instance creation +for: host using: port + + ^ self new + host: host; + port: port \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialPassword.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialPassword.st new file mode 100644 index 00000000..3db644a7 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialPassword.st @@ -0,0 +1,4 @@ +constants +initialPassword + + ^ String empty \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialUsername.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialUsername.st new file mode 100644 index 00000000..82ada6d7 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialUsername.st @@ -0,0 +1,4 @@ +constants +initialUsername + + ^ String empty \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithHost.port..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithHost.port..st new file mode 100644 index 00000000..ccb908e7 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithHost.port..st @@ -0,0 +1,6 @@ +instance creation +newWithHost: host port: port + + ^ self new + host: host; + port: port \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithUsername.password..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithUsername.password..st new file mode 100644 index 00000000..512a2c75 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithUsername.password..st @@ -0,0 +1,6 @@ +instance creation +newWithUsername: username password: password + + ^ self new + username: username; + password: password \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/canConvert..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/canConvert..st new file mode 100644 index 00000000..5292926e --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/canConvert..st @@ -0,0 +1,4 @@ +validation +canConvert: aString + + ^ ('"|\\' asRegex matchesIn: aString) isEmpty. \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/host..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/host..st new file mode 100644 index 00000000..8e89907c --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/host..st @@ -0,0 +1,4 @@ +accessing +host: aString + + host := aString \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/host.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/host.st new file mode 100644 index 00000000..1ca59fa4 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/host.st @@ -0,0 +1,4 @@ +accessing +host + + ^ host ifNil: [host := self class defaultHost] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/isValid.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/isValid.st new file mode 100644 index 00000000..4f2e6087 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/isValid.st @@ -0,0 +1,4 @@ +validation +isValid + + ^ (self host ~= self class defaultHost and: [self port ~= self class defaultPort]) and: (self username ~= self class initialUsername and: [self password ~= self class initialPassword]) \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/password..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/password..st new file mode 100644 index 00000000..70c69d7f --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/password..st @@ -0,0 +1,5 @@ +accessing +password: aString + + (self canConvert: aString) ifFalse: [self error: (aString, ' is not IMAP convertable')]. + password := aString \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/password.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/password.st new file mode 100644 index 00000000..8c87e3eb --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/password.st @@ -0,0 +1,6 @@ +accessing +password + + password ifNil: + [self password: self class initialPassword]. + ^ password \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/passwordAsIMAPString.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/passwordAsIMAPString.st new file mode 100644 index 00000000..b31f189a --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/passwordAsIMAPString.st @@ -0,0 +1,4 @@ +accessing +passwordAsIMAPString + + ^ '"', self password, '"' \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/port..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/port..st new file mode 100644 index 00000000..776415e4 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/port..st @@ -0,0 +1,4 @@ +accessing +port: aNumber + + port := aNumber \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/port.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/port.st new file mode 100644 index 00000000..475cdeef --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/port.st @@ -0,0 +1,4 @@ +accessing +port + + ^ port ifNil: [port := self class defaultPort] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/username..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/username..st new file mode 100644 index 00000000..2d2a64ef --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/username..st @@ -0,0 +1,5 @@ +accessing +username: aString + + (self canConvert: aString) ifFalse: [self error: (aString, ' is not IMAP convertable')]. + username := aString \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/username.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/username.st new file mode 100644 index 00000000..4aa90b64 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/username.st @@ -0,0 +1,6 @@ +accessing +username + + username ifNil: + [self username: self class initialUsername]. + ^ username \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/usernameAsIMAPString.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/usernameAsIMAPString.st new file mode 100644 index 00000000..a15b58c9 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/usernameAsIMAPString.st @@ -0,0 +1,4 @@ +accessing +usernameAsIMAPString + + ^ '"', self username, '"' \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json b/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json new file mode 100644 index 00000000..33af865b --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json @@ -0,0 +1,22 @@ +{ + "class" : { + "defaultHost" : "tg 7/10/2019 17:09", + "defaultPort" : "tg 7/10/2019 17:10", + "for:using:" : "tg 7/10/2019 17:10", + "initialPassword" : "tg 7/10/2019 17:14", + "initialUsername" : "tg 7/10/2019 17:14", + "newWithHost:port:" : "tg 7/10/2019 17:13", + "newWithUsername:password:" : "tg 7/10/2019 17:14" }, + "instance" : { + "canConvert:" : "tg 7/10/2019 17:18", + "host" : "tg 7/10/2019 17:11", + "host:" : "tg 7/10/2019 17:11", + "isValid" : "tg 7/10/2019 17:19", + "password" : "tg 7/10/2019 17:18", + "password:" : "tg 7/10/2019 17:18", + "passwordAsIMAPString" : "tg 7/10/2019 17:18", + "port" : "tg 7/10/2019 17:11", + "port:" : "tg 7/10/2019 17:11", + "username" : "tg 7/10/2019 17:18", + "username:" : "tg 7/10/2019 17:18", + "usernameAsIMAPString" : "tg 7/10/2019 17:18" } } diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/properties.json b/packages/IMAPClient-Core.package/ICAccountInfo.class/properties.json new file mode 100644 index 00000000..bcdb7dae --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/properties.json @@ -0,0 +1,18 @@ +{ + "category" : "IMAPClient-Core", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + "name", + "host", + "port", + "username", + "password" ], + "name" : "ICAccountInfo", + "pools" : [ + ], + "super" : "Object", + "type" : "normal" } From 9e534ce0cbd896a810714fa94e65d0e6cde81959 Mon Sep 17 00:00:00 2001 From: Tim Garrels Date: Wed, 10 Jul 2019 20:14:18 +0200 Subject: [PATCH 02/12] Reworked the endpoint login and connection system to work with the new AccountInfo Class. This caused a lot of change in the test code --- .../ICAccountInfo.class/class/defaultHost.st | 4 --- .../ICAccountInfo.class/class/for.using..st | 6 ---- .../ICAccountInfo.class/class/from..st | 4 +++ ...itialPassword.st => initialAccountName.st} | 2 +- .../ICAccountInfo.class/class/initialSsl.st | 4 +++ .../class/invalidHost.st} | 2 +- .../class/invalidPassword.st} | 2 +- .../class/{defaultPort.st => invalidPort.st} | 2 +- ...{initialUsername.st => invalidUsername.st} | 2 +- ...ntName.host.port.username.password.ssl..st | 10 ++++++ .../class/newWithHost.port..st | 6 ---- .../class/newWithUsername.password..st | 4 +-- .../instance/accountName..st | 4 +++ .../instance/accountName.st | 4 +++ .../ICAccountInfo.class/instance/host.st | 2 +- .../ICAccountInfo.class/instance/isValid.st | 2 +- .../ICAccountInfo.class/instance/password.st | 4 +-- .../ICAccountInfo.class/instance/port.st | 2 +- .../ICAccountInfo.class/instance/printOn..st | 4 +++ .../ICAccountInfo.class/instance/ssl..st | 4 +++ .../ICAccountInfo.class/instance/ssl.st | 4 +++ .../ICAccountInfo.class/instance/username.st | 4 +-- .../ICAccountInfo.class/methodProperties.json | 31 ++++++++++++------- .../ICAccountInfo.class/properties.json | 5 +-- .../ICAuthenticationInfo.class/README.md | 2 -- .../class/for.using..st | 6 ---- .../instance/canConvert..st | 4 --- .../instance/isValid.st | 4 --- .../instance/password..st | 5 --- .../instance/password.st | 6 ---- .../instance/passwordAsIMAPString.st | 4 --- .../instance/username..st | 5 --- .../instance/username.st | 6 ---- .../instance/usernameAsIMAPString.st | 4 --- .../methodProperties.json | 14 --------- .../properties.json | 15 --------- .../ICEndPoint.class/instance/accountInfo..st | 4 +++ .../ICEndPoint.class/instance/accountInfo.st | 4 +++ .../ICEndPoint.class/instance/asDictionary.st | 12 +++---- .../instance/authenticationInfo..st | 4 --- .../instance/authenticationInfo.st | 4 --- .../instance/checkConnected.st | 2 +- .../ICEndPoint.class/instance/connect.st | 4 +++ .../instance/connectTo.on..st | 4 --- .../instance/connectTo.on.with..st | 4 --- .../instance/connectTo.with..st | 12 ------- .../ICEndPoint.class/instance/connectWith..st | 11 +++++++ .../instance/fromAccountInfo..st | 14 +++++++++ .../instance/fromDictionary..st | 14 --------- .../ICEndPoint.class/instance/login.st | 6 ++-- .../ICEndPoint.class/instance/login.using..st | 5 --- .../ICEndPoint.class/instance/loginUsing..st | 6 ---- .../ICEndPoint.class/instance/name..st | 4 --- .../ICEndPoint.class/instance/name.st | 4 --- .../instance/rootFolderName.st | 2 +- .../ICEndPoint.class/instance/serverInfo..st | 4 --- .../ICEndPoint.class/instance/serverInfo.st | 4 --- .../instance/testAccountWith..st | 4 +-- .../ICEndPoint.class/instance/useSSL.st | 2 +- .../ICEndPoint.class/methodProperties.json | 29 +++++++---------- .../ICEndPoint.class/properties.json | 3 +- .../ICFolder.class/instance/update..st | 2 +- .../ICFolder.class/methodProperties.json | 2 +- .../class/accountDictionariesToEndpoints..st | 2 +- .../ICHelper.class/methodProperties.json | 2 +- .../ICServerInfo.class/README.md | 1 - .../ICServerInfo.class/class/defaultHost.st | 4 --- .../ICServerInfo.class/class/defaultPort.st | 4 --- .../ICServerInfo.class/class/for.using..st | 6 ---- .../ICServerInfo.class/instance/host..st | 4 --- .../ICServerInfo.class/instance/host.st | 4 --- .../ICServerInfo.class/instance/isValid.st | 4 --- .../ICServerInfo.class/instance/port..st | 4 --- .../ICServerInfo.class/instance/port.st | 4 --- .../ICServerInfo.class/methodProperties.json | 11 ------- .../ICServerInfo.class/properties.json | 15 --------- .../README.md | 0 .../class/invalidPassword.st | 0 .../class/invalidUsername.st | 0 .../class/validAccountName.st | 4 +++ .../class/validHost.st | 4 +++ .../class/validPassword.st} | 2 +- .../class/validPort.st | 4 +++ .../class/validUsername.st} | 2 +- .../instance/accountInfo..st | 3 ++ .../instance/accountInfo.st | 3 ++ .../ICAccountInfoTest.class/instance/setUp.st | 6 ++++ .../instance/testForArgumentCount.st | 5 +++ .../instance/testForValidIMAPString.st | 0 .../methodProperties.json | 15 +++++++++ .../properties.json | 4 +-- .../instance/authInfo..st | 3 -- .../instance/authInfo.st | 3 -- .../instance/setUp.st | 6 ---- .../instance/testForArgumentCount.st | 5 --- .../methodProperties.json | 12 ------- .../class/invalidPasswordAccountInfo.st | 4 +++ .../class/invalidUsernameAccountInfo.st | 4 +++ .../class/validAccountInfo.st | 4 +++ .../class/validAccountName.st | 4 +++ .../class/validHost.st | 4 +++ .../class/validPort.st | 4 +++ .../instance/setUp.st | 4 +-- .../instance/testLogin.st | 5 +-- .../instance/testLoginWithInvalidPassword.st | 5 +++ .../instance/testLoginWithInvalidUsername.st | 5 +++ .../instance/testLoginWithWrongPassword.st | 7 ----- .../instance/testLoginWithWrongUsername.st | 7 ----- .../methodProperties.json | 14 ++++++--- ...testFetchMailsBeginningAtWithFoundMails.st | 2 +- .../instance/testRetrieveFlagsOnly.st | 2 +- .../methodProperties.json | 4 +-- .../class/invalidHost.st | 2 +- .../class/invalidHostAccountInfo.st | 4 +++ .../class/invalidPortAccountInfo.st | 4 +++ .../class/validAccountInfo.st | 4 +++ .../class/validAccountName.st | 4 +++ .../class/validPassword.st | 4 +++ .../class/validUsername.st | 4 +++ .../instance/testConnectToOn.st | 4 +-- .../instance/testConnectToOnWithWrongHost.st | 3 +- .../instance/testConnectToOnWithWrongPort.st | 3 +- .../methodProperties.json | 16 +++++++--- .../instance/labelForAccount..st | 4 +-- .../methodProperties.json | 4 +-- .../ICPasswordDialog.class/instance/login.st | 6 ++-- .../methodProperties.json | 2 +- 127 files changed, 289 insertions(+), 367 deletions(-) delete mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/class/defaultHost.st delete mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/class/for.using..st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/class/from..st rename packages/IMAPClient-Core.package/ICAccountInfo.class/class/{initialPassword.st => initialAccountName.st} (57%) create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialSsl.st rename packages/IMAPClient-Core.package/{ICAuthenticationInfo.class/class/initialPassword.st => ICAccountInfo.class/class/invalidHost.st} (61%) rename packages/IMAPClient-Core.package/{ICAuthenticationInfo.class/class/initialUsername.st => ICAccountInfo.class/class/invalidPassword.st} (61%) rename packages/IMAPClient-Core.package/ICAccountInfo.class/class/{defaultPort.st => invalidPort.st} (57%) rename packages/IMAPClient-Core.package/ICAccountInfo.class/class/{initialUsername.st => invalidUsername.st} (61%) create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithAccountName.host.port.username.password.ssl..st delete mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithHost.port..st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/accountName..st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/accountName.st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/printOn..st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/ssl..st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/ssl.st delete mode 100644 packages/IMAPClient-Core.package/ICAuthenticationInfo.class/README.md delete mode 100644 packages/IMAPClient-Core.package/ICAuthenticationInfo.class/class/for.using..st delete mode 100644 packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/canConvert..st delete mode 100644 packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/isValid.st delete mode 100644 packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/password..st delete mode 100644 packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/password.st delete mode 100644 packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/passwordAsIMAPString.st delete mode 100644 packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/username..st delete mode 100644 packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/username.st delete mode 100644 packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/usernameAsIMAPString.st delete mode 100644 packages/IMAPClient-Core.package/ICAuthenticationInfo.class/methodProperties.json delete mode 100644 packages/IMAPClient-Core.package/ICAuthenticationInfo.class/properties.json create mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/accountInfo..st create mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/accountInfo.st delete mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/authenticationInfo..st delete mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/authenticationInfo.st create mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/connect.st delete mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectTo.on..st delete mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectTo.on.with..st delete mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectTo.with..st create mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectWith..st create mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/fromAccountInfo..st delete mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/fromDictionary..st delete mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/login.using..st delete mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/loginUsing..st delete mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/name..st delete mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/name.st delete mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/serverInfo..st delete mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/serverInfo.st delete mode 100644 packages/IMAPClient-Core.package/ICServerInfo.class/README.md delete mode 100644 packages/IMAPClient-Core.package/ICServerInfo.class/class/defaultHost.st delete mode 100644 packages/IMAPClient-Core.package/ICServerInfo.class/class/defaultPort.st delete mode 100644 packages/IMAPClient-Core.package/ICServerInfo.class/class/for.using..st delete mode 100644 packages/IMAPClient-Core.package/ICServerInfo.class/instance/host..st delete mode 100644 packages/IMAPClient-Core.package/ICServerInfo.class/instance/host.st delete mode 100644 packages/IMAPClient-Core.package/ICServerInfo.class/instance/isValid.st delete mode 100644 packages/IMAPClient-Core.package/ICServerInfo.class/instance/port..st delete mode 100644 packages/IMAPClient-Core.package/ICServerInfo.class/instance/port.st delete mode 100644 packages/IMAPClient-Core.package/ICServerInfo.class/methodProperties.json delete mode 100644 packages/IMAPClient-Core.package/ICServerInfo.class/properties.json rename packages/IMAPClient-Tests.package/{ICAuthenticationInfoTest.class => ICAccountInfoTest.class}/README.md (100%) rename packages/IMAPClient-Tests.package/{ICAuthenticationInfoTest.class => ICAccountInfoTest.class}/class/invalidPassword.st (100%) rename packages/IMAPClient-Tests.package/{ICAuthenticationInfoTest.class => ICAccountInfoTest.class}/class/invalidUsername.st (100%) create mode 100644 packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validAccountName.st create mode 100644 packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validHost.st rename packages/IMAPClient-Tests.package/{ICAuthenticationInfoTest.class/class/password.st => ICAccountInfoTest.class/class/validPassword.st} (62%) create mode 100644 packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validPort.st rename packages/IMAPClient-Tests.package/{ICAuthenticationInfoTest.class/class/username.st => ICAccountInfoTest.class/class/validUsername.st} (60%) create mode 100644 packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/accountInfo..st create mode 100644 packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/accountInfo.st create mode 100644 packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/setUp.st create mode 100644 packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/testForArgumentCount.st rename packages/IMAPClient-Tests.package/{ICAuthenticationInfoTest.class => ICAccountInfoTest.class}/instance/testForValidIMAPString.st (100%) create mode 100644 packages/IMAPClient-Tests.package/ICAccountInfoTest.class/methodProperties.json rename packages/IMAPClient-Tests.package/{ICAuthenticationInfoTest.class => ICAccountInfoTest.class}/properties.json (79%) delete mode 100644 packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/authInfo..st delete mode 100644 packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/authInfo.st delete mode 100644 packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/setUp.st delete mode 100644 packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/testForArgumentCount.st delete mode 100644 packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/methodProperties.json create mode 100644 packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/invalidPasswordAccountInfo.st create mode 100644 packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/invalidUsernameAccountInfo.st create mode 100644 packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/validAccountInfo.st create mode 100644 packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/validAccountName.st create mode 100644 packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/validHost.st create mode 100644 packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/validPort.st create mode 100644 packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLoginWithInvalidPassword.st create mode 100644 packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLoginWithInvalidUsername.st delete mode 100644 packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLoginWithWrongPassword.st delete mode 100644 packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLoginWithWrongUsername.st create mode 100644 packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/invalidHostAccountInfo.st create mode 100644 packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/invalidPortAccountInfo.st create mode 100644 packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/validAccountInfo.st create mode 100644 packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/validAccountName.st create mode 100644 packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/validPassword.st create mode 100644 packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/validUsername.st diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/defaultHost.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/defaultHost.st deleted file mode 100644 index 7e08bc2e..00000000 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/defaultHost.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -defaultHost - - ^ 'unknown' \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/for.using..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/for.using..st deleted file mode 100644 index 6a915ae9..00000000 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/for.using..st +++ /dev/null @@ -1,6 +0,0 @@ -instance creation -for: host using: port - - ^ self new - host: host; - port: port \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/from..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/from..st new file mode 100644 index 00000000..dfc5882a --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/from..st @@ -0,0 +1,4 @@ +instance creation +from: data + + ^ self newWithAccountName: (data at: 'name') host: (data at: 'address') port: ((data at: 'port') asNumber) username: (data at: 'username') password: (data at: 'password') ssl: (data at: 'ssl') \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialPassword.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialAccountName.st similarity index 57% rename from packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialPassword.st rename to packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialAccountName.st index 3db644a7..06951f14 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialPassword.st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialAccountName.st @@ -1,4 +1,4 @@ constants -initialPassword +initialAccountName ^ String empty \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialSsl.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialSsl.st new file mode 100644 index 00000000..2026b034 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialSsl.st @@ -0,0 +1,4 @@ +constants +initialSsl + + ^ true \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/class/initialPassword.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/invalidHost.st similarity index 61% rename from packages/IMAPClient-Core.package/ICAuthenticationInfo.class/class/initialPassword.st rename to packages/IMAPClient-Core.package/ICAccountInfo.class/class/invalidHost.st index 3db644a7..5d3dc878 100644 --- a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/class/initialPassword.st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/invalidHost.st @@ -1,4 +1,4 @@ constants -initialPassword +invalidHost ^ String empty \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/class/initialUsername.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/invalidPassword.st similarity index 61% rename from packages/IMAPClient-Core.package/ICAuthenticationInfo.class/class/initialUsername.st rename to packages/IMAPClient-Core.package/ICAccountInfo.class/class/invalidPassword.st index 82ada6d7..9aa41440 100644 --- a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/class/initialUsername.st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/invalidPassword.st @@ -1,4 +1,4 @@ constants -initialUsername +invalidPassword ^ String empty \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/defaultPort.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/invalidPort.st similarity index 57% rename from packages/IMAPClient-Core.package/ICAccountInfo.class/class/defaultPort.st rename to packages/IMAPClient-Core.package/ICAccountInfo.class/class/invalidPort.st index 602a5a35..00a17519 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/defaultPort.st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/invalidPort.st @@ -1,4 +1,4 @@ constants -defaultPort +invalidPort ^ -1 \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialUsername.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/invalidUsername.st similarity index 61% rename from packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialUsername.st rename to packages/IMAPClient-Core.package/ICAccountInfo.class/class/invalidUsername.st index 82ada6d7..d22aaf19 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialUsername.st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/invalidUsername.st @@ -1,4 +1,4 @@ constants -initialUsername +invalidUsername ^ String empty \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithAccountName.host.port.username.password.ssl..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithAccountName.host.port.username.password.ssl..st new file mode 100644 index 00000000..f6b44065 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithAccountName.host.port.username.password.ssl..st @@ -0,0 +1,10 @@ +instance creation +newWithAccountName: name host: host port: port username: username password: password ssl: ssl + + ^ self new + accountName: name; + host: host; + port: port; + username: username; + password: password; + ssl: ssl \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithHost.port..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithHost.port..st deleted file mode 100644 index ccb908e7..00000000 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithHost.port..st +++ /dev/null @@ -1,6 +0,0 @@ -instance creation -newWithHost: host port: port - - ^ self new - host: host; - port: port \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithUsername.password..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithUsername.password..st index 512a2c75..77845675 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithUsername.password..st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithUsername.password..st @@ -1,6 +1,4 @@ instance creation newWithUsername: username password: password - ^ self new - username: username; - password: password \ No newline at end of file + ^ self newWithAccountName: self initialAccountName host: self invalidHost port: self invalidPort username: username password: password ssl: self initialSsl \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/accountName..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/accountName..st new file mode 100644 index 00000000..788db416 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/accountName..st @@ -0,0 +1,4 @@ +accessing +accountName: aString + + accountName := aString \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/accountName.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/accountName.st new file mode 100644 index 00000000..e1981f2e --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/accountName.st @@ -0,0 +1,4 @@ +accessing +accountName + + ^ accountName ifNil: [accountName := self class defaultName] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/host.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/host.st index 1ca59fa4..d37f42d0 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/host.st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/host.st @@ -1,4 +1,4 @@ accessing host - ^ host ifNil: [host := self class defaultHost] \ No newline at end of file + ^ host ifNil: [host := self class invalidHost] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/isValid.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/isValid.st index 4f2e6087..c53fbae6 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/isValid.st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/isValid.st @@ -1,4 +1,4 @@ validation isValid - ^ (self host ~= self class defaultHost and: [self port ~= self class defaultPort]) and: (self username ~= self class initialUsername and: [self password ~= self class initialPassword]) \ No newline at end of file + ^ (self host ~= self class invalidHost and: [self port ~= self class invalidPort]) and: (self username ~= self class invalidUsername and: [self password ~= self class invalidPassword]) \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/password.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/password.st index 8c87e3eb..8e8d615e 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/password.st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/password.st @@ -1,6 +1,4 @@ accessing password - password ifNil: - [self password: self class initialPassword]. - ^ password \ No newline at end of file + ^ password ifNil: [self password: self class invalidPassword] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/port.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/port.st index 475cdeef..1cc2b951 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/port.st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/port.st @@ -1,4 +1,4 @@ accessing port - ^ port ifNil: [port := self class defaultPort] \ No newline at end of file + ^ port ifNil: [port := self class invalidPort] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/printOn..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/printOn..st new file mode 100644 index 00000000..2199e4b0 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/printOn..st @@ -0,0 +1,4 @@ +printing +printOn: aStream + + aStream nextPutAll: self accountName, ' ', self host, ' ', self port, ' ', self username, ' ', self password, ' ', self ssl \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/ssl..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/ssl..st new file mode 100644 index 00000000..1e08ecbc --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/ssl..st @@ -0,0 +1,4 @@ +accessing +ssl: aBool + + ssl := aBool \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/ssl.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/ssl.st new file mode 100644 index 00000000..ccdc809d --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/ssl.st @@ -0,0 +1,4 @@ +accessing +ssl + + ^ ssl ifNil: [ssl := self class defaultSsl] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/username.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/username.st index 4aa90b64..50433faa 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/username.st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/username.st @@ -1,6 +1,4 @@ accessing username - username ifNil: - [self username: self class initialUsername]. - ^ username \ No newline at end of file + ^ username ifNil: [self username: self class invalidUsername]. \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json b/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json index 33af865b..105ea156 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json @@ -1,22 +1,29 @@ { "class" : { - "defaultHost" : "tg 7/10/2019 17:09", - "defaultPort" : "tg 7/10/2019 17:10", - "for:using:" : "tg 7/10/2019 17:10", - "initialPassword" : "tg 7/10/2019 17:14", - "initialUsername" : "tg 7/10/2019 17:14", - "newWithHost:port:" : "tg 7/10/2019 17:13", - "newWithUsername:password:" : "tg 7/10/2019 17:14" }, + "from:" : "tg 7/10/2019 18:17", + "initialAccountName" : "tg 7/10/2019 17:43", + "initialSsl" : "tg 7/10/2019 17:43", + "invalidHost" : "tg 7/10/2019 20:08", + "invalidPassword" : "tg 7/10/2019 20:10", + "invalidPort" : "tg 7/10/2019 20:09", + "invalidUsername" : "tg 7/10/2019 20:10", + "newWithAccountName:host:port:username:password:ssl:" : "tg 7/10/2019 17:49", + "newWithUsername:password:" : "tg 7/10/2019 20:08" }, "instance" : { + "accountName" : "tg 7/10/2019 17:35", + "accountName:" : "tg 7/10/2019 17:35", "canConvert:" : "tg 7/10/2019 17:18", - "host" : "tg 7/10/2019 17:11", + "host" : "tg 7/10/2019 20:06", "host:" : "tg 7/10/2019 17:11", - "isValid" : "tg 7/10/2019 17:19", - "password" : "tg 7/10/2019 17:18", + "isValid" : "tg 7/10/2019 20:07", + "password" : "tg 7/10/2019 20:11", "password:" : "tg 7/10/2019 17:18", "passwordAsIMAPString" : "tg 7/10/2019 17:18", - "port" : "tg 7/10/2019 17:11", + "port" : "tg 7/10/2019 20:09", "port:" : "tg 7/10/2019 17:11", - "username" : "tg 7/10/2019 17:18", + "printOn:" : "tg 7/10/2019 18:06", + "ssl" : "tg 7/10/2019 17:33", + "ssl:" : "tg 7/10/2019 17:34", + "username" : "tg 7/10/2019 20:11", "username:" : "tg 7/10/2019 17:18", "usernameAsIMAPString" : "tg 7/10/2019 17:18" } } diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/properties.json b/packages/IMAPClient-Core.package/ICAccountInfo.class/properties.json index bcdb7dae..7941e662 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/properties.json +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/properties.json @@ -6,11 +6,12 @@ ], "commentStamp" : "", "instvars" : [ - "name", + "accountName", "host", "port", "username", - "password" ], + "password", + "ssl" ], "name" : "ICAccountInfo", "pools" : [ ], diff --git a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/README.md b/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/README.md deleted file mode 100644 index 35e3cc4f..00000000 --- a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/README.md +++ /dev/null @@ -1,2 +0,0 @@ -An ICAuthenticationInfo is a wrapper for a username-password-combination. -It also ensures that the strings are IMAP Conform Data \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/class/for.using..st b/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/class/for.using..st deleted file mode 100644 index c4d14481..00000000 --- a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/class/for.using..st +++ /dev/null @@ -1,6 +0,0 @@ -instance creation -for: username using: password - - ^ self new - username: username; - password: password \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/canConvert..st b/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/canConvert..st deleted file mode 100644 index 5292926e..00000000 --- a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/canConvert..st +++ /dev/null @@ -1,4 +0,0 @@ -validation -canConvert: aString - - ^ ('"|\\' asRegex matchesIn: aString) isEmpty. \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/isValid.st b/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/isValid.st deleted file mode 100644 index 527a02a9..00000000 --- a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/isValid.st +++ /dev/null @@ -1,4 +0,0 @@ -validation -isValid - - ^ self username ~= self class initialUsername and: [self password ~= self class initialPassword] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/password..st b/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/password..st deleted file mode 100644 index 70c69d7f..00000000 --- a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/password..st +++ /dev/null @@ -1,5 +0,0 @@ -accessing -password: aString - - (self canConvert: aString) ifFalse: [self error: (aString, ' is not IMAP convertable')]. - password := aString \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/password.st b/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/password.st deleted file mode 100644 index 8c87e3eb..00000000 --- a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/password.st +++ /dev/null @@ -1,6 +0,0 @@ -accessing -password - - password ifNil: - [self password: self class initialPassword]. - ^ password \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/passwordAsIMAPString.st b/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/passwordAsIMAPString.st deleted file mode 100644 index b31f189a..00000000 --- a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/passwordAsIMAPString.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -passwordAsIMAPString - - ^ '"', self password, '"' \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/username..st b/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/username..st deleted file mode 100644 index 2d2a64ef..00000000 --- a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/username..st +++ /dev/null @@ -1,5 +0,0 @@ -accessing -username: aString - - (self canConvert: aString) ifFalse: [self error: (aString, ' is not IMAP convertable')]. - username := aString \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/username.st b/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/username.st deleted file mode 100644 index 4aa90b64..00000000 --- a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/username.st +++ /dev/null @@ -1,6 +0,0 @@ -accessing -username - - username ifNil: - [self username: self class initialUsername]. - ^ username \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/usernameAsIMAPString.st b/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/usernameAsIMAPString.st deleted file mode 100644 index a15b58c9..00000000 --- a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/usernameAsIMAPString.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -usernameAsIMAPString - - ^ '"', self username, '"' \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/methodProperties.json b/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/methodProperties.json deleted file mode 100644 index 1ed1415a..00000000 --- a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/methodProperties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "class" : { - "for:using:" : "js 5/15/2016 16:38", - "initialPassword" : "jwe 6/15/2016 15:47", - "initialUsername" : "jwe 6/15/2016 15:47" }, - "instance" : { - "canConvert:" : "tg 5/9/2019 14:08", - "isValid" : "C.G. 7/25/2018 13:46", - "password" : "MT 4/25/2019 21:26", - "password:" : "tg 5/9/2019 14:20", - "passwordAsIMAPString" : "MT 4/25/2019 22:13", - "username" : "MT 4/25/2019 21:27", - "username:" : "tg 5/9/2019 14:12", - "usernameAsIMAPString" : "MT 4/25/2019 22:13" } } diff --git a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/properties.json b/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/properties.json deleted file mode 100644 index a8c9fae5..00000000 --- a/packages/IMAPClient-Core.package/ICAuthenticationInfo.class/properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "category" : "IMAPClient-Core", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "tg 7/9/2019 14:40", - "instvars" : [ - "username", - "password" ], - "name" : "ICAuthenticationInfo", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/accountInfo..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/accountInfo..st new file mode 100644 index 00000000..a39c49ab --- /dev/null +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/accountInfo..st @@ -0,0 +1,4 @@ +accessing +accountInfo: anICAccountInfo + + accountInfo := anICAccountInfo \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/accountInfo.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/accountInfo.st new file mode 100644 index 00000000..732e13c9 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/accountInfo.st @@ -0,0 +1,4 @@ +accessing +accountInfo + + ^ accountInfo ifNil: [accountInfo := ICAccountInfo new] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/asDictionary.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/asDictionary.st index 9bd83ad9..1ed28e8c 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/asDictionary.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/asDictionary.st @@ -7,11 +7,11 @@ asDictionary dataDictionary := Dictionary new. - dataDictionary at: 'ssl' put: (self ssl). - dataDictionary at: 'name:' put: (self name). - dataDictionary at: 'address' put: (self serverInfo host). - dataDictionary at: 'port' put: (self serverInfo port). - dataDictionary at: 'username' put: (self authenticationInfo username). - dataDictionary at: 'password' put: (self authenticationInfo password). + dataDictionary at: 'ssl' put: (self accountInfo ssl). + dataDictionary at: 'name:' put: (self accountInfo name). + dataDictionary at: 'address' put: (self accountInfo host). + dataDictionary at: 'port' put: (self accountInfo port). + dataDictionary at: 'username' put: (self accountInfo username). + dataDictionary at: 'password' put: (self accountInfo password). ^ dataDictionary \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/authenticationInfo..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/authenticationInfo..st deleted file mode 100644 index 12421f2e..00000000 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/authenticationInfo..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -authenticationInfo: anICAuthenticationInfo - - authenticationInfo := anICAuthenticationInfo \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/authenticationInfo.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/authenticationInfo.st deleted file mode 100644 index a199c280..00000000 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/authenticationInfo.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -authenticationInfo - - ^ authenticationInfo ifNil: [authenticationInfo := ICAuthenticationInfo new] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/checkConnected.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/checkConnected.st index fac8fdbe..3cadb894 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/checkConnected.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/checkConnected.st @@ -1,6 +1,6 @@ error handling checkConnected - + (self fatalErrorOccured) ifTrue: [^ false]. diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connect.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connect.st new file mode 100644 index 00000000..616f7272 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connect.st @@ -0,0 +1,4 @@ +connection +connect + + self connectWith: SocketStream \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectTo.on..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectTo.on..st deleted file mode 100644 index 80f45b3d..00000000 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectTo.on..st +++ /dev/null @@ -1,4 +0,0 @@ -connection -connectTo: host on: port - - self connectTo: (ICServerInfo for: host using: port) with: SocketStream \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectTo.on.with..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectTo.on.with..st deleted file mode 100644 index 439fd4f5..00000000 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectTo.on.with..st +++ /dev/null @@ -1,4 +0,0 @@ -connection -connectTo: aHost on: aPort with: aStreamClass - - self connectTo: (ICServerInfo for: aHost using: aPort) with: aStreamClass \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectTo.with..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectTo.with..st deleted file mode 100644 index 7f0f4e7b..00000000 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectTo.with..st +++ /dev/null @@ -1,12 +0,0 @@ -connection -connectTo: serverInfo with: aStreamClass - - serverInfo isValid ifFalse: [^ Error signal: self class errorInvalidConnectionConfiguration]. - - self serverInfo: serverInfo. - [self stream - ssl: self useSSL; - connectTo: self serverInfo host on: self serverInfo port with: aStreamClass; - nextResponse "skip server greetings"] - on: Error - do: [self fatalErrorOccured: true] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectWith..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectWith..st new file mode 100644 index 00000000..5ead32c3 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectWith..st @@ -0,0 +1,11 @@ +connection +connectWith: aStreamClass + + self accountInfo isValid ifFalse: [^ Error signal: self class errorInvalidConnectionConfiguration]. + + [self stream + ssl: self useSSL; + connectTo: self accountInfo host on: self accountInfo port with: aStreamClass; + nextResponse "skip server greetings"] + on: Error + do: [self fatalErrorOccured: true] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fromAccountInfo..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fromAccountInfo..st new file mode 100644 index 00000000..50ee6edd --- /dev/null +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fromAccountInfo..st @@ -0,0 +1,14 @@ +accessing +fromAccountInfo: anICAccountInfo + + self accountInfo: anICAccountInfo. + + [self + connect; + login] + valueWithin: 2 seconds + onTimeout: [ + (self fatalErrorOccured) + ifFalse: [ + UIManager default inform: 'Connection could not be established'. + self fatalErrorOccured: true]] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fromDictionary..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fromDictionary..st deleted file mode 100644 index 61550d38..00000000 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fromDictionary..st +++ /dev/null @@ -1,14 +0,0 @@ -accessing -fromDictionary: configData - - [self - ssl: (configData at: 'ssl'); - name: (configData at: 'name'); - connectTo: (configData at: 'address') on: ((configData at: 'port') asNumber); - login: (configData at: 'username') using: (configData at: 'password')] - valueWithin: 2 seconds - onTimeout: [ - (self fatalErrorOccured) - ifFalse: [ - UIManager default inform: 'Connection could not be established'. - self fatalErrorOccured: true]] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/login.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/login.st index 7e20cb08..a44edca7 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/login.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/login.st @@ -6,14 +6,14 @@ login UIManager default inform: 'Cant connect to the server'. ^ false]. - (self authenticationInfo isValid) ifFalse: [ + (self accountInfo isValid) ifFalse: [ self fatalErrorOccured: true. ^ false]. self sendCommand: ( { self class loginCommand. - self authenticationInfo usernameAsIMAPString. - self authenticationInfo passwordAsIMAPString } + self accountInfo usernameAsIMAPString. + self accountInfo passwordAsIMAPString } joinSeparatedBy: self class protocolBlank); fetchNextResponse; loggedIn: self commandSucceeded. diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/login.using..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/login.using..st deleted file mode 100644 index e5fccdec..00000000 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/login.using..st +++ /dev/null @@ -1,5 +0,0 @@ -login -login: username using: password - - ^ self loginUsing: (ICAuthenticationInfo for: username using: password) - \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/loginUsing..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/loginUsing..st deleted file mode 100644 index 6281fbe3..00000000 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/loginUsing..st +++ /dev/null @@ -1,6 +0,0 @@ -login -loginUsing: autheticationInfo - - ^ self - authenticationInfo: autheticationInfo; - login \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/name..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/name..st deleted file mode 100644 index 44185269..00000000 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/name..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -name: aString - - name := aString \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/name.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/name.st deleted file mode 100644 index 7f9c3478..00000000 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/name.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -name - - ^ name ifNil: [name := ''] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/rootFolderName.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/rootFolderName.st index 0acc1857..88b8f3b5 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/rootFolderName.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/rootFolderName.st @@ -4,4 +4,4 @@ rootFolderName "this accounts are saved with a hashed name, because we could otherwise get problems with special tokens like @ or spaces in server-host or username" - ^ ICHelper hashNameForAccount: (self serverInfo host) and: (self authenticationInfo username) \ No newline at end of file + ^ ICHelper hashNameForAccount: (self accountInfo host) and: (self accountInfo username) \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/serverInfo..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/serverInfo..st deleted file mode 100644 index 95c0ccfa..00000000 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/serverInfo..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -serverInfo: anICServerInfo - - serverInfo := anICServerInfo \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/serverInfo.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/serverInfo.st deleted file mode 100644 index cac15a6a..00000000 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/serverInfo.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -serverInfo - - ^ serverInfo ifNil: [serverInfo := ICServerInfo new] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/testAccountWith..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/testAccountWith..st index 1bfe1b64..aa5fbd96 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/testAccountWith..st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/testAccountWith..st @@ -1,6 +1,6 @@ login -testAccountWith: dataDictionary +testAccountWith: accountInfo - self fromDictionary: dataDictionary. + self fromAccountInfo: accountInfo. ^ self fatalErrorOccured not \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/useSSL.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/useSSL.st index f36f1779..a7ecdde8 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/useSSL.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/useSSL.st @@ -1,4 +1,4 @@ accessing useSSL - ^ self ssl \ No newline at end of file + ^ self accountInfo ssl \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json b/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json index 6f1e3675..2f880318 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json @@ -42,18 +42,17 @@ "setFlagFlagged:" : "C.G. 7/25/2018 14:12", "setFlagSeen:" : "C.G. 7/25/2018 14:12" }, "instance" : { - "asDictionary" : "C.G. 6/21/2018 09:56", - "authenticationInfo" : "pm 6/9/2019 13:08", - "authenticationInfo:" : "ms 5/17/2016 09:31", - "checkConnected" : "C.G. 7/25/2018 12:29", + "accountInfo" : "tg 7/10/2019 17:23", + "accountInfo:" : "tg 7/10/2019 17:24", + "asDictionary" : "tg 7/10/2019 17:33", + "checkConnected" : "tg 7/10/2019 19:29", "checkForBadRequest" : "C.G. 7/25/2018 12:30", "checkForParameterError" : "DH 7/25/2018 17:29", "checkLoggedIn" : "C.G. 7/25/2018 12:42", "close" : "AR 5/31/2016 11:12", "commandSucceeded" : "AR 6/14/2016 08:46", - "connectTo:on:" : "jwe 7/28/2016 14:02", - "connectTo:on:with:" : "jwe 7/28/2016 14:10", - "connectTo:with:" : "C.G. 7/25/2018 13:50", + "connect" : "tg 7/10/2019 19:02", + "connectWith:" : "tg 7/10/2019 19:01", "createEmailsWith:andName:and:" : "C.G. 6/26/2018 10:51", "currentFolderName" : "C.G. 7/25/2018 13:50", "currentFolderName:" : "C.G. 7/25/2018 13:50", @@ -69,7 +68,7 @@ "folderFromResponse:" : "C.G. 7/25/2018 13:51", "folderNameOfTrash" : "mw 6/23/2018 12:08", "folderPathFrom:" : "DH 7/4/2018 13:14", - "fromDictionary:" : "DH 7/25/2018 17:26", + "fromAccountInfo:" : "tg 7/10/2019 18:18", "hierarchyDelimiter" : "mw 5/11/2018 10:37", "hierarchyDelimiter:" : "mw 5/11/2018 10:37", "isConnected" : "js 6/7/2016 10:13", @@ -81,16 +80,12 @@ "loadEmailsFromMaildir" : "pm 6/3/2019 18:33", "loggedIn" : "pm 6/9/2019 13:07", "loggedIn:" : "js 5/15/2016 13:09", - "login" : "tg 4/30/2019 12:22", - "login:using:" : "js 5/15/2016 16:33", - "loginUsing:" : "C.G. 7/25/2018 12:36", + "login" : "tg 7/10/2019 17:25", "logout" : "js 6/14/2016 16:59", "maildirDiffFetchHeadersFrom:" : "DH 7/25/2018 00:35", "maildirDiffFetchHeadersFrom:to:" : "C.G. 7/25/2018 13:54", "maildirFileName" : "pm 6/3/2019 18:33", "moveEmail:to:" : "DH 7/9/2018 21:29", - "name" : "pm 6/9/2019 13:08", - "name:" : "C.G. 7/4/2018 12:47", "parseFetchBody" : "C.G. 7/25/2018 13:54", "parseFetchFlagsOnly:" : "pm 6/2/2019 15:58", "parseFetchHeader:withId:" : "pm 6/2/2019 15:58", @@ -115,18 +110,16 @@ "retrieveFlagsFrom:to:in:" : "C.G. 7/25/2018 13:58", "rootFolder" : "pm 6/9/2019 13:09", "rootFolder:" : "js 6/10/2016 15:09", - "rootFolderName" : "pm 6/3/2019 18:36", + "rootFolderName" : "tg 7/10/2019 17:27", "select:" : "C.G. 6/28/2018 10:30", "sendCommand:" : "DH 6/26/2018 20:21", - "serverInfo" : "pm 6/9/2019 13:07", - "serverInfo:" : "js 5/15/2016 16:45", "setFlag:and:" : "C.G. 7/25/2018 13:58", "ssl" : "pm 6/9/2019 13:07", "ssl:" : "ms 7/12/2016 10:35", "startsNewHeaderChunk:" : "C.G. 7/25/2018 13:58", "stream" : "pm 6/9/2019 13:08", "stream:" : "js 6/7/2016 10:17", - "testAccountWith:" : "C.G. 7/25/2018 12:23", + "testAccountWith:" : "tg 7/10/2019 17:40", "uids" : "C.G. 7/25/2018 13:59", "uids:" : "pm 6/9/2019 16:52", - "useSSL" : "ms 7/12/2016 10:35" } } + "useSSL" : "tg 7/10/2019 17:36" } } diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/properties.json b/packages/IMAPClient-Core.package/ICEndPoint.class/properties.json index b927a7a3..fd25d703 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/properties.json +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/properties.json @@ -7,9 +7,8 @@ "commentStamp" : "ms 7/28/2016 11:48", "instvars" : [ "stream", - "serverInfo", + "accountInfo", "loggedIn", - "authenticationInfo", "rootFolder", "lastResponse", "ssl", diff --git a/packages/IMAPClient-Core.package/ICFolder.class/instance/update..st b/packages/IMAPClient-Core.package/ICFolder.class/instance/update..st index a48c91bb..e0c0ba49 100644 --- a/packages/IMAPClient-Core.package/ICFolder.class/instance/update..st +++ b/packages/IMAPClient-Core.package/ICFolder.class/instance/update..st @@ -3,7 +3,7 @@ update: aBlock ProgressNotification signal: (aBlock value) - extra: (self endpoint name, ' Mailbox. Folder: ', self name). + extra: (self endpoint accountInfo accountName, ' Mailbox. Folder: ', self name). self startUpdateProcess: self highestUniqueID. self childFolders do: [:anICFolder | anICFolder update: aBlock] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICFolder.class/methodProperties.json b/packages/IMAPClient-Core.package/ICFolder.class/methodProperties.json index 3b588325..9763e25f 100644 --- a/packages/IMAPClient-Core.package/ICFolder.class/methodProperties.json +++ b/packages/IMAPClient-Core.package/ICFolder.class/methodProperties.json @@ -37,4 +37,4 @@ "retrieveFlagsFrom:to:" : "C.G. 7/25/2018 14:04", "startUpdateProcess:" : "pm 6/3/2019 18:34", "update" : "pm 6/3/2019 18:34", - "update:" : "pm 6/3/2019 18:34" } } + "update:" : "tg 7/10/2019 17:37" } } diff --git a/packages/IMAPClient-Core.package/ICHelper.class/class/accountDictionariesToEndpoints..st b/packages/IMAPClient-Core.package/ICHelper.class/class/accountDictionariesToEndpoints..st index dbb2c1c2..da220974 100644 --- a/packages/IMAPClient-Core.package/ICHelper.class/class/accountDictionariesToEndpoints..st +++ b/packages/IMAPClient-Core.package/ICHelper.class/class/accountDictionariesToEndpoints..st @@ -7,6 +7,6 @@ accountDictionariesToEndpoints: aCollection | endpointCollection | endpointCollection := OrderedCollection new. - aCollection do: [:configData | endpointCollection add: (ICEndPoint new fromDictionary: configData)]. + aCollection do: [:configData | endpointCollection add: (ICEndPoint new fromAccountInfo: (ICAccountInfo from: configData))]. ^ endpointCollection \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICHelper.class/methodProperties.json b/packages/IMAPClient-Core.package/ICHelper.class/methodProperties.json index a1619937..092bb51e 100644 --- a/packages/IMAPClient-Core.package/ICHelper.class/methodProperties.json +++ b/packages/IMAPClient-Core.package/ICHelper.class/methodProperties.json @@ -1,6 +1,6 @@ { "class" : { - "accountDictionariesToEndpoints:" : "C.G. 6/21/2018 10:43", + "accountDictionariesToEndpoints:" : "tg 7/10/2019 18:20", "allFolders:" : "pm 6/3/2019 18:35", "hashNameForAccount:and:" : "pm 6/3/2019 18:36", "makeParameterCollection:" : "C.G. 7/25/2018 12:20", diff --git a/packages/IMAPClient-Core.package/ICServerInfo.class/README.md b/packages/IMAPClient-Core.package/ICServerInfo.class/README.md deleted file mode 100644 index c1fdb6a7..00000000 --- a/packages/IMAPClient-Core.package/ICServerInfo.class/README.md +++ /dev/null @@ -1 +0,0 @@ -An ICServerInfo is a wrapper for a host-port-combination. \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICServerInfo.class/class/defaultHost.st b/packages/IMAPClient-Core.package/ICServerInfo.class/class/defaultHost.st deleted file mode 100644 index 7e08bc2e..00000000 --- a/packages/IMAPClient-Core.package/ICServerInfo.class/class/defaultHost.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -defaultHost - - ^ 'unknown' \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICServerInfo.class/class/defaultPort.st b/packages/IMAPClient-Core.package/ICServerInfo.class/class/defaultPort.st deleted file mode 100644 index 602a5a35..00000000 --- a/packages/IMAPClient-Core.package/ICServerInfo.class/class/defaultPort.st +++ /dev/null @@ -1,4 +0,0 @@ -constants -defaultPort - - ^ -1 \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICServerInfo.class/class/for.using..st b/packages/IMAPClient-Core.package/ICServerInfo.class/class/for.using..st deleted file mode 100644 index 6a915ae9..00000000 --- a/packages/IMAPClient-Core.package/ICServerInfo.class/class/for.using..st +++ /dev/null @@ -1,6 +0,0 @@ -instance creation -for: host using: port - - ^ self new - host: host; - port: port \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICServerInfo.class/instance/host..st b/packages/IMAPClient-Core.package/ICServerInfo.class/instance/host..st deleted file mode 100644 index 8e89907c..00000000 --- a/packages/IMAPClient-Core.package/ICServerInfo.class/instance/host..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -host: aString - - host := aString \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICServerInfo.class/instance/host.st b/packages/IMAPClient-Core.package/ICServerInfo.class/instance/host.st deleted file mode 100644 index 1ca59fa4..00000000 --- a/packages/IMAPClient-Core.package/ICServerInfo.class/instance/host.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -host - - ^ host ifNil: [host := self class defaultHost] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICServerInfo.class/instance/isValid.st b/packages/IMAPClient-Core.package/ICServerInfo.class/instance/isValid.st deleted file mode 100644 index abafe4ec..00000000 --- a/packages/IMAPClient-Core.package/ICServerInfo.class/instance/isValid.st +++ /dev/null @@ -1,4 +0,0 @@ -validation -isValid - - ^ self host ~= self class defaultHost and: [self port ~= self class defaultPort] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICServerInfo.class/instance/port..st b/packages/IMAPClient-Core.package/ICServerInfo.class/instance/port..st deleted file mode 100644 index 776415e4..00000000 --- a/packages/IMAPClient-Core.package/ICServerInfo.class/instance/port..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -port: aNumber - - port := aNumber \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICServerInfo.class/instance/port.st b/packages/IMAPClient-Core.package/ICServerInfo.class/instance/port.st deleted file mode 100644 index 475cdeef..00000000 --- a/packages/IMAPClient-Core.package/ICServerInfo.class/instance/port.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -port - - ^ port ifNil: [port := self class defaultPort] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICServerInfo.class/methodProperties.json b/packages/IMAPClient-Core.package/ICServerInfo.class/methodProperties.json deleted file mode 100644 index 4db0c064..00000000 --- a/packages/IMAPClient-Core.package/ICServerInfo.class/methodProperties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "class" : { - "defaultHost" : "js 5/15/2016 16:06", - "defaultPort" : "js 5/15/2016 16:07", - "for:using:" : "js 5/15/2016 16:38" }, - "instance" : { - "host" : "pm 6/9/2019 13:13", - "host:" : "js 5/15/2016 16:02", - "isValid" : "C.G. 7/25/2018 14:08", - "port" : "pm 6/9/2019 13:27", - "port:" : "js 5/15/2016 16:02" } } diff --git a/packages/IMAPClient-Core.package/ICServerInfo.class/properties.json b/packages/IMAPClient-Core.package/ICServerInfo.class/properties.json deleted file mode 100644 index ab2e9dc6..00000000 --- a/packages/IMAPClient-Core.package/ICServerInfo.class/properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "category" : "IMAPClient-Core", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "ms 7/28/2016 11:53", - "instvars" : [ - "host", - "port" ], - "name" : "ICServerInfo", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } diff --git a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/README.md b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/README.md similarity index 100% rename from packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/README.md rename to packages/IMAPClient-Tests.package/ICAccountInfoTest.class/README.md diff --git a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/class/invalidPassword.st b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/invalidPassword.st similarity index 100% rename from packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/class/invalidPassword.st rename to packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/invalidPassword.st diff --git a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/class/invalidUsername.st b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/invalidUsername.st similarity index 100% rename from packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/class/invalidUsername.st rename to packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/invalidUsername.st diff --git a/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validAccountName.st b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validAccountName.st new file mode 100644 index 00000000..b30d39ad --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validAccountName.st @@ -0,0 +1,4 @@ +constants +validAccountName + + ^ 'validAccountName' \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validHost.st b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validHost.st new file mode 100644 index 00000000..fc8e0577 --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validHost.st @@ -0,0 +1,4 @@ +constants +validHost + + ^ 'valid.host' \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/class/password.st b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validPassword.st similarity index 62% rename from packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/class/password.st rename to packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validPassword.st index 298d3c2d..0a5074b5 100644 --- a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/class/password.st +++ b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validPassword.st @@ -1,4 +1,4 @@ constants -password +validPassword ^ 'foo bar' \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validPort.st b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validPort.st new file mode 100644 index 00000000..27c2b5fc --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validPort.st @@ -0,0 +1,4 @@ +constants +validPort + + ^ 993 \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/class/username.st b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validUsername.st similarity index 60% rename from packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/class/username.st rename to packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validUsername.st index 8386ae5f..fbd7a0c5 100644 --- a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/class/username.st +++ b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/class/validUsername.st @@ -1,4 +1,4 @@ constants -username +validUsername ^ 'user1' \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/accountInfo..st b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/accountInfo..st new file mode 100644 index 00000000..4cae37c2 --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/accountInfo..st @@ -0,0 +1,3 @@ +accessing +accountInfo: anICAccountInfo + accountInfo := anICAccountInfo \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/accountInfo.st b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/accountInfo.st new file mode 100644 index 00000000..8d15c789 --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/accountInfo.st @@ -0,0 +1,3 @@ +accessing +accountInfo + ^ accountInfo \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/setUp.st b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/setUp.st new file mode 100644 index 00000000..944a922e --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/setUp.st @@ -0,0 +1,6 @@ +running +setUp + + self accountInfo: (ICAccountInfo newWithAccountName: self class validAccountName host: self class validHost port: self class validPort username: self class validUsername password: self class validPassword ssl: true) + + \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/testForArgumentCount.st b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/testForArgumentCount.st new file mode 100644 index 00000000..23aaaa8e --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/testForArgumentCount.st @@ -0,0 +1,5 @@ +testing +testForArgumentCount + + self assert: ['\".*\"' asRegex matches: self accountInfo usernameAsIMAPString]. + self assert: ['\".*\"' asRegex matches: self accountInfo passwordAsIMAPString]. \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/testForValidIMAPString.st b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/testForValidIMAPString.st similarity index 100% rename from packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/testForValidIMAPString.st rename to packages/IMAPClient-Tests.package/ICAccountInfoTest.class/instance/testForValidIMAPString.st diff --git a/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/methodProperties.json b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/methodProperties.json new file mode 100644 index 00000000..2dfef97a --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/methodProperties.json @@ -0,0 +1,15 @@ +{ + "class" : { + "invalidPassword" : "tg 5/9/2019 13:03", + "invalidUsername" : "tg 5/9/2019 13:04", + "validAccountName" : "tg 7/10/2019 19:37", + "validHost" : "tg 7/10/2019 19:37", + "validPassword" : "tg 7/10/2019 19:36", + "validPort" : "tg 7/10/2019 19:38", + "validUsername" : "tg 7/10/2019 19:36" }, + "instance" : { + "accountInfo" : "tg 7/10/2019 18:44", + "accountInfo:" : "tg 7/10/2019 18:44", + "setUp" : "tg 7/10/2019 19:44", + "testForArgumentCount" : "tg 7/10/2019 18:45", + "testForValidIMAPString" : "tg 5/9/2019 14:16" } } diff --git a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/properties.json b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/properties.json similarity index 79% rename from packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/properties.json rename to packages/IMAPClient-Tests.package/ICAccountInfoTest.class/properties.json index 075445d8..3aab6ebe 100644 --- a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/properties.json +++ b/packages/IMAPClient-Tests.package/ICAccountInfoTest.class/properties.json @@ -6,8 +6,8 @@ ], "commentStamp" : "tg 7/8/2019 15:40", "instvars" : [ - "authInfo" ], - "name" : "ICAuthenticationInfoTest", + "accountInfo" ], + "name" : "ICAccountInfoTest", "pools" : [ ], "super" : "TestCase", diff --git a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/authInfo..st b/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/authInfo..st deleted file mode 100644 index 6f555975..00000000 --- a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/authInfo..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -authInfo: anICAuthenticationInfo - authInfo := anICAuthenticationInfo \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/authInfo.st b/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/authInfo.st deleted file mode 100644 index 6bed7370..00000000 --- a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/authInfo.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -authInfo - ^ authInfo \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/setUp.st b/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/setUp.st deleted file mode 100644 index 03c89eaf..00000000 --- a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/setUp.st +++ /dev/null @@ -1,6 +0,0 @@ -running -setUp - - self authInfo: (ICAuthenticationInfo for: self class username using: self class password). - - \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/testForArgumentCount.st b/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/testForArgumentCount.st deleted file mode 100644 index d2555ded..00000000 --- a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/instance/testForArgumentCount.st +++ /dev/null @@ -1,5 +0,0 @@ -testing -testForArgumentCount - - self assert: ['\".*\"' asRegex matches: self authInfo usernameAsIMAPString]. - self assert: ['\".*\"' asRegex matches: self authInfo passwordAsIMAPString]. \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/methodProperties.json b/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/methodProperties.json deleted file mode 100644 index 6619dbd5..00000000 --- a/packages/IMAPClient-Tests.package/ICAuthenticationInfoTest.class/methodProperties.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "class" : { - "invalidPassword" : "tg 5/9/2019 13:03", - "invalidUsername" : "tg 5/9/2019 13:04", - "password" : "MT 4/25/2019 21:33", - "username" : "MT 4/25/2019 21:34" }, - "instance" : { - "authInfo" : "MT 4/25/2019 21:28", - "authInfo:" : "pm 6/9/2019 17:16", - "setUp" : "MT 4/25/2019 21:58", - "testForArgumentCount" : "MT 4/25/2019 22:08", - "testForValidIMAPString" : "tg 5/9/2019 14:16" } } diff --git a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/invalidPasswordAccountInfo.st b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/invalidPasswordAccountInfo.st new file mode 100644 index 00000000..770ed641 --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/invalidPasswordAccountInfo.st @@ -0,0 +1,4 @@ +constants +invalidPasswordAccountInfo + + ^ ICAccountInfo newWithAccountName: self validAccountName host: self validHost port: self validPort username: self validUsername password: self invalidPassword ssl: true. \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/invalidUsernameAccountInfo.st b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/invalidUsernameAccountInfo.st new file mode 100644 index 00000000..9f19a903 --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/invalidUsernameAccountInfo.st @@ -0,0 +1,4 @@ +constants +invalidUsernameAccountInfo + + ^ ICAccountInfo newWithAccountName: self validAccountName host: self validHost port: self validPort username: self invalidUsername password: self validPassword ssl: true. \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/validAccountInfo.st b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/validAccountInfo.st new file mode 100644 index 00000000..4ebe18cd --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/validAccountInfo.st @@ -0,0 +1,4 @@ +constants +validAccountInfo + + ^ ICAccountInfo newWithAccountName: self validAccountName host: self validHost port: self validPort username: self validUsername password: self validPassword ssl: true. \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/validAccountName.st b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/validAccountName.st new file mode 100644 index 00000000..b30d39ad --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/validAccountName.st @@ -0,0 +1,4 @@ +constants +validAccountName + + ^ 'validAccountName' \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/validHost.st b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/validHost.st new file mode 100644 index 00000000..fc8e0577 --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/validHost.st @@ -0,0 +1,4 @@ +constants +validHost + + ^ 'valid.host' \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/validPort.st b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/validPort.st new file mode 100644 index 00000000..27c2b5fc --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/class/validPort.st @@ -0,0 +1,4 @@ +constants +validPort + + ^ 993 \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/setUp.st b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/setUp.st index 0b2ef19b..592d554d 100644 --- a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/setUp.st +++ b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/setUp.st @@ -4,8 +4,8 @@ setUp self endPoint: ICEndPoint new. self endPoint stream: ICMockSocketStream new. self endPoint stream connected: true. - self - endPoint stream server + + self endPoint stream server validUsername: self class validUsername; validPassword: self class validPassword; responses: self endPoint stream server notAuthenticatedResponses \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLogin.st b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLogin.st index 78ca270d..b9636c60 100644 --- a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLogin.st +++ b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLogin.st @@ -1,4 +1,5 @@ login testLogin - - self assert: (self endPoint login: self class validUsername using: self class validPassword) \ No newline at end of file + + self endPoint accountInfo: self class validAccountInfo. + self assert: (self endPoint login) \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLoginWithInvalidPassword.st b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLoginWithInvalidPassword.st new file mode 100644 index 00000000..af09d69b --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLoginWithInvalidPassword.st @@ -0,0 +1,5 @@ +login +testLoginWithInvalidPassword + + [self endPoint accountInfo: self class invalidPasswordAccountInfo. + self deny: self endPoint login] valueSuppressingAllMessages \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLoginWithInvalidUsername.st b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLoginWithInvalidUsername.st new file mode 100644 index 00000000..6b557dde --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLoginWithInvalidUsername.st @@ -0,0 +1,5 @@ +login +testLoginWithInvalidUsername + + [self endPoint accountInfo: self class invalidUsernameAccountInfo. + self deny: self endPoint login] valueSuppressingAllMessages \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLoginWithWrongPassword.st b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLoginWithWrongPassword.st deleted file mode 100644 index 4a880f92..00000000 --- a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLoginWithWrongPassword.st +++ /dev/null @@ -1,7 +0,0 @@ -login -testLoginWithWrongPassword - - [self endPoint authenticationInfo - username: self class validUsername; - password: self class invalidPassword. - self deny: self endPoint login] valueSuppressingAllMessages \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLoginWithWrongUsername.st b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLoginWithWrongUsername.st deleted file mode 100644 index 140af1ea..00000000 --- a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/instance/testLoginWithWrongUsername.st +++ /dev/null @@ -1,7 +0,0 @@ -login -testLoginWithWrongUsername - - [self endPoint authenticationInfo - username: self class invalidUsername; - password: self class validPassword. - self deny: self endPoint login] valueSuppressingAllMessages \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/methodProperties.json b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/methodProperties.json index 6e670170..ebccbd5c 100644 --- a/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/methodProperties.json +++ b/packages/IMAPClient-Tests.package/ICEndPointAuthentificationTest.class/methodProperties.json @@ -1,14 +1,20 @@ { "class" : { "invalidPassword" : "jwe 6/15/2016 16:03", + "invalidPasswordAccountInfo" : "tg 7/10/2019 19:42", "invalidUsername" : "jwe 6/15/2016 16:03", + "invalidUsernameAccountInfo" : "tg 7/10/2019 19:42", + "validAccountInfo" : "tg 7/10/2019 19:42", + "validAccountName" : "tg 7/10/2019 19:43", + "validHost" : "tg 7/10/2019 19:43", "validPassword" : "tg 4/30/2019 12:22", + "validPort" : "tg 7/10/2019 19:43", "validUsername" : "tg 4/30/2019 12:22" }, "instance" : { "endPoint" : "AR 5/31/2016 21:33", "endPoint:" : "pm 6/9/2019 17:16", - "setUp" : "C.G. 7/25/2018 17:53", + "setUp" : "tg 7/10/2019 19:16", "tearDown" : "js 6/7/2016 09:40", - "testLogin" : "jwe 7/12/2016 10:18", - "testLoginWithWrongPassword" : "C.G. 7/25/2018 12:54", - "testLoginWithWrongUsername" : "C.G. 7/25/2018 12:55" } } + "testLogin" : "tg 7/10/2019 18:58", + "testLoginWithInvalidPassword" : "tg 7/10/2019 18:59", + "testLoginWithInvalidUsername" : "tg 7/10/2019 18:54" } } diff --git a/packages/IMAPClient-Tests.package/ICEndPointCommandTest.class/instance/testFetchMailsBeginningAtWithFoundMails.st b/packages/IMAPClient-Tests.package/ICEndPointCommandTest.class/instance/testFetchMailsBeginningAtWithFoundMails.st index 6f3d2e93..dd3b5b32 100644 --- a/packages/IMAPClient-Tests.package/ICEndPointCommandTest.class/instance/testFetchMailsBeginningAtWithFoundMails.st +++ b/packages/IMAPClient-Tests.package/ICEndPointCommandTest.class/instance/testFetchMailsBeginningAtWithFoundMails.st @@ -7,7 +7,7 @@ testFetchMailsBeginningAtWithFoundMails | path emailObjects mailAPath mailBPath folderName | emailObjects := self endPoint fetchMailsBeginningAt: 42 number: 2. - folderName := ICHelper hashNameForAccount: (self endPoint serverInfo host) and: (self endPoint authenticationInfo username). + folderName := ICHelper hashNameForAccount: (self endPoint accountInfo host) and: (self endPoint accountInfo username). path := 'Maildir', FileDirectory slash, folderName, FileDirectory slash, 'inbox'. mailAPath := FileDirectory default fullPathFor: path , FileDirectory slash, '3' . mailBPath := FileDirectory default fullPathFor: path , FileDirectory slash, '4' . diff --git a/packages/IMAPClient-Tests.package/ICEndPointCommandTest.class/instance/testRetrieveFlagsOnly.st b/packages/IMAPClient-Tests.package/ICEndPointCommandTest.class/instance/testRetrieveFlagsOnly.st index 6d861d13..0f8dcddb 100644 --- a/packages/IMAPClient-Tests.package/ICEndPointCommandTest.class/instance/testRetrieveFlagsOnly.st +++ b/packages/IMAPClient-Tests.package/ICEndPointCommandTest.class/instance/testRetrieveFlagsOnly.st @@ -14,7 +14,7 @@ testRetrieveFlagsOnly folder := emailObjects first folder. folder emails addAll: emailObjects. - folderName := ICHelper hashNameForAccount: (self endPoint serverInfo host) and: (self endPoint authenticationInfo username). + folderName := ICHelper hashNameForAccount: (self endPoint accountInfo host) and: (self endPoint accountInfo username). path := 'Maildir', FileDirectory slash, folderName, FileDirectory slash, 'inbox'. mailAPath := FileDirectory default fullPathFor: path , FileDirectory slash, '3' . mailBPath := FileDirectory default fullPathFor: path , FileDirectory slash, '4' . diff --git a/packages/IMAPClient-Tests.package/ICEndPointCommandTest.class/methodProperties.json b/packages/IMAPClient-Tests.package/ICEndPointCommandTest.class/methodProperties.json index 2f26e7f5..7e29c253 100644 --- a/packages/IMAPClient-Tests.package/ICEndPointCommandTest.class/methodProperties.json +++ b/packages/IMAPClient-Tests.package/ICEndPointCommandTest.class/methodProperties.json @@ -28,12 +28,12 @@ "rootFolder" : "C.G. 7/25/2018 17:54", "rootFolder:" : "pm 6/9/2019 17:17", "setUp" : "C.G. 7/25/2018 17:54", - "testFetchMailsBeginningAtWithFoundMails" : "pm 6/3/2019 18:36", + "testFetchMailsBeginningAtWithFoundMails" : "tg 7/10/2019 17:27", "testFetchMailsBeginningAtWithoutFoundMails" : "C.G. 7/25/2018 17:55", "testFillMessageBody" : "pm 6/2/2019 15:58", "testFillMessageBodyWithMultilineBody" : "pm 6/2/2019 15:58", "testListAllFolders" : "DH 4/27/2018 02:35", "testLogout" : "jwe 6/21/2016 10:15", "testPing" : "jwe 6/21/2016 10:15", - "testRetrieveFlagsOnly" : "pm 6/3/2019 18:36", + "testRetrieveFlagsOnly" : "tg 7/10/2019 17:27", "testSelectInbox" : "C.G. 7/25/2018 18:00" } } diff --git a/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/invalidHost.st b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/invalidHost.st index afbf8181..01b1beed 100644 --- a/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/invalidHost.st +++ b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/invalidHost.st @@ -1,4 +1,4 @@ constants invalidHost - ^ 'example.de' \ No newline at end of file + ^ 'example' \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/invalidHostAccountInfo.st b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/invalidHostAccountInfo.st new file mode 100644 index 00000000..6ad41971 --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/invalidHostAccountInfo.st @@ -0,0 +1,4 @@ +constants +invalidHostAccountInfo + + ^ ICAccountInfo newWithAccountName: self validAccountName host: self invalidHost port: self validPort username: self validUsername password: self validPassword ssl: true. \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/invalidPortAccountInfo.st b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/invalidPortAccountInfo.st new file mode 100644 index 00000000..d4086080 --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/invalidPortAccountInfo.st @@ -0,0 +1,4 @@ +constants +invalidPortAccountInfo + + ^ ICAccountInfo newWithAccountName: self validAccountName host: self validHost port: self invalidPort username: self validUsername password: self validPassword ssl: true. \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/validAccountInfo.st b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/validAccountInfo.st new file mode 100644 index 00000000..4ebe18cd --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/validAccountInfo.st @@ -0,0 +1,4 @@ +constants +validAccountInfo + + ^ ICAccountInfo newWithAccountName: self validAccountName host: self validHost port: self validPort username: self validUsername password: self validPassword ssl: true. \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/validAccountName.st b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/validAccountName.st new file mode 100644 index 00000000..b30d39ad --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/validAccountName.st @@ -0,0 +1,4 @@ +constants +validAccountName + + ^ 'validAccountName' \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/validPassword.st b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/validPassword.st new file mode 100644 index 00000000..35a09155 --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/validPassword.st @@ -0,0 +1,4 @@ +constants +validPassword + + ^ 'validPassword' \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/validUsername.st b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/validUsername.st new file mode 100644 index 00000000..a9add4d3 --- /dev/null +++ b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/class/validUsername.st @@ -0,0 +1,4 @@ +constants +validUsername + + ^ 'validUserName' \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/instance/testConnectToOn.st b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/instance/testConnectToOn.st index 2f49b9f3..6fb7ef0f 100644 --- a/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/instance/testConnectToOn.st +++ b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/instance/testConnectToOn.st @@ -1,6 +1,6 @@ connectOn testConnectToOn - self - shouldnt: [endPoint connectTo: self class validHost on: self class validPort with: ICMockSocketStream] + self endPoint accountInfo: self class validAccountInfo. + self shouldnt: [endPoint connectWith: ICMockSocketStream] raise: Exception \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/instance/testConnectToOnWithWrongHost.st b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/instance/testConnectToOnWithWrongHost.st index 4d03310a..f5cd0ab5 100644 --- a/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/instance/testConnectToOnWithWrongHost.st +++ b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/instance/testConnectToOnWithWrongHost.st @@ -1,5 +1,6 @@ connectOn testConnectToOnWithWrongHost - self endPoint connectTo: self class invalidHost on: self class invalidPort with: ICMockSocketStream. + self endPoint accountInfo: self class invalidHostAccountInfo. + self endPoint connectWith: ICMockSocketStream. self assert: self endPoint fatalErrorOccured equals: true \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/instance/testConnectToOnWithWrongPort.st b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/instance/testConnectToOnWithWrongPort.st index 583c251c..c971b49e 100644 --- a/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/instance/testConnectToOnWithWrongPort.st +++ b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/instance/testConnectToOnWithWrongPort.st @@ -1,5 +1,6 @@ connectOn testConnectToOnWithWrongPort - self endPoint connectTo: self class validHost on: self class invalidPort with: ICMockSocketStream. + self endPoint accountInfo: self class invalidPortAccountInfo. + self endPoint connectWith: ICMockSocketStream. self assert: self endPoint fatalErrorOccured equals: true \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/methodProperties.json b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/methodProperties.json index 392813f2..c8749d5c 100644 --- a/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/methodProperties.json +++ b/packages/IMAPClient-Tests.package/ICEndPointConnectionTest.class/methodProperties.json @@ -1,17 +1,23 @@ { "class" : { "defaultMockServerConfig" : "C.G. 7/25/2018 18:22", - "invalidHost" : "AR 5/31/2016 22:00", + "invalidHost" : "tg 7/10/2019 19:36", + "invalidHostAccountInfo" : "tg 7/10/2019 19:27", "invalidPort" : "AR 5/31/2016 22:00", + "invalidPortAccountInfo" : "tg 7/10/2019 19:28", + "validAccountInfo" : "tg 7/10/2019 19:28", + "validAccountName" : "tg 7/10/2019 19:26", "validHost" : "jwe 7/28/2016 14:29", "validHostIP" : "AR 7/12/2016 10:24", - "validPort" : "AR 5/31/2016 21:37" }, + "validPassword" : "tg 7/10/2019 19:27", + "validPort" : "AR 5/31/2016 21:37", + "validUsername" : "tg 7/10/2019 19:26" }, "instance" : { "endPoint" : "AR 5/31/2016 21:33", "endPoint:" : "pm 6/9/2019 17:17", "setUp" : "AR 7/14/2016 09:17", "tearDown" : "js 6/7/2016 09:42", - "testConnectToOn" : "C.G. 7/25/2018 18:01", - "testConnectToOnWithWrongHost" : "C.G. 7/25/2018 18:01", - "testConnectToOnWithWrongPort" : "C.G. 7/25/2018 12:53", + "testConnectToOn" : "tg 7/10/2019 19:05", + "testConnectToOnWithWrongHost" : "tg 7/10/2019 20:00", + "testConnectToOnWithWrongPort" : "tg 7/10/2019 20:00", "testPingIfNotConnected" : "C.G. 7/25/2018 18:02" } } diff --git a/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/labelForAccount..st b/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/labelForAccount..st index ccb84e28..62b54535 100644 --- a/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/labelForAccount..st +++ b/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/labelForAccount..st @@ -5,5 +5,5 @@ labelForAccount: anICEndpoint countOfUnseenMails := anICEndpoint rootFolder numOfUnseenMails. countOfUnseenMails > 0 - ifTrue: [^ anICEndpoint name, Character tab, '[' , countOfUnseenMails asString, ']'] - ifFalse: [^ anICEndpoint name, Character tab, ''] \ No newline at end of file + ifTrue: [^ anICEndpoint accountInfo accountName, Character tab, '[' , countOfUnseenMails asString, ']'] + ifFalse: [^ anICEndpoint accountInfo accountName, Character tab, ''] \ No newline at end of file diff --git a/packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json b/packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json index 080615ce..d693db33 100644 --- a/packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json +++ b/packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json @@ -15,7 +15,7 @@ "buildFolderTree:" : "ok 6/20/2019 12:19", "buildLoadOlderEmailsButton:" : "pm 6/26/2019 14:43", "buildNavigationPanel:" : "ok 6/20/2019 12:24", - "buildUserList:" : "ok 6/20/2019 12:19", + "buildUserList:" : "tg 7/10/2019 18:38", "buildWith:" : "pm 6/26/2019 14:43", "changeAccounts:" : "pm 6/3/2019 18:47", "changeFilter:" : "lvm 7/3/2018 15:50", @@ -47,7 +47,7 @@ "initialize" : "tg 7/8/2019 14:56", "initializedAccounts" : "C.G. 7/25/2018 14:18", "initializedAccounts:" : "pm 6/9/2019 17:02", - "labelForAccount:" : "C.G. 7/25/2018 14:19", + "labelForAccount:" : "tg 7/10/2019 18:39", "labelForDeletionAction:" : "C.G. 7/25/2018 14:19", "labelForFolder:" : "C.G. 7/25/2018 14:19", "labelForMail:" : "pm 6/26/2019 14:34", diff --git a/packages/IMAPClient-UI.package/ICPasswordDialog.class/instance/login.st b/packages/IMAPClient-UI.package/ICPasswordDialog.class/instance/login.st index a5cad273..692de0f2 100644 --- a/packages/IMAPClient-UI.package/ICPasswordDialog.class/instance/login.st +++ b/packages/IMAPClient-UI.package/ICPasswordDialog.class/instance/login.st @@ -6,9 +6,9 @@ login UserDialogBoxMorph inform: 'Please put in a password' title: ''. ^ self]. - self data at: 'password' put: (self password). - - ((ICEndPoint new) testAccountWith: data) + self data at: 'password' put: (self password asString). + + ((ICEndPoint new) testAccountWith: (ICAccountInfo from: data)) ifTrue: [ self folderDialogInstance addPasswordToCollection: (self data). self window abandon] \ No newline at end of file diff --git a/packages/IMAPClient-UI.package/ICPasswordDialog.class/methodProperties.json b/packages/IMAPClient-UI.package/ICPasswordDialog.class/methodProperties.json index 9a092ebf..0d52517a 100644 --- a/packages/IMAPClient-UI.package/ICPasswordDialog.class/methodProperties.json +++ b/packages/IMAPClient-UI.package/ICPasswordDialog.class/methodProperties.json @@ -9,7 +9,7 @@ "data:" : "pm 6/9/2019 17:14", "folderDialogInstance" : "C.G. 7/25/2018 14:25", "folderDialogInstance:" : "pm 6/9/2019 17:14", - "login" : "C.G. 7/25/2018 12:24", + "login" : "tg 7/10/2019 18:03", "loginWithPassword:" : "fr 6/13/2019 14:39", "password" : "C.G. 7/25/2018 14:25", "password:" : "fr 6/13/2019 14:44", From b1a016bf9e970f4e54b4a993a3ac023cbc8c2f96 Mon Sep 17 00:00:00 2001 From: Tim Garrels Date: Wed, 10 Jul 2019 20:22:28 +0200 Subject: [PATCH 03/12] Fixed renaming issue --- .../ICAccountInfo.class/instance/accountName.st | 2 +- .../ICAccountInfo.class/instance/ssl.st | 2 +- .../ICAccountInfo.class/methodProperties.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/accountName.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/accountName.st index e1981f2e..8ce4335f 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/accountName.st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/accountName.st @@ -1,4 +1,4 @@ accessing accountName - ^ accountName ifNil: [accountName := self class defaultName] \ No newline at end of file + ^ accountName ifNil: [accountName := self class initialAccountName] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/ssl.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/ssl.st index ccdc809d..cf557743 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/ssl.st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/ssl.st @@ -1,4 +1,4 @@ accessing ssl - ^ ssl ifNil: [ssl := self class defaultSsl] \ No newline at end of file + ^ ssl ifNil: [ssl := self class initialSsl] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json b/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json index 105ea156..bd82b140 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json @@ -10,7 +10,7 @@ "newWithAccountName:host:port:username:password:ssl:" : "tg 7/10/2019 17:49", "newWithUsername:password:" : "tg 7/10/2019 20:08" }, "instance" : { - "accountName" : "tg 7/10/2019 17:35", + "accountName" : "tg 7/10/2019 20:20", "accountName:" : "tg 7/10/2019 17:35", "canConvert:" : "tg 7/10/2019 17:18", "host" : "tg 7/10/2019 20:06", @@ -22,7 +22,7 @@ "port" : "tg 7/10/2019 20:09", "port:" : "tg 7/10/2019 17:11", "printOn:" : "tg 7/10/2019 18:06", - "ssl" : "tg 7/10/2019 17:33", + "ssl" : "tg 7/10/2019 20:21", "ssl:" : "tg 7/10/2019 17:34", "username" : "tg 7/10/2019 20:11", "username:" : "tg 7/10/2019 17:18", From 969a89348de6ae90fed1754850d73d3c07aa80b7 Mon Sep 17 00:00:00 2001 From: Tim Garrels Date: Thu, 11 Jul 2019 09:32:02 +0200 Subject: [PATCH 04/12] Removed unused method --- .../IMAPClient-Core.package/ICEndPoint.class/instance/ssl..st | 4 ---- .../IMAPClient-Core.package/ICEndPoint.class/instance/ssl.st | 4 ---- .../ICEndPoint.class/methodProperties.json | 2 -- 3 files changed, 10 deletions(-) delete mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/ssl..st delete mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/ssl.st diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/ssl..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/ssl..st deleted file mode 100644 index 1e08ecbc..00000000 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/ssl..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -ssl: aBool - - ssl := aBool \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/ssl.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/ssl.st deleted file mode 100644 index 9d7a41d0..00000000 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/ssl.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -ssl - - ^ ssl ifNil: [ssl := false] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json b/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json index 2f880318..b05857f7 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json @@ -114,8 +114,6 @@ "select:" : "C.G. 6/28/2018 10:30", "sendCommand:" : "DH 6/26/2018 20:21", "setFlag:and:" : "C.G. 7/25/2018 13:58", - "ssl" : "pm 6/9/2019 13:07", - "ssl:" : "ms 7/12/2016 10:35", "startsNewHeaderChunk:" : "C.G. 7/25/2018 13:58", "stream" : "pm 6/9/2019 13:08", "stream:" : "js 6/7/2016 10:17", From 469c65b044ae4d5b304e3fb97fa0b3ba04f7377c Mon Sep 17 00:00:00 2001 From: Tim Garrels Date: Thu, 11 Jul 2019 10:00:50 +0200 Subject: [PATCH 05/12] Removed unused method --- .../ICAccountInfo.class/class/newWithUsername.password..st | 4 ---- .../ICAccountInfo.class/methodProperties.json | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithUsername.password..st diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithUsername.password..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithUsername.password..st deleted file mode 100644 index 77845675..00000000 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithUsername.password..st +++ /dev/null @@ -1,4 +0,0 @@ -instance creation -newWithUsername: username password: password - - ^ self newWithAccountName: self initialAccountName host: self invalidHost port: self invalidPort username: username password: password ssl: self initialSsl \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json b/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json index bd82b140..a8acf421 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json @@ -7,8 +7,7 @@ "invalidPassword" : "tg 7/10/2019 20:10", "invalidPort" : "tg 7/10/2019 20:09", "invalidUsername" : "tg 7/10/2019 20:10", - "newWithAccountName:host:port:username:password:ssl:" : "tg 7/10/2019 17:49", - "newWithUsername:password:" : "tg 7/10/2019 20:08" }, + "newWithAccountName:host:port:username:password:ssl:" : "tg 7/10/2019 17:49" }, "instance" : { "accountName" : "tg 7/10/2019 20:20", "accountName:" : "tg 7/10/2019 17:35", From 6c2526cfeb7fd02bc460a05ba0d65e254431c2a7 Mon Sep 17 00:00:00 2001 From: Tim Garrels Date: Thu, 11 Jul 2019 10:08:58 +0200 Subject: [PATCH 06/12] Renamed ICAccountInfo contructor (legacy artifact) --- .../ICAccountInfo.class/class/from..st | 4 ---- .../ICAccountInfo.class/class/newWith..st | 9 +++++++++ .../ICAccountInfo.class/methodProperties.json | 2 +- .../class/accountDictionariesToEndpoints..st | 2 +- .../ICHelper.class/methodProperties.json | 2 +- .../ICFolderDialog.class/methodProperties.json | 2 +- .../ICPasswordDialog.class/instance/login.st | 2 +- .../ICPasswordDialog.class/methodProperties.json | 2 +- 8 files changed, 15 insertions(+), 10 deletions(-) delete mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/class/from..st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWith..st diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/from..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/from..st deleted file mode 100644 index dfc5882a..00000000 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/from..st +++ /dev/null @@ -1,4 +0,0 @@ -instance creation -from: data - - ^ self newWithAccountName: (data at: 'name') host: (data at: 'address') port: ((data at: 'port') asNumber) username: (data at: 'username') password: (data at: 'password') ssl: (data at: 'ssl') \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWith..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWith..st new file mode 100644 index 00000000..a505f319 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWith..st @@ -0,0 +1,9 @@ +instance creation +newWith: aDataDictionary + + ^ self newWithAccountName: (aDataDictionary at: 'name') + host: (aDataDictionary at: 'address') + port: ((aDataDictionary at: 'port') asNumber) + username: (aDataDictionary at: 'username') + password: (aDataDictionary at: 'password') + ssl: (aDataDictionary at: 'ssl') \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json b/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json index a8acf421..7fb9072c 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json @@ -1,12 +1,12 @@ { "class" : { - "from:" : "tg 7/10/2019 18:17", "initialAccountName" : "tg 7/10/2019 17:43", "initialSsl" : "tg 7/10/2019 17:43", "invalidHost" : "tg 7/10/2019 20:08", "invalidPassword" : "tg 7/10/2019 20:10", "invalidPort" : "tg 7/10/2019 20:09", "invalidUsername" : "tg 7/10/2019 20:10", + "newWith:" : "tg 7/11/2019 10:07", "newWithAccountName:host:port:username:password:ssl:" : "tg 7/10/2019 17:49" }, "instance" : { "accountName" : "tg 7/10/2019 20:20", diff --git a/packages/IMAPClient-Core.package/ICHelper.class/class/accountDictionariesToEndpoints..st b/packages/IMAPClient-Core.package/ICHelper.class/class/accountDictionariesToEndpoints..st index da220974..dd373265 100644 --- a/packages/IMAPClient-Core.package/ICHelper.class/class/accountDictionariesToEndpoints..st +++ b/packages/IMAPClient-Core.package/ICHelper.class/class/accountDictionariesToEndpoints..st @@ -7,6 +7,6 @@ accountDictionariesToEndpoints: aCollection | endpointCollection | endpointCollection := OrderedCollection new. - aCollection do: [:configData | endpointCollection add: (ICEndPoint new fromAccountInfo: (ICAccountInfo from: configData))]. + aCollection do: [:configData | endpointCollection add: (ICEndPoint new fromAccountInfo: (ICAccountInfo newWith: configData))]. ^ endpointCollection \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICHelper.class/methodProperties.json b/packages/IMAPClient-Core.package/ICHelper.class/methodProperties.json index 092bb51e..45d0bd2d 100644 --- a/packages/IMAPClient-Core.package/ICHelper.class/methodProperties.json +++ b/packages/IMAPClient-Core.package/ICHelper.class/methodProperties.json @@ -1,6 +1,6 @@ { "class" : { - "accountDictionariesToEndpoints:" : "tg 7/10/2019 18:20", + "accountDictionariesToEndpoints:" : "tg 7/11/2019 10:04", "allFolders:" : "pm 6/3/2019 18:35", "hashNameForAccount:and:" : "pm 6/3/2019 18:36", "makeParameterCollection:" : "C.G. 7/25/2018 12:20", diff --git a/packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json b/packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json index d693db33..9e79cd14 100644 --- a/packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json +++ b/packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json @@ -28,7 +28,7 @@ "deleteEmail" : "C.G. 7/25/2018 14:16", "dialogTitle" : "ms 6/26/2016 13:50", "editAccount:with:" : "pm 6/19/2019 14:52", - "editAccountButton:" : "C.G. 7/25/2018 14:16", + "editAccountButton:" : "tg 7/11/2019 10:00", "emailAccounts" : "C.G. 7/25/2018 14:16", "emailAccounts:" : "C.G. 7/25/2018 14:16", "emailListKeyPress:" : "pm 5/27/2019 14:00", diff --git a/packages/IMAPClient-UI.package/ICPasswordDialog.class/instance/login.st b/packages/IMAPClient-UI.package/ICPasswordDialog.class/instance/login.st index 692de0f2..3b573083 100644 --- a/packages/IMAPClient-UI.package/ICPasswordDialog.class/instance/login.st +++ b/packages/IMAPClient-UI.package/ICPasswordDialog.class/instance/login.st @@ -8,7 +8,7 @@ login self data at: 'password' put: (self password asString). - ((ICEndPoint new) testAccountWith: (ICAccountInfo from: data)) + ((ICEndPoint new) testAccountWith: (ICAccountInfo newWith: data)) ifTrue: [ self folderDialogInstance addPasswordToCollection: (self data). self window abandon] \ No newline at end of file diff --git a/packages/IMAPClient-UI.package/ICPasswordDialog.class/methodProperties.json b/packages/IMAPClient-UI.package/ICPasswordDialog.class/methodProperties.json index 0d52517a..620c5675 100644 --- a/packages/IMAPClient-UI.package/ICPasswordDialog.class/methodProperties.json +++ b/packages/IMAPClient-UI.package/ICPasswordDialog.class/methodProperties.json @@ -9,7 +9,7 @@ "data:" : "pm 6/9/2019 17:14", "folderDialogInstance" : "C.G. 7/25/2018 14:25", "folderDialogInstance:" : "pm 6/9/2019 17:14", - "login" : "tg 7/10/2019 18:03", + "login" : "tg 7/11/2019 10:04", "loginWithPassword:" : "fr 6/13/2019 14:39", "password" : "C.G. 7/25/2018 14:25", "password:" : "fr 6/13/2019 14:44", From 518bf570d3e4e353feccc8f3ca592c153170302d Mon Sep 17 00:00:00 2001 From: Tim Garrels Date: Mon, 15 Jul 2019 12:38:12 +0200 Subject: [PATCH 07/12] Review Requests on #254 --- .../ICAccountInfo.class/README.md | 1 + ...ountName.host.port.username.password.ssl..st | 14 +++++++------- .../instance/asDictionary.st | 11 +++++++++++ .../instance/hasValidServerInfo.st | 5 +++++ .../instance/hasValidUserInfo.st | 5 +++++ .../ICAccountInfo.class/instance/isValid.st | 2 +- .../ICAccountInfo.class/instance/password.st | 2 +- .../ICAccountInfo.class/instance/username.st | 2 +- .../ICAccountInfo.class/methodProperties.json | 11 +++++++---- .../ICAccountInfo.class/properties.json | 2 +- .../instance/asAccountInfoDictionary.st | 4 ++++ .../ICEndPoint.class/instance/asDictionary.st | 17 ----------------- ...mAccountInfo..st => connectAndLoginWith..st} | 4 ++-- .../ICEndPoint.class/instance/connectWith..st | 2 +- .../instance/testAccountWith..st | 2 +- .../ICEndPoint.class/instance/useSSL.st | 4 ---- .../ICEndPoint.class/methodProperties.json | 11 +++++------ .../class/accountDictionariesToEndpoints..st | 2 +- .../ICHelper.class/methodProperties.json | 2 +- .../ICLoginDialog.class/class/open.with..st | 2 +- .../ICLoginDialog.class/methodProperties.json | 2 +- 21 files changed, 57 insertions(+), 50 deletions(-) create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/asDictionary.st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/hasValidServerInfo.st create mode 100644 packages/IMAPClient-Core.package/ICAccountInfo.class/instance/hasValidUserInfo.st create mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/asAccountInfoDictionary.st delete mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/asDictionary.st rename packages/IMAPClient-Core.package/ICEndPoint.class/instance/{fromAccountInfo..st => connectAndLoginWith..st} (83%) delete mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/useSSL.st diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/README.md b/packages/IMAPClient-Core.package/ICAccountInfo.class/README.md index e69de29b..4e432a13 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/README.md +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/README.md @@ -0,0 +1 @@ +An ICAccountInfo is a dataobject holding information needed to connect to a server such as server address and user credentials. It also ensures basic IMAP datatype validity. diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithAccountName.host.port.username.password.ssl..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithAccountName.host.port.username.password.ssl..st index f6b44065..08e77f38 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithAccountName.host.port.username.password.ssl..st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithAccountName.host.port.username.password.ssl..st @@ -1,10 +1,10 @@ instance creation -newWithAccountName: name host: host port: port username: username password: password ssl: ssl +newWithAccountName: aNameString host: aHostString port: aPortNumber username: aUsernameString password: aPasswordString ssl: aSSLBool ^ self new - accountName: name; - host: host; - port: port; - username: username; - password: password; - ssl: ssl \ No newline at end of file + accountName: aNameString; + host: aHostString; + port: aPortNumber; + username: aUsernameString; + password: aPasswordString; + ssl: aSSLBool \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/asDictionary.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/asDictionary.st new file mode 100644 index 00000000..1961c47d --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/asDictionary.st @@ -0,0 +1,11 @@ +accessing +asDictionary + + ^ Dictionary new; + at: 'ssl' put: self ssl; + at: 'name:' put: self name; + at: 'address' put: self host; + at: 'port' put: self port; + at: 'username' put: self username; + at: 'password' put: self password. + \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/hasValidServerInfo.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/hasValidServerInfo.st new file mode 100644 index 00000000..3bf1654c --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/hasValidServerInfo.st @@ -0,0 +1,5 @@ +validation +hasValidServerInfo + + ^ self host ~= self class invalidHost + and: [self port ~= self class invalidPort] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/hasValidUserInfo.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/hasValidUserInfo.st new file mode 100644 index 00000000..0f587741 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/hasValidUserInfo.st @@ -0,0 +1,5 @@ +validation +hasValidUserInfo + + ^ self username ~= self class invalidUsername + and: [self password ~= self class invalidPassword] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/isValid.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/isValid.st index c53fbae6..029ea1df 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/isValid.st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/isValid.st @@ -1,4 +1,4 @@ validation isValid - ^ (self host ~= self class invalidHost and: [self port ~= self class invalidPort]) and: (self username ~= self class invalidUsername and: [self password ~= self class invalidPassword]) \ No newline at end of file + ^ self hasValidServerInfo and: self hasValidUserInfo \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/password.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/password.st index 8e8d615e..395fe90d 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/password.st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/password.st @@ -1,4 +1,4 @@ accessing password - ^ password ifNil: [self password: self class invalidPassword] \ No newline at end of file + ^ password ifNil: [password := self class invalidPassword] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/username.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/username.st index 50433faa..bbb536cb 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/username.st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/username.st @@ -1,4 +1,4 @@ accessing username - ^ username ifNil: [self username: self class invalidUsername]. \ No newline at end of file + ^ username ifNil: [username := self class invalidUsername]. \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json b/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json index 7fb9072c..432f636a 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json @@ -7,15 +7,18 @@ "invalidPort" : "tg 7/10/2019 20:09", "invalidUsername" : "tg 7/10/2019 20:10", "newWith:" : "tg 7/11/2019 10:07", - "newWithAccountName:host:port:username:password:ssl:" : "tg 7/10/2019 17:49" }, + "newWithAccountName:host:port:username:password:ssl:" : "tg 7/15/2019 12:05" }, "instance" : { "accountName" : "tg 7/10/2019 20:20", "accountName:" : "tg 7/10/2019 17:35", + "asDictionary" : "tg 7/15/2019 12:18", "canConvert:" : "tg 7/10/2019 17:18", + "hasValidServerInfo" : "tg 7/15/2019 12:08", + "hasValidUserInfo" : "tg 7/15/2019 12:08", "host" : "tg 7/10/2019 20:06", "host:" : "tg 7/10/2019 17:11", - "isValid" : "tg 7/10/2019 20:07", - "password" : "tg 7/10/2019 20:11", + "isValid" : "tg 7/15/2019 12:08", + "password" : "tg 7/15/2019 12:11", "password:" : "tg 7/10/2019 17:18", "passwordAsIMAPString" : "tg 7/10/2019 17:18", "port" : "tg 7/10/2019 20:09", @@ -23,6 +26,6 @@ "printOn:" : "tg 7/10/2019 18:06", "ssl" : "tg 7/10/2019 20:21", "ssl:" : "tg 7/10/2019 17:34", - "username" : "tg 7/10/2019 20:11", + "username" : "tg 7/15/2019 12:11", "username:" : "tg 7/10/2019 17:18", "usernameAsIMAPString" : "tg 7/10/2019 17:18" } } diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/properties.json b/packages/IMAPClient-Core.package/ICAccountInfo.class/properties.json index 7941e662..f193f3d7 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/properties.json +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/properties.json @@ -4,7 +4,7 @@ ], "classvars" : [ ], - "commentStamp" : "", + "commentStamp" : "tg 7/15/2019 12:14", "instvars" : [ "accountName", "host", diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/asAccountInfoDictionary.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/asAccountInfoDictionary.st new file mode 100644 index 00000000..13336518 --- /dev/null +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/asAccountInfoDictionary.st @@ -0,0 +1,4 @@ +accessing +asAccountInfoDictionary + + ^ self accountInfo asDictionary \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/asDictionary.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/asDictionary.st deleted file mode 100644 index 1ed28e8c..00000000 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/asDictionary.st +++ /dev/null @@ -1,17 +0,0 @@ -accessing -asDictionary - - "returns endpoint data as dictionary" - - | dataDictionary | - - dataDictionary := Dictionary new. - - dataDictionary at: 'ssl' put: (self accountInfo ssl). - dataDictionary at: 'name:' put: (self accountInfo name). - dataDictionary at: 'address' put: (self accountInfo host). - dataDictionary at: 'port' put: (self accountInfo port). - dataDictionary at: 'username' put: (self accountInfo username). - dataDictionary at: 'password' put: (self accountInfo password). - - ^ dataDictionary \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fromAccountInfo..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectAndLoginWith..st similarity index 83% rename from packages/IMAPClient-Core.package/ICEndPoint.class/instance/fromAccountInfo..st rename to packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectAndLoginWith..st index 50ee6edd..2ddfb769 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fromAccountInfo..st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectAndLoginWith..st @@ -1,5 +1,5 @@ -accessing -fromAccountInfo: anICAccountInfo +connection +connectAndLoginWith: anICAccountInfo self accountInfo: anICAccountInfo. diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectWith..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectWith..st index 5ead32c3..a729d3ad 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectWith..st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectWith..st @@ -4,7 +4,7 @@ connectWith: aStreamClass self accountInfo isValid ifFalse: [^ Error signal: self class errorInvalidConnectionConfiguration]. [self stream - ssl: self useSSL; + ssl: self accountInfo ssl; connectTo: self accountInfo host on: self accountInfo port with: aStreamClass; nextResponse "skip server greetings"] on: Error diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/testAccountWith..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/testAccountWith..st index aa5fbd96..3c478777 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/testAccountWith..st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/testAccountWith..st @@ -1,6 +1,6 @@ login testAccountWith: accountInfo - self fromAccountInfo: accountInfo. + self connectAndLoginWith: accountInfo. ^ self fatalErrorOccured not \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/useSSL.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/useSSL.st deleted file mode 100644 index a7ecdde8..00000000 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/useSSL.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -useSSL - - ^ self accountInfo ssl \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json b/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json index b05857f7..79e82cb5 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json @@ -44,7 +44,7 @@ "instance" : { "accountInfo" : "tg 7/10/2019 17:23", "accountInfo:" : "tg 7/10/2019 17:24", - "asDictionary" : "tg 7/10/2019 17:33", + "asAccountInfoDictionary" : "tg 7/15/2019 12:20", "checkConnected" : "tg 7/10/2019 19:29", "checkForBadRequest" : "C.G. 7/25/2018 12:30", "checkForParameterError" : "DH 7/25/2018 17:29", @@ -52,7 +52,8 @@ "close" : "AR 5/31/2016 11:12", "commandSucceeded" : "AR 6/14/2016 08:46", "connect" : "tg 7/10/2019 19:02", - "connectWith:" : "tg 7/10/2019 19:01", + "connectAndLoginWith:" : "tg 7/15/2019 12:28", + "connectWith:" : "tg 7/15/2019 12:21", "createEmailsWith:andName:and:" : "C.G. 6/26/2018 10:51", "currentFolderName" : "C.G. 7/25/2018 13:50", "currentFolderName:" : "C.G. 7/25/2018 13:50", @@ -68,7 +69,6 @@ "folderFromResponse:" : "C.G. 7/25/2018 13:51", "folderNameOfTrash" : "mw 6/23/2018 12:08", "folderPathFrom:" : "DH 7/4/2018 13:14", - "fromAccountInfo:" : "tg 7/10/2019 18:18", "hierarchyDelimiter" : "mw 5/11/2018 10:37", "hierarchyDelimiter:" : "mw 5/11/2018 10:37", "isConnected" : "js 6/7/2016 10:13", @@ -117,7 +117,6 @@ "startsNewHeaderChunk:" : "C.G. 7/25/2018 13:58", "stream" : "pm 6/9/2019 13:08", "stream:" : "js 6/7/2016 10:17", - "testAccountWith:" : "tg 7/10/2019 17:40", + "testAccountWith:" : "tg 7/15/2019 12:29", "uids" : "C.G. 7/25/2018 13:59", - "uids:" : "pm 6/9/2019 16:52", - "useSSL" : "tg 7/10/2019 17:36" } } + "uids:" : "pm 6/9/2019 16:52" } } diff --git a/packages/IMAPClient-Core.package/ICHelper.class/class/accountDictionariesToEndpoints..st b/packages/IMAPClient-Core.package/ICHelper.class/class/accountDictionariesToEndpoints..st index dd373265..1a09bdbe 100644 --- a/packages/IMAPClient-Core.package/ICHelper.class/class/accountDictionariesToEndpoints..st +++ b/packages/IMAPClient-Core.package/ICHelper.class/class/accountDictionariesToEndpoints..st @@ -7,6 +7,6 @@ accountDictionariesToEndpoints: aCollection | endpointCollection | endpointCollection := OrderedCollection new. - aCollection do: [:configData | endpointCollection add: (ICEndPoint new fromAccountInfo: (ICAccountInfo newWith: configData))]. + aCollection do: [:configData | endpointCollection add: (ICEndPoint new connectAndLoginWith: (ICAccountInfo newWith: configData))]. ^ endpointCollection \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICHelper.class/methodProperties.json b/packages/IMAPClient-Core.package/ICHelper.class/methodProperties.json index 45d0bd2d..2340eb79 100644 --- a/packages/IMAPClient-Core.package/ICHelper.class/methodProperties.json +++ b/packages/IMAPClient-Core.package/ICHelper.class/methodProperties.json @@ -1,6 +1,6 @@ { "class" : { - "accountDictionariesToEndpoints:" : "tg 7/11/2019 10:04", + "accountDictionariesToEndpoints:" : "tg 7/15/2019 12:30", "allFolders:" : "pm 6/3/2019 18:35", "hashNameForAccount:and:" : "pm 6/3/2019 18:36", "makeParameterCollection:" : "C.G. 7/25/2018 12:20", diff --git a/packages/IMAPClient-UI.package/ICLoginDialog.class/class/open.with..st b/packages/IMAPClient-UI.package/ICLoginDialog.class/class/open.with..st index 7d4d18f3..55e2de97 100644 --- a/packages/IMAPClient-UI.package/ICLoginDialog.class/class/open.with..st +++ b/packages/IMAPClient-UI.package/ICLoginDialog.class/class/open.with..st @@ -6,7 +6,7 @@ open: aFolderDialogInstance with: anEndpoint instance := self new. instance folderDialogInstance: aFolderDialogInstance. - instance loadData: anEndpoint asDictionary. + instance loadData: anEndpoint asAccountInfoDictionary. instance updateMode: true. instance endpoint: anEndpoint. diff --git a/packages/IMAPClient-UI.package/ICLoginDialog.class/methodProperties.json b/packages/IMAPClient-UI.package/ICLoginDialog.class/methodProperties.json index 7ebe1df7..9c48754b 100644 --- a/packages/IMAPClient-UI.package/ICLoginDialog.class/methodProperties.json +++ b/packages/IMAPClient-UI.package/ICLoginDialog.class/methodProperties.json @@ -4,7 +4,7 @@ "defaultPort" : "ok 7/9/2019 19:05", "failureLoginMessage" : "jwe 6/14/2016 23:41", "open:" : "C.G. 6/21/2018 10:56", - "open:with:" : "C.G. 7/25/2018 14:26", + "open:with:" : "tg 7/15/2019 12:19", "successLoginMessage" : "jwe 6/14/2016 23:40" }, "instance" : { "accountName" : "C.G. 7/25/2018 14:21", From 7f1dbd5d310ebc59845eeca7a18dd6b8a1dc1d81 Mon Sep 17 00:00:00 2001 From: Tim Garrels Date: Mon, 15 Jul 2019 13:37:49 +0200 Subject: [PATCH 08/12] Recategorization and little code beautification --- .../ICEndPoint.class/class/defaultStreamClass.st | 4 ++++ .../{instance => class}/folderNameOfTrash.st | 2 +- .../instance/checkForParameterError.st | 2 +- .../ICEndPoint.class/instance/checkLoggedIn.st | 2 +- .../ICEndPoint.class/instance/close.st | 2 +- .../ICEndPoint.class/instance/connect.st | 2 +- .../instance/createEmailsWith.andName.and..st | 2 +- .../ICEndPoint.class/instance/deleteEmail..st | 2 +- .../instance/fatalErrorOccured..st | 2 +- .../instance/fatalErrorOccured.st | 2 +- .../ICEndPoint.class/instance/fillBodyFor..st | 2 +- .../ICEndPoint.class/instance/isConnected.st | 2 +- .../ICEndPoint.class/instance/isLoggedIn.st | 4 ---- .../instance/loadEmailsFromMaildir.st | 2 +- .../instance/maildirDiffFetchHeadersFrom..st | 7 ++----- .../instance/maildirDiffFetchHeadersFrom.to..st | 2 +- .../ICEndPoint.class/instance/maildirFileName.st | 2 +- .../instance/refreshConnectionProcess.st | 2 +- .../ICEndPoint.class/instance/rootFolderName.st | 4 ++-- .../ICEndPoint.class/instance/uids..st | 2 +- .../ICEndPoint.class/instance/uids.st | 2 +- .../ICEndPoint.class/methodProperties.json | 16 ++++++++-------- 22 files changed, 33 insertions(+), 36 deletions(-) create mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/class/defaultStreamClass.st rename packages/IMAPClient-Core.package/ICEndPoint.class/{instance => class}/folderNameOfTrash.st (74%) delete mode 100644 packages/IMAPClient-Core.package/ICEndPoint.class/instance/isLoggedIn.st diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/class/defaultStreamClass.st b/packages/IMAPClient-Core.package/ICEndPoint.class/class/defaultStreamClass.st new file mode 100644 index 00000000..42afc49a --- /dev/null +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/class/defaultStreamClass.st @@ -0,0 +1,4 @@ +constants +defaultStreamClass + + ^ SocketStream \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/folderNameOfTrash.st b/packages/IMAPClient-Core.package/ICEndPoint.class/class/folderNameOfTrash.st similarity index 74% rename from packages/IMAPClient-Core.package/ICEndPoint.class/instance/folderNameOfTrash.st rename to packages/IMAPClient-Core.package/ICEndPoint.class/class/folderNameOfTrash.st index 80a899f3..86a9f20c 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/folderNameOfTrash.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/class/folderNameOfTrash.st @@ -1,4 +1,4 @@ -accessing +constants folderNameOfTrash ^ 'Trash' \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/checkForParameterError.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/checkForParameterError.st index 7895a720..874d7a02 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/checkForParameterError.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/checkForParameterError.st @@ -1,4 +1,4 @@ -connection +error handling checkForParameterError (self fatalErrorOccured) diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/checkLoggedIn.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/checkLoggedIn.st index 763cc8ef..1cd60beb 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/checkLoggedIn.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/checkLoggedIn.st @@ -4,7 +4,7 @@ checkLoggedIn (self fatalErrorOccured) ifTrue: [^ false]. - self isLoggedIn ifFalse: [ + self loggedIn ifFalse: [ self fatalErrorOccured: true. ^ false]. diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/close.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/close.st index a90093ec..3ddbc858 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/close.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/close.st @@ -1,4 +1,4 @@ -login +connection close self stream close. diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connect.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connect.st index 616f7272..c82e12a5 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connect.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/connect.st @@ -1,4 +1,4 @@ connection connect - self connectWith: SocketStream \ No newline at end of file + self connectWith: self class defaultStreamClass \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/createEmailsWith.andName.and..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/createEmailsWith.andName.and..st index 29974bc5..69342bea 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/createEmailsWith.andName.and..st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/createEmailsWith.andName.and..st @@ -1,4 +1,4 @@ -connection +storage createEmailsWith: maildirDirectory andName: directoryName and: relativeRootFolder "this loads mails from storage and create ICFolder with ICMails in it." diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/deleteEmail..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/deleteEmail..st index f10f3a53..55de3fc2 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/deleteEmail..st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/deleteEmail..st @@ -3,4 +3,4 @@ deleteEmail: anEmail self sendCommand: (self class deleteEmail: anEmail messageID). self fetchNextResponse. - self moveEmail: anEmail to: self folderNameOfTrash \ No newline at end of file + self moveEmail: anEmail to: self class folderNameOfTrash \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fatalErrorOccured..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fatalErrorOccured..st index b292ad03..c0bfd3f1 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fatalErrorOccured..st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fatalErrorOccured..st @@ -1,4 +1,4 @@ -error handling +accessing fatalErrorOccured: aBoolean "If an error occured, that makes it impossible for a connection to be established, diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fatalErrorOccured.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fatalErrorOccured.st index 4407007f..2108a287 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fatalErrorOccured.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fatalErrorOccured.st @@ -1,4 +1,4 @@ -error handling +accessing fatalErrorOccured "If an error occured, that makes it impossible for a connection to be established, diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fillBodyFor..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fillBodyFor..st index 9ea911ce..5b852c63 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fillBodyFor..st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/fillBodyFor..st @@ -1,4 +1,4 @@ -connection +login fillBodyFor: anEmail self diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/isConnected.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/isConnected.st index 4bfa714b..65478afe 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/isConnected.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/isConnected.st @@ -1,4 +1,4 @@ -login +connection isConnected ^ self stream isConnected \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/isLoggedIn.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/isLoggedIn.st deleted file mode 100644 index db9a45a7..00000000 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/isLoggedIn.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -isLoggedIn - - ^ self loggedIn \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/loadEmailsFromMaildir.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/loadEmailsFromMaildir.st index 4dd9c37f..4ecad7a3 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/loadEmailsFromMaildir.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/loadEmailsFromMaildir.st @@ -1,4 +1,4 @@ -login +storage loadEmailsFromMaildir | directory directoryName | diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/maildirDiffFetchHeadersFrom..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/maildirDiffFetchHeadersFrom..st index 304f9fd6..2c41f3c3 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/maildirDiffFetchHeadersFrom..st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/maildirDiffFetchHeadersFrom..st @@ -1,10 +1,7 @@ -connection +fetching maildirDiffFetchHeadersFrom: anUID - "fetch headers in range (anUID, self uids last(" - - self uids ifEmpty: [ ^ OrderedCollection new]. - self uids + ifEmpty: [ ^ OrderedCollection new]; ifNil: [^ OrderedCollection new] ifNotNil: [^ self maildirDiffFetchHeadersFrom: (anUID + 1) to: (self uids last + 1)] \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/maildirDiffFetchHeadersFrom.to..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/maildirDiffFetchHeadersFrom.to..st index 896a97e7..1916ed92 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/maildirDiffFetchHeadersFrom.to..st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/maildirDiffFetchHeadersFrom.to..st @@ -1,4 +1,4 @@ -connection +fetching maildirDiffFetchHeadersFrom: start to: end | searchBegin searchEnd mailFolder | diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/maildirFileName.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/maildirFileName.st index 801cf250..9149041d 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/maildirFileName.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/maildirFileName.st @@ -1,4 +1,4 @@ -connection +storage maildirFileName "replace hierarchyDelimiter with FileSystem slash" diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/refreshConnectionProcess.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/refreshConnectionProcess.st index 7d91c9c4..3202d421 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/refreshConnectionProcess.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/refreshConnectionProcess.st @@ -5,7 +5,7 @@ refreshConnectionProcess delayTime := 60 * 10. "Wait for 10 minutes." - [self isConnected and: [self isLoggedIn]] + [self isConnected and: [self loggedIn]] whileTrue: [ self sendCommand: self class noopCommand. self fetchNextResponse. diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/rootFolderName.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/rootFolderName.st index 88b8f3b5..b60246a3 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/rootFolderName.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/rootFolderName.st @@ -1,7 +1,7 @@ accessing rootFolderName - "this accounts are saved with a hashed name, because we could otherwise get problems with - special tokens like @ or spaces in server-host or username" + "the account is saved with a hashed name, because otherwise problems with + special tokens like @ or spaces in server-host or username could occur" ^ ICHelper hashNameForAccount: (self accountInfo host) and: (self accountInfo username) \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/uids..st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/uids..st index db6967d4..a29dc85b 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/uids..st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/uids..st @@ -1,4 +1,4 @@ -connection +accessing uids: anOrderedCollection uids := anOrderedCollection \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/uids.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/uids.st index d0e79b32..fd9707fd 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/uids.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/uids.st @@ -1,4 +1,4 @@ -connection +accessing uids ^ uids \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json b/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json index 79e82cb5..8654c949 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json @@ -10,6 +10,7 @@ "commandSucceeded" : "C.G. 7/25/2018 14:10", "connectionConfigurations" : "tg 7/8/2019 15:14", "connectionConfigurations:" : "pm 6/19/2019 14:49", + "defaultStreamClass" : "tg 7/15/2019 13:26", "deleteEmail:" : "C.G. 7/25/2018 14:10", "errorBadParameter" : "jwe 7/28/2016 11:12", "errorBadProtocol" : "js 5/15/2016 13:55", @@ -23,6 +24,7 @@ "fetchBodyCommand:" : "lvm 5/8/2018 11:09", "fetchFlagsWithUIDRange:to:" : "C.G. 7/25/2018 14:10", "fetchHeadersWithUIDRange:to:" : "C.G. 7/25/2018 14:11", + "folderNameOfTrash" : "tg 7/15/2019 12:42", "lastHeaderLine" : "jwe 7/14/2016 09:19", "listCommand" : "js 6/8/2016 15:36", "loginCommand" : "js 6/7/2016 09:55", @@ -48,10 +50,10 @@ "checkConnected" : "tg 7/10/2019 19:29", "checkForBadRequest" : "C.G. 7/25/2018 12:30", "checkForParameterError" : "DH 7/25/2018 17:29", - "checkLoggedIn" : "C.G. 7/25/2018 12:42", + "checkLoggedIn" : "tg 7/15/2019 12:44", "close" : "AR 5/31/2016 11:12", "commandSucceeded" : "AR 6/14/2016 08:46", - "connect" : "tg 7/10/2019 19:02", + "connect" : "tg 7/15/2019 13:27", "connectAndLoginWith:" : "tg 7/15/2019 12:28", "connectWith:" : "tg 7/15/2019 12:21", "createEmailsWith:andName:and:" : "C.G. 6/26/2018 10:51", @@ -59,7 +61,7 @@ "currentFolderName:" : "C.G. 7/25/2018 13:50", "currentUIDs" : "pm 6/3/2019 18:35", "currentUIDsFor:" : "pm 6/3/2019 18:35", - "deleteEmail:" : "C.G. 7/4/2018 14:21", + "deleteEmail:" : "tg 7/15/2019 12:42", "expungeEmail" : "mw 6/22/2018 23:00", "fatalErrorOccured" : "pm 6/9/2019 13:10", "fatalErrorOccured:" : "C.G. 7/25/2018 12:33", @@ -67,12 +69,10 @@ "fetchNextResponse" : "C.G. 7/25/2018 13:51", "fillBodyFor:" : "ms 7/10/2016 14:09", "folderFromResponse:" : "C.G. 7/25/2018 13:51", - "folderNameOfTrash" : "mw 6/23/2018 12:08", "folderPathFrom:" : "DH 7/4/2018 13:14", "hierarchyDelimiter" : "mw 5/11/2018 10:37", "hierarchyDelimiter:" : "mw 5/11/2018 10:37", "isConnected" : "js 6/7/2016 10:13", - "isLoggedIn" : "js 5/15/2016 13:09", "lastResponse" : "pm 6/9/2019 13:10", "lastResponse:" : "lvm 5/24/2018 10:16", "listAllFolders" : "js 6/14/2016 12:31", @@ -82,7 +82,7 @@ "loggedIn:" : "js 5/15/2016 13:09", "login" : "tg 7/10/2019 17:25", "logout" : "js 6/14/2016 16:59", - "maildirDiffFetchHeadersFrom:" : "DH 7/25/2018 00:35", + "maildirDiffFetchHeadersFrom:" : "tg 7/15/2019 13:31", "maildirDiffFetchHeadersFrom:to:" : "C.G. 7/25/2018 13:54", "maildirFileName" : "pm 6/3/2019 18:33", "moveEmail:to:" : "DH 7/9/2018 21:29", @@ -102,7 +102,7 @@ "parseMethods" : "C.G. 7/25/2018 13:57", "ping" : "AR 6/26/2016 15:04", "preventTimeout" : "lvm 7/23/2018 23:33", - "refreshConnectionProcess" : "C.G. 7/25/2018 13:58", + "refreshConnectionProcess" : "tg 7/15/2019 12:44", "resetFlag:and:" : "mw 5/17/2018 20:49", "responseIsError" : "js 6/7/2016 10:16", "responseIsParameterError" : "js 8/4/2017 22:25", @@ -110,7 +110,7 @@ "retrieveFlagsFrom:to:in:" : "C.G. 7/25/2018 13:58", "rootFolder" : "pm 6/9/2019 13:09", "rootFolder:" : "js 6/10/2016 15:09", - "rootFolderName" : "tg 7/10/2019 17:27", + "rootFolderName" : "tg 7/15/2019 12:45", "select:" : "C.G. 6/28/2018 10:30", "sendCommand:" : "DH 6/26/2018 20:21", "setFlag:and:" : "C.G. 7/25/2018 13:58", From 6667a2c9caf6d386be67c66c4b3f3e5d4e193ea3 Mon Sep 17 00:00:00 2001 From: Tim Garrels Date: Thu, 18 Jul 2019 22:09:31 +0200 Subject: [PATCH 09/12] name-attribut artifact replacement --- .../ICAccountInfo.class/instance/asDictionary.st | 2 +- .../ICAccountInfo.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/asDictionary.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/asDictionary.st index 1961c47d..63529017 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/asDictionary.st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/asDictionary.st @@ -3,7 +3,7 @@ asDictionary ^ Dictionary new; at: 'ssl' put: self ssl; - at: 'name:' put: self name; + at: 'name:' put: self accountName; at: 'address' put: self host; at: 'port' put: self port; at: 'username' put: self username; diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json b/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json index 432f636a..58682e04 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json @@ -11,7 +11,7 @@ "instance" : { "accountName" : "tg 7/10/2019 20:20", "accountName:" : "tg 7/10/2019 17:35", - "asDictionary" : "tg 7/15/2019 12:18", + "asDictionary" : "tg 7/18/2019 22:08", "canConvert:" : "tg 7/10/2019 17:18", "hasValidServerInfo" : "tg 7/15/2019 12:08", "hasValidUserInfo" : "tg 7/15/2019 12:08", From 82116547922f70be6a96248763866f144bec88fe Mon Sep 17 00:00:00 2001 From: Tim Garrels Date: Thu, 18 Jul 2019 23:11:36 +0200 Subject: [PATCH 10/12] Made everything use anAccountINfo instead of Dictionary Made everything use 'accountName' instead of 'name' --- .../ICAccountInfo.class/class/newWith..st | 2 +- ...ccountName.host.port.username.password.ssl..st | 2 +- .../ICAccountInfo.class/instance/asDictionary.st | 9 ++++++--- .../ICAccountInfo.class/methodProperties.json | 6 +++--- .../class/checkValidConfiguration..st | 2 +- .../ICEndPoint.class/instance/login.st | 2 +- .../ICEndPoint.class/methodProperties.json | 6 +++--- .../ICFolderDialog.class/instance/addAccount..st | 6 +++--- .../instance/addPasswordToCollection..st | 2 +- .../instance/editAccount.with..st | 6 +++--- .../ICFolderDialog.class/methodProperties.json | 6 +++--- .../instance/checkIfAccountnameUnused..st | 4 ++-- .../instance/checkIfAllFieldsFilled..st | 4 ++-- .../instance/createAccountInfo.st | 11 +++++++++++ .../ICLoginDialog.class/instance/login.st | 14 +++++++------- .../instance/makeDataDictionary.st | 15 --------------- .../ICLoginDialog.class/methodProperties.json | 8 ++++---- .../ICPasswordDialog.class/instance/buildWith..st | 2 +- .../ICPasswordDialog.class/methodProperties.json | 2 +- 19 files changed, 54 insertions(+), 55 deletions(-) create mode 100644 packages/IMAPClient-UI.package/ICLoginDialog.class/instance/createAccountInfo.st delete mode 100644 packages/IMAPClient-UI.package/ICLoginDialog.class/instance/makeDataDictionary.st diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWith..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWith..st index a505f319..56b6be7a 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWith..st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWith..st @@ -1,7 +1,7 @@ instance creation newWith: aDataDictionary - ^ self newWithAccountName: (aDataDictionary at: 'name') + ^ self newWithAccountName: (aDataDictionary at: 'accountName') host: (aDataDictionary at: 'address') port: ((aDataDictionary at: 'port') asNumber) username: (aDataDictionary at: 'username') diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithAccountName.host.port.username.password.ssl..st b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithAccountName.host.port.username.password.ssl..st index 08e77f38..445818e0 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithAccountName.host.port.username.password.ssl..st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWithAccountName.host.port.username.password.ssl..st @@ -1,6 +1,6 @@ instance creation newWithAccountName: aNameString host: aHostString port: aPortNumber username: aUsernameString password: aPasswordString ssl: aSSLBool - + ^ self new accountName: aNameString; host: aHostString; diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/asDictionary.st b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/asDictionary.st index 63529017..96e81de2 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/asDictionary.st +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/instance/asDictionary.st @@ -1,11 +1,14 @@ accessing asDictionary - ^ Dictionary new; - at: 'ssl' put: self ssl; - at: 'name:' put: self accountName; + | dict | + dict := Dictionary new. + dict at: 'ssl' put: self ssl; + at: 'accountName' put: self accountName; at: 'address' put: self host; at: 'port' put: self port; at: 'username' put: self username; at: 'password' put: self password. + + ^ dict \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json b/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json index 58682e04..8e4b2344 100644 --- a/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json +++ b/packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json @@ -6,12 +6,12 @@ "invalidPassword" : "tg 7/10/2019 20:10", "invalidPort" : "tg 7/10/2019 20:09", "invalidUsername" : "tg 7/10/2019 20:10", - "newWith:" : "tg 7/11/2019 10:07", - "newWithAccountName:host:port:username:password:ssl:" : "tg 7/15/2019 12:05" }, + "newWith:" : "tg 7/18/2019 23:08", + "newWithAccountName:host:port:username:password:ssl:" : "tg 7/18/2019 23:01" }, "instance" : { "accountName" : "tg 7/10/2019 20:20", "accountName:" : "tg 7/10/2019 17:35", - "asDictionary" : "tg 7/18/2019 22:08", + "asDictionary" : "tg 7/18/2019 23:07", "canConvert:" : "tg 7/10/2019 17:18", "hasValidServerInfo" : "tg 7/15/2019 12:08", "hasValidUserInfo" : "tg 7/15/2019 12:08", diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/class/checkValidConfiguration..st b/packages/IMAPClient-Core.package/ICEndPoint.class/class/checkValidConfiguration..st index 028fda50..05cbcc23 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/class/checkValidConfiguration..st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/class/checkValidConfiguration..st @@ -4,5 +4,5 @@ checkValidConfiguration: aDataDictionary ^ (aDataDictionary includesKey: 'username') and: (aDataDictionary includesKey: 'port') and: (aDataDictionary includesKey: 'address') and: - (aDataDictionary includesKey: 'name') and: + (aDataDictionary includesKey: 'accountName') and: (aDataDictionary includesKey: 'ssl') \ No newline at end of file diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/login.st b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/login.st index a44edca7..d87aa568 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/instance/login.st +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/instance/login.st @@ -1,6 +1,6 @@ login login - + (self checkConnected) ifFalse: [ self fatalErrorOccured: true. UIManager default inform: 'Cant connect to the server'. diff --git a/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json b/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json index 8654c949..4780a64a 100644 --- a/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json +++ b/packages/IMAPClient-Core.package/ICEndPoint.class/methodProperties.json @@ -4,7 +4,7 @@ "allUIDs" : "pm 6/3/2019 18:35", "asProtocolQuote:" : "C.G. 7/25/2018 14:10", "basicConnectionConfigurations" : "tg 7/8/2019 15:14", - "checkValidConfiguration:" : "pm 6/19/2019 14:22", + "checkValidConfiguration:" : "tg 7/18/2019 23:06", "clearConfigurations" : "pm 6/19/2019 13:17", "commandFailed" : "C.G. 7/25/2018 14:10", "commandSucceeded" : "C.G. 7/25/2018 14:10", @@ -55,7 +55,7 @@ "commandSucceeded" : "AR 6/14/2016 08:46", "connect" : "tg 7/15/2019 13:27", "connectAndLoginWith:" : "tg 7/15/2019 12:28", - "connectWith:" : "tg 7/15/2019 12:21", + "connectWith:" : "tg 7/18/2019 23:00", "createEmailsWith:andName:and:" : "C.G. 6/26/2018 10:51", "currentFolderName" : "C.G. 7/25/2018 13:50", "currentFolderName:" : "C.G. 7/25/2018 13:50", @@ -80,7 +80,7 @@ "loadEmailsFromMaildir" : "pm 6/3/2019 18:33", "loggedIn" : "pm 6/9/2019 13:07", "loggedIn:" : "js 5/15/2016 13:09", - "login" : "tg 7/10/2019 17:25", + "login" : "tg 7/18/2019 22:57", "logout" : "js 6/14/2016 16:59", "maildirDiffFetchHeadersFrom:" : "tg 7/15/2019 13:31", "maildirDiffFetchHeadersFrom:to:" : "C.G. 7/25/2018 13:54", diff --git a/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/addAccount..st b/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/addAccount..st index bce4bf04..5d4ff6ea 100644 --- a/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/addAccount..st +++ b/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/addAccount..st @@ -1,11 +1,11 @@ accountManagment -addAccount: aDataDictionary +addAccount: anAccountInfo | data | data := OrderedCollection new. - data add: aDataDictionary. + data add: anAccountInfo asDictionary. - ICEndPoint addConfiguration: aDataDictionary. + ICEndPoint addConfiguration: anAccountInfo asDictionary. self emailAccounts add: ((ICHelper accountDictionariesToEndpoints: data) at: 1). self changed: #emailAccounts \ No newline at end of file diff --git a/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/addPasswordToCollection..st b/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/addPasswordToCollection..st index 2e55f2f1..e3bb677d 100644 --- a/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/addPasswordToCollection..st +++ b/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/addPasswordToCollection..st @@ -8,7 +8,7 @@ addPasswordToCollection: aDictionary self initializedAccounts add: aDictionary. "delete the newly initialized account from uninitializedAccounts" - nextAccount := self uninitializedAccounts findFirst: [:account | (account at: 'name') = (aDictionary at: 'name')]. + nextAccount := self uninitializedAccounts findFirst: [:account | (account at: 'accountName') = (aDictionary at: 'accountName')]. self uninitializedAccounts removeAt: nextAccount. "if there are yet uninitializedAccounts, open a ICPasswordPrompt for them" diff --git a/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/editAccount.with..st b/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/editAccount.with..st index d03b7c70..97e58fae 100644 --- a/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/editAccount.with..st +++ b/packages/IMAPClient-UI.package/ICFolderDialog.class/instance/editAccount.with..st @@ -1,5 +1,5 @@ accountManagment -editAccount: newData with: anEndPoint +editAccount: anAccountInfo with: anEndPoint "callback method for dialog. newData contains the updated Data, while previousData contains the old data" @@ -7,12 +7,12 @@ editAccount: newData with: anEndPoint | data | data := OrderedCollection new. - data add: newData. + data add: anAccountInfo asDictionary. ICEndPoint removeConfiguration: anEndPoint. self emailAccounts remove: anEndPoint. - ICEndPoint addConfiguration: newData. + ICEndPoint addConfiguration: anAccountInfo asDictionary. self emailAccounts add: ((ICHelper accountDictionariesToEndpoints: data) at: 1). self selectedFolder: nil. diff --git a/packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json b/packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json index 9e79cd14..febf5ed0 100644 --- a/packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json +++ b/packages/IMAPClient-UI.package/ICFolderDialog.class/methodProperties.json @@ -5,8 +5,8 @@ "open" : "DH 7/19/2018 18:21" }, "instance" : { "accountsComplete" : "pm 6/3/2019 18:47", - "addAccount:" : "pm 6/19/2019 14:29", - "addPasswordToCollection:" : "C.G. 6/26/2018 11:05", + "addAccount:" : "tg 7/18/2019 23:04", + "addPasswordToCollection:" : "tg 7/18/2019 23:09", "buildAddAccountButton:" : "fr 7/7/2019 10:15", "buildEmailButton:" : "ok 6/20/2019 12:18", "buildEmailList:" : "pm 6/26/2019 14:31", @@ -27,7 +27,7 @@ "deleteAccountButton:" : "pm 6/19/2019 14:52", "deleteEmail" : "C.G. 7/25/2018 14:16", "dialogTitle" : "ms 6/26/2016 13:50", - "editAccount:with:" : "pm 6/19/2019 14:52", + "editAccount:with:" : "tg 7/18/2019 23:05", "editAccountButton:" : "tg 7/11/2019 10:00", "emailAccounts" : "C.G. 7/25/2018 14:16", "emailAccounts:" : "C.G. 7/25/2018 14:16", diff --git a/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/checkIfAccountnameUnused..st b/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/checkIfAccountnameUnused..st index 2354935d..b9ca2821 100644 --- a/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/checkIfAccountnameUnused..st +++ b/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/checkIfAccountnameUnused..st @@ -1,8 +1,8 @@ helper -checkIfAccountnameUnused: aDictionary +checkIfAccountnameUnused: anAccountInfo " return false if account with same name exists " ICEndPoint connectionConfigurations - detect: [:credDict | (aDictionary at: 'name') = (credDict at: 'name')] + detect: [:credDict | (anAccountInfo accountName) = (credDict at: 'accountName')] ifFound: [:credDict | self displayAccountnameExistsErrorMessage. ^false] ifNone: [^true] \ No newline at end of file diff --git a/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/checkIfAllFieldsFilled..st b/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/checkIfAllFieldsFilled..st index 8a5160fc..bf7e9c66 100644 --- a/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/checkIfAllFieldsFilled..st +++ b/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/checkIfAllFieldsFilled..st @@ -1,9 +1,9 @@ helper -checkIfAllFieldsFilled: aDictionary +checkIfAllFieldsFilled: anAccountInfo | possiblyEmptyParameters | - possiblyEmptyParameters := self emptyParametersIn: aDictionary. + possiblyEmptyParameters := self emptyParametersIn: anAccountInfo asDictionary. self displayEmptyFieldErrorMessageIfNecessary: possiblyEmptyParameters. ^ possiblyEmptyParameters isEmpty \ No newline at end of file diff --git a/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/createAccountInfo.st b/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/createAccountInfo.st new file mode 100644 index 00000000..239a71ba --- /dev/null +++ b/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/createAccountInfo.st @@ -0,0 +1,11 @@ +helper +createAccountInfo + + ^ ICAccountInfo + newWithAccountName: self accountName asString + host: self serverAddress asString + port: self serverPort asNumber + username: self username asString + password: self password asString + ssl: self ssl + \ No newline at end of file diff --git a/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/login.st b/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/login.st index 40916d32..f9ad3974 100644 --- a/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/login.st +++ b/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/login.st @@ -3,18 +3,18 @@ login "create a dictionary with data and return it" - | dataDictionary | + | accountInfo | self insertDefaults. - dataDictionary := self makeDataDictionary. - (self checkIfAllFieldsFilled: dataDictionary) + accountInfo := self createAccountInfo. + (self checkIfAllFieldsFilled: accountInfo) ifFalse: [^ self]. - (self checkIfAccountnameUnused: dataDictionary) + (self checkIfAccountnameUnused: accountInfo) ifFalse: [^ self]. - ((ICEndPoint new) testAccountWith: dataDictionary) + ((ICEndPoint new) testAccountWith: accountInfo) ifTrue: [ self loginMorph abandon. (self updateMode) - ifFalse: [folderDialogInstance addAccount: dataDictionary] - ifTrue: [folderDialogInstance editAccount: dataDictionary with: (self endpoint)]] \ No newline at end of file + ifFalse: [folderDialogInstance addAccount: accountInfo] + ifTrue: [folderDialogInstance editAccount: accountInfo with: (self endpoint)]] \ No newline at end of file diff --git a/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/makeDataDictionary.st b/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/makeDataDictionary.st deleted file mode 100644 index 26af0ce2..00000000 --- a/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/makeDataDictionary.st +++ /dev/null @@ -1,15 +0,0 @@ -helper -makeDataDictionary - - | dataDictionary | - - dataDictionary := Dictionary new. - - dataDictionary at: 'name' put: self accountName asString. - dataDictionary at: 'address' put: self serverAddress asString. - dataDictionary at: 'port' put: self serverPort asString. - dataDictionary at: 'username' put: self username asString. - dataDictionary at: 'password' put: self password asString. - dataDictionary at: 'ssl' put: self ssl. - - ^ dataDictionary \ No newline at end of file diff --git a/packages/IMAPClient-UI.package/ICLoginDialog.class/methodProperties.json b/packages/IMAPClient-UI.package/ICLoginDialog.class/methodProperties.json index 9c48754b..47063a31 100644 --- a/packages/IMAPClient-UI.package/ICLoginDialog.class/methodProperties.json +++ b/packages/IMAPClient-UI.package/ICLoginDialog.class/methodProperties.json @@ -20,10 +20,11 @@ "buttonLabel" : "pm 6/3/2019 18:47", "changeInputField:" : "DH 7/25/2018 00:10", "checkBoxColor" : "ms 7/13/2016 17:34", - "checkIfAccountnameUnused:" : "fr 6/6/2019 09:53", - "checkIfAllFieldsFilled:" : "ok 6/6/2019 20:14", + "checkIfAccountnameUnused:" : "tg 7/18/2019 23:08", + "checkIfAllFieldsFilled:" : "tg 7/18/2019 22:51", "checkIfLastCharacterIsTab:" : "C.G. 7/25/2018 14:22", "constructEmptyFieldsErrorMessage:" : "ok 6/25/2019 00:47", + "createAccountInfo" : "tg 7/18/2019 23:01", "defaultBackgroundColor" : "C.G. 6/21/2018 00:28", "dialogTitle" : "ms 6/14/2016 09:53", "displayAccountnameExistsErrorMessage" : "ok 6/25/2019 00:26", @@ -44,10 +45,9 @@ "insertDefaults" : "ok 7/9/2019 19:11", "keyEvent:" : "DH 7/25/2018 00:08", "loadData:" : "C.G. 6/21/2018 10:58", - "login" : "ok 7/9/2019 19:11", + "login" : "tg 7/18/2019 22:50", "loginMorph" : "C.G. 7/25/2018 14:24", "loginMorph:" : "pm 6/9/2019 17:12", - "makeDataDictionary" : "C.G. 7/25/2018 12:16", "nameHelpText" : "DH 6/12/2018 22:36", "parseStringToBool:" : "C.G. 6/21/2018 00:32", "password" : "C.G. 7/25/2018 14:24", diff --git a/packages/IMAPClient-UI.package/ICPasswordDialog.class/instance/buildWith..st b/packages/IMAPClient-UI.package/ICPasswordDialog.class/instance/buildWith..st index 096dec35..346ca720 100644 --- a/packages/IMAPClient-UI.package/ICPasswordDialog.class/instance/buildWith..st +++ b/packages/IMAPClient-UI.package/ICPasswordDialog.class/instance/buildWith..st @@ -5,7 +5,7 @@ buildWith: builder window := builder build: (builder pluggableWindowSpec new model: self; - label: (self data at: 'name'); + label: (self data at: 'accountName'); extent: 200 @ 100; children: { self buildPasswordField: builder. diff --git a/packages/IMAPClient-UI.package/ICPasswordDialog.class/methodProperties.json b/packages/IMAPClient-UI.package/ICPasswordDialog.class/methodProperties.json index 620c5675..99901c23 100644 --- a/packages/IMAPClient-UI.package/ICPasswordDialog.class/methodProperties.json +++ b/packages/IMAPClient-UI.package/ICPasswordDialog.class/methodProperties.json @@ -4,7 +4,7 @@ "instance" : { "buildAddPasswordButton:" : "pm 6/25/2019 16:58", "buildPasswordField:" : "pm 6/25/2019 16:57", - "buildWith:" : "pm 6/25/2019 16:59", + "buildWith:" : "tg 7/18/2019 23:09", "data" : "C.G. 7/25/2018 14:25", "data:" : "pm 6/9/2019 17:14", "folderDialogInstance" : "C.G. 7/25/2018 14:25", From c2bf66c65fb1c706ec2f90af11d183f0239705f9 Mon Sep 17 00:00:00 2001 From: Tim Garrels Date: Fri, 19 Jul 2019 09:56:51 +0200 Subject: [PATCH 11/12] Fixed "Account edit" --- .../ICLoginDialog.class/instance/loadData..st | 2 +- .../ICLoginDialog.class/methodProperties.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/loadData..st b/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/loadData..st index 220781f7..e2fec747 100644 --- a/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/loadData..st +++ b/packages/IMAPClient-UI.package/ICLoginDialog.class/instance/loadData..st @@ -1,7 +1,7 @@ accessing loadData: dataDictionary - self accountName: (dataDictionary at: 'name:'). + self accountName: (dataDictionary at: 'accountName'). self serverAddress: (dataDictionary at: 'address'). self serverPort: (dataDictionary at: 'port') asString. self username: (dataDictionary at: 'username'). diff --git a/packages/IMAPClient-UI.package/ICLoginDialog.class/methodProperties.json b/packages/IMAPClient-UI.package/ICLoginDialog.class/methodProperties.json index 47063a31..78853c78 100644 --- a/packages/IMAPClient-UI.package/ICLoginDialog.class/methodProperties.json +++ b/packages/IMAPClient-UI.package/ICLoginDialog.class/methodProperties.json @@ -44,7 +44,7 @@ "inputCollection:" : "pm 6/9/2019 17:12", "insertDefaults" : "ok 7/9/2019 19:11", "keyEvent:" : "DH 7/25/2018 00:08", - "loadData:" : "C.G. 6/21/2018 10:58", + "loadData:" : "tg 7/19/2019 09:56", "login" : "tg 7/18/2019 22:50", "loginMorph" : "C.G. 7/25/2018 14:24", "loginMorph:" : "pm 6/9/2019 17:12", From 79ebd00754af2ac24f817552e29ea8e935117eb6 Mon Sep 17 00:00:00 2001 From: Tim Garrels Date: Fri, 19 Jul 2019 10:02:49 +0200 Subject: [PATCH 12/12] Fixed Test Defaults --- .../class/defaultConfigurationDictionary.st | 4 ++-- .../class/defaultInvalidKeysConfigurationDictionary.st | 2 +- .../methodProperties.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/IMAPClient-Tests.package/ICEndPointConnectionConfigurationsTest.class/class/defaultConfigurationDictionary.st b/packages/IMAPClient-Tests.package/ICEndPointConnectionConfigurationsTest.class/class/defaultConfigurationDictionary.st index 4a681596..5b2093ee 100644 --- a/packages/IMAPClient-Tests.package/ICEndPointConnectionConfigurationsTest.class/class/defaultConfigurationDictionary.st +++ b/packages/IMAPClient-Tests.package/ICEndPointConnectionConfigurationsTest.class/class/defaultConfigurationDictionary.st @@ -2,9 +2,9 @@ constants defaultConfigurationDictionary ^ Dictionary newFrom: { - 'name' -> 'accountname'. + 'accountName' -> 'accountname'. 'address' -> 'imap.test.de'. - 'port' -> '42'. + 'port' -> 42. 'username' -> 'test@test.test'. 'ssl' -> true. } \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointConnectionConfigurationsTest.class/class/defaultInvalidKeysConfigurationDictionary.st b/packages/IMAPClient-Tests.package/ICEndPointConnectionConfigurationsTest.class/class/defaultInvalidKeysConfigurationDictionary.st index 77c9aa35..be79aed4 100644 --- a/packages/IMAPClient-Tests.package/ICEndPointConnectionConfigurationsTest.class/class/defaultInvalidKeysConfigurationDictionary.st +++ b/packages/IMAPClient-Tests.package/ICEndPointConnectionConfigurationsTest.class/class/defaultInvalidKeysConfigurationDictionary.st @@ -3,7 +3,7 @@ defaultInvalidKeysConfigurationDictionary ^ Dictionary newFrom: { 'address' -> 'imap.test.de'. - 'bort' -> '42'. + 'bort' -> 42. 'username' -> 'test@test.test'. 'ssl' -> true. } \ No newline at end of file diff --git a/packages/IMAPClient-Tests.package/ICEndPointConnectionConfigurationsTest.class/methodProperties.json b/packages/IMAPClient-Tests.package/ICEndPointConnectionConfigurationsTest.class/methodProperties.json index f1912bff..a518f7a1 100644 --- a/packages/IMAPClient-Tests.package/ICEndPointConnectionConfigurationsTest.class/methodProperties.json +++ b/packages/IMAPClient-Tests.package/ICEndPointConnectionConfigurationsTest.class/methodProperties.json @@ -1,7 +1,7 @@ { "class" : { - "defaultConfigurationDictionary" : "tg 6/20/2019 15:02", - "defaultInvalidKeysConfigurationDictionary" : "tg 6/20/2019 15:02", + "defaultConfigurationDictionary" : "tg 7/19/2019 10:02", + "defaultInvalidKeysConfigurationDictionary" : "tg 7/19/2019 10:02", "invalidDataDictionaryErrorMessage" : "pm 6/19/2019 14:26" }, "instance" : { "previousConnectionConfigurations" : "pm 6/11/2019 19:44",