Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor/252 ICAccount info #254

Merged
merged 12 commits into from
Jul 19, 2019
Merged

Refactor/252 ICAccount info #254

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ed2e5e2
Literally just merged ICAuthenticationInfo with ICServerInfo. Had to …
timgarrels Jul 10, 2019
9e534ce
Reworked the endpoint login and connection system to work with the ne…
timgarrels Jul 10, 2019
b1a016b
Fixed renaming issue
timgarrels Jul 10, 2019
969a893
Removed unused method
timgarrels Jul 11, 2019
469c65b
Removed unused method
timgarrels Jul 11, 2019
6c2526c
Renamed ICAccountInfo contructor (legacy artifact)
timgarrels Jul 11, 2019
518bf57
Review Requests on #254
timgarrels Jul 15, 2019
7f1dbd5
Recategorization and little code beautification
timgarrels Jul 15, 2019
6667a2c
name-attribut artifact replacement
timgarrels Jul 18, 2019
8211654
Made everything use anAccountINfo instead of Dictionary
timgarrels Jul 18, 2019
c2bf66c
Fixed "Account edit"
timgarrels Jul 19, 2019
79ebd00
Fixed Test Defaults
timgarrels Jul 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added packages/IMAPClient-Core.package/ICAccountInfo.class/README.md
View file
Open in desktop
Empty file.
4 changes: 4 additions & 0 deletions packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialAccountName.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
constants
initialAccountName

^ String empty
4 changes: 4 additions & 0 deletions packages/IMAPClient-Core.package/ICAccountInfo.class/class/initialSsl.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
constants
initialSsl

^ true
2 changes: 1 addition & 1 deletion ...cationInfo.class/class/initialPassword.st → .../ICAccountInfo.class/class/invalidHost.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
constants
initialPassword
invalidHost

^ String empty
2 changes: 1 addition & 1 deletion ...cationInfo.class/class/initialUsername.st → ...ccountInfo.class/class/invalidPassword.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
constants
initialUsername
invalidPassword

^ String empty
2 changes: 1 addition & 1 deletion ...e/ICServerInfo.class/class/defaultPort.st → .../ICAccountInfo.class/class/invalidPort.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
constants
defaultPort
invalidPort

^ -1
4 changes: 4 additions & 0 deletions packages/IMAPClient-Core.package/ICAccountInfo.class/class/invalidUsername.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
constants
invalidUsername

^ String empty
9 changes: 9 additions & 0 deletions packages/IMAPClient-Core.package/ICAccountInfo.class/class/newWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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')
10 changes: 10 additions & 0 deletions ....package/ICAccountInfo.class/class/newWithAccountName.host.port.username.password.ssl..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
instance creation
newWithAccountName: name host: host port: port username: username password: password ssl: ssl
martintaraz marked this conversation as resolved.
Show resolved Hide resolved

^ self new
accountName: name;
host: host;
port: port;
username: username;
password: password;
ssl: ssl
4 changes: 4 additions & 0 deletions packages/IMAPClient-Core.package/ICAccountInfo.class/instance/accountName..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
accountName: aString

accountName := aString
4 changes: 4 additions & 0 deletions packages/IMAPClient-Core.package/ICAccountInfo.class/instance/accountName.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
accountName

^ accountName ifNil: [accountName := self class initialAccountName]
0 ...icationInfo.class/instance/canConvert..st → ...AccountInfo.class/instance/canConvert..st
View file
Open in desktop
File renamed without changes.
0 ...kage/ICServerInfo.class/instance/host..st → ...age/ICAccountInfo.class/instance/host..st
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions packages/IMAPClient-Core.package/ICAccountInfo.class/instance/host.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
host

^ host ifNil: [host := self class invalidHost]
4 changes: 4 additions & 0 deletions packages/IMAPClient-Core.package/ICAccountInfo.class/instance/isValid.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +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])
martintaraz marked this conversation as resolved.
Show resolved Hide resolved
0 ...nticationInfo.class/instance/password..st → ...ICAccountInfo.class/instance/password..st
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions packages/IMAPClient-Core.package/ICAccountInfo.class/instance/password.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
password

^ password ifNil: [self password: self class invalidPassword]
martintaraz marked this conversation as resolved.
Show resolved Hide resolved
0 ...fo.class/instance/passwordAsIMAPString.st → ...fo.class/instance/passwordAsIMAPString.st
View file
Open in desktop
File renamed without changes.
0 ...kage/ICServerInfo.class/instance/port..st → ...age/ICAccountInfo.class/instance/port..st
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions packages/IMAPClient-Core.package/ICAccountInfo.class/instance/port.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
port

^ port ifNil: [port := self class invalidPort]
4 changes: 4 additions & 0 deletions packages/IMAPClient-Core.package/ICAccountInfo.class/instance/printOn..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
printing
printOn: aStream

aStream nextPutAll: self accountName, ' ', self host, ' ', self port, ' ', self username, ' ', self password, ' ', self ssl
0 ...package/ICEndPoint.class/instance/ssl..st → ...kage/ICAccountInfo.class/instance/ssl..st
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions packages/IMAPClient-Core.package/ICAccountInfo.class/instance/ssl.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
ssl

^ ssl ifNil: [ssl := self class initialSsl]
0 ...nticationInfo.class/instance/username..st → ...ICAccountInfo.class/instance/username..st
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions packages/IMAPClient-Core.package/ICAccountInfo.class/instance/username.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
username

^ username ifNil: [self username: self class invalidUsername].
martintaraz marked this conversation as resolved.
Show resolved Hide resolved
0 ...fo.class/instance/usernameAsIMAPString.st → ...fo.class/instance/usernameAsIMAPString.st
View file
Open in desktop
File renamed without changes.
28 changes: 28 additions & 0 deletions packages/IMAPClient-Core.package/ICAccountInfo.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"class" : {
"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",
"accountName:" : "tg 7/10/2019 17:35",
"canConvert:" : "tg 7/10/2019 17:18",
"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",
"password:" : "tg 7/10/2019 17:18",
"passwordAsIMAPString" : "tg 7/10/2019 17:18",
"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 20:21",
"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" } }
10 changes: 7 additions & 3 deletions ...CAuthenticationInfo.class/properties.json → ...ckage/ICAccountInfo.class/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@
],
"classvars" : [
],
"commentStamp" : "tg 7/9/2019 14:40",
"commentStamp" : "",
"instvars" : [
"accountName",
"host",
"port",
"username",
"password" ],
"name" : "ICAuthenticationInfo",
"password",
"ssl" ],
"name" : "ICAccountInfo",
martintaraz marked this conversation as resolved.
Show resolved Hide resolved
"pools" : [
],
"super" : "Object",
Expand Down
2 changes: 0 additions & 2 deletions packages/IMAPClient-Core.package/ICAuthenticationInfo.class/README.md
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions packages/IMAPClient-Core.package/ICAuthenticationInfo.class/class/for.using..st
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/isValid.st
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/password.st
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions packages/IMAPClient-Core.package/ICAuthenticationInfo.class/instance/username.st
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions packages/IMAPClient-Core.package/ICAuthenticationInfo.class/methodProperties.json
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/accountInfo..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
accountInfo: anICAccountInfo

accountInfo := anICAccountInfo
4 changes: 4 additions & 0 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/accountInfo.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
accountInfo

^ accountInfo ifNil: [accountInfo := ICAccountInfo new]
12 changes: 6 additions & 6 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/asDictionary.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
martintaraz marked this conversation as resolved.
Show resolved Hide resolved
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
4 changes: 0 additions & 4 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/authenticationInfo..st
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/authenticationInfo.st
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/IMAPClient-Core.package/ICEndPoint.class/instance/checkConnected.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
error handling
checkConnected

(self fatalErrorOccured)
ifTrue: [^ false].

Expand Down
4 changes: 4 additions & 0 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/connect.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
connection
connect

self connectWith: SocketStream
4 changes: 0 additions & 4 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectTo.on..st
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectTo.on.with..st
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectTo.with..st
View file
Open in desktop

This file was deleted.

11 changes: 11 additions & 0 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/connectWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
connection
connectWith: aStreamClass

self accountInfo isValid ifFalse: [^ Error signal: self class errorInvalidConnectionConfiguration].

[self stream
ssl: self useSSL;
martintaraz marked this conversation as resolved.
Show resolved Hide resolved
connectTo: self accountInfo host on: self accountInfo port with: aStreamClass;
nextResponse "skip server greetings"]
on: Error
do: [self fatalErrorOccured: true]
14 changes: 14 additions & 0 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/fromAccountInfo..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
accessing
fromAccountInfo: anICAccountInfo
martintaraz marked this conversation as resolved.
Show resolved Hide resolved

self accountInfo: anICAccountInfo.

[self
connect;
login]
valueWithin: 2 seconds
onTimeout: [
(self fatalErrorOccured)
ifFalse: [
UIManager default inform: 'Connection could not be established'.
self fatalErrorOccured: true]]
14 changes: 0 additions & 14 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/fromDictionary..st
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/login.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 0 additions & 5 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/login.using..st
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/loginUsing..st
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/name..st
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/name.st
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/IMAPClient-Core.package/ICEndPoint.class/instance/rootFolderName.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
^ ICHelper hashNameForAccount: (self accountInfo host) and: (self accountInfo username)
4 changes: 0 additions & 4 deletions packages/IMAPClient-Core.package/ICEndPoint.class/instance/serverInfo..st
View file
Open in desktop

This file was deleted.

Loading