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

Feature/o365 mfa #2725

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Feature/o365 mfa #2725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
bf448d1
WIP for O365 MFA. issue #2724
j-dimension Dec 6, 2024
c7793ea
WIP for O365 MFA. issue #2724
j-dimension Dec 6, 2024
81e0e69
WIP for O365 MFA. issue #2724
j-dimension Dec 6, 2024
1967481
WIP for O365 MFA. issue #2724
j-dimension Dec 6, 2024
f76f11a
prototype for O365 and MFA. #2724
j-dimension Dec 6, 2024
aa45e5e
prototype for O365 and MFA. #2724
j-dimension Dec 6, 2024
bee87a6
fixed typo. #2724
j-dimension Dec 6, 2024
5b25e50
udpated reconnect attempt. #2724
j-dimension Dec 6, 2024
d6d5e94
reconnect logic. issue #2724
j-dimension Dec 6, 2024
df84e10
update auth token upon client start - server could have been down and…
j-dimension Dec 8, 2024
d467adf
added caching of message envelopes. issue #2724
j-dimension Dec 8, 2024
203d349
fix NPE when from of a message is null. issue #2724
j-dimension Dec 8, 2024
5b76ae9
fixed error during email test receive / send. issue #2724
j-dimension Dec 8, 2024
89aec7d
caching for number of total messages. issue #2724
j-dimension Dec 8, 2024
f9890a1
open and close folder for getting number of unread messages. #2724
j-dimension Dec 9, 2024
5e29690
proper encoding of recipients / senders. reconnecting to folder when …
j-dimension Dec 10, 2024
f0caddc
renaming a document did not change for filename conflicts.
j-dimension Dec 10, 2024
3e044a8
do not open folder to get number of unread messages in case it is clo…
j-dimension Dec 10, 2024
409a84a
do not open folder to get number of total messages in case it is clos…
j-dimension Dec 10, 2024
ac64d47
avoid opening folder. #2724
j-dimension Dec 10, 2024
02feb1b
version 3.1.0.0
j-dimension Dec 11, 2024
41547a4
fix loading issue when using "unread" restriction. close #2733
j-dimension Dec 11, 2024
51df894
added server side logging for exception cases. #2724
j-dimension Dec 12, 2024
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
10 changes: 3 additions & 7 deletions j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/MailSettingsTestAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,10 +698,8 @@ public class MailSettingsTestAction extends ProgressableAction {

private boolean isMsExchange=false;
private String authToken=null;
private String clientId=null;
private String clientSecret=null;

public MailSettingsTestAction(ProgressIndicator i, JDialog owner, JButton cmdTestMail, String address, String outServer, String outPort, String outUser, String outPwd, boolean outSsl, boolean outStartTls, String inServer, String inUser, String inPwd, boolean inSsl, String inType, boolean isMsExchange, String clientId, String clientSecret, String authToken) {
public MailSettingsTestAction(ProgressIndicator i, JDialog owner, JButton cmdTestMail, String address, String outServer, String outPort, String outUser, String outPwd, boolean outSsl, boolean outStartTls, String inServer, String inUser, String inPwd, boolean inSsl, String inType, boolean isMsExchange, String authToken) {
super(i, false);
this.owner = owner;
this.cmdTestMail = cmdTestMail;
Expand All @@ -721,8 +719,6 @@ public MailSettingsTestAction(ProgressIndicator i, JDialog owner, JButton cmdTes

this.isMsExchange=isMsExchange;
this.authToken=authToken;
this.clientId=clientId;
this.clientSecret=clientSecret;
}

@Override
Expand Down Expand Up @@ -758,12 +754,12 @@ public boolean execute() throws Exception {
port = Integer.parseInt(this.outPort);
}
this.progress("Test läuft (Versand)...");
sysMan.testSendMail(this.outServer, port, this.outUser, this.outPwd, this.outSsl, this.outStartTls, this.address);
sysMan.testSendMail(this.outServer, port, this.outUser, this.outPwd, this.outSsl, this.outStartTls, this.address, this.isMsExchange, this.authToken);
this.progress("VERSAND: Testnachricht erfolgreich verschickt - bitte Posteingang prüfen");
Thread.sleep(5000);
process="Empfang / Posteingang";
this.progress("Test läuft (Empfang)...");
sysMan.testReceiveMail(this.address, this.inServer, this.inType, this.inSsl, this.inUser, this.inPwd, this.isMsExchange, this.clientId, this.clientSecret, this.authToken);
sysMan.testReceiveMail(this.address, this.inServer, this.inType, this.inSsl, this.inUser, this.inPwd, this.isMsExchange, this.authToken);
this.progress("EMPFANG: Posteingang erfolgreich geprüft");
Thread.sleep(3000);
SwingUtilities.invokeLater(() -> {
Expand Down
234 changes: 132 additions & 102 deletions j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/MailboxSetupDialog.form
View file
Open in desktop

Large diffs are not rendered by default.

283 changes: 159 additions & 124 deletions j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/MailboxSetupDialog.java
View file
Open in desktop

Large diffs are not rendered by default.

138 changes: 138 additions & 0 deletions j-lawyer-client/src/com/jdimension/jlawyer/client/configuration/O365OAuthCouplingDialog.form
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
<?xml version="1.0" encoding="UTF-8" ?>

<Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<Properties>
<Property name="defaultCloseOperation" type="int" value="2"/>
</Properties>
<SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
<SyntheticProperty name="generateCenter" type="boolean" value="false"/>
</SyntheticProperties>
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
</AuxValues>

<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="progress" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="txtUrl" max="32767" attributes="0"/>
<Component id="txtCode" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="cmdCopy" max="32767" attributes="0"/>
<Component id="cmdUrl" max="32767" attributes="0"/>
</Group>
</Group>
<Group type="102" alignment="1" attributes="0">
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="cmdCancelPolling" alignment="1" min="-2" max="-2" attributes="0"/>
<Component id="cmdOk" alignment="1" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="txtUrl" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="cmdUrl" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="txtCode" max="32767" attributes="0"/>
<Component id="cmdCopy" max="32767" attributes="0"/>
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="progress" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cmdCancelPolling" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="cmdOk" min="-2" max="-2" attributes="0"/>
<EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="javax.swing.JTextField" name="txtUrl">
</Component>
<Component class="javax.swing.JButton" name="cmdUrl">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons16/web.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Link im Browser &#xf6;ffnen"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cmdUrlActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JTextField" name="txtCode">
</Component>
<Component class="javax.swing.JButton" name="cmdCopy">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons16/editpaste.png"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value="Code in Zwischenablage kopieren"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cmdCopyActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JProgressBar" name="progress">
<Properties>
<Property name="string" type="java.lang.String" value=" "/>
<Property name="stringPainted" type="boolean" value="true"/>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="cmdCancelPolling">
<Properties>
<Property name="text" type="java.lang.String" value="Abbrechen"/>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="cmdOk">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
<Image iconType="3" name="/icons/agt_action_success.png"/>
</Property>
<Property name="text" type="java.lang.String" value="Schliessen"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cmdOkActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="jLabel1">
<Properties>
<Property name="text" type="java.lang.String" value="&#xd6;ffnen Sie den untenstehenden Link und geben Sie den Code ein."/>
</Properties>
</Component>
</SubComponents>
</Form>
Loading