Skip to content

Issue 1202 org rules from fes - #1369

Merged
DenBond7 merged 20 commits into
masterfrom
issue_1202_org_rules_from_fes
Jul 29, 2021
Merged

Issue 1202 org rules from fes#1369
DenBond7 merged 20 commits into
masterfrom
issue_1202_org_rules_from_fes

Conversation

@DenBond7

@DenBond7DenBond7 commented Jul 27, 2021

Copy link
Copy Markdown
Collaborator

This PR added an ability to fetch OrgRules from FES

close#1202

Tests(delete all except exactly one):

  • Tests added or updated

To be filled by reviewers

I have reviewed that this PR... (tick whichever items you personally focused on during this review):

  • addresses the issue it closes (if any)
  • code is readable and understandable
  • is accompanied with tests, or tests are not needed
  • is free of vulnerabilities

@DenBond7DenBond7 added the PR submitted PR is submitted for this issue label Jul 27, 2021
@DenBond7DenBond7 added this to the 1.2.0: More OrgRules milestone Jul 27, 2021
tomholub
tomholub reviewed Jul 27, 2021
View reviewed changes
Comment threadFlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/FlowcryptApiRepository.kt Outdated
Comment threadFlowCrypt/src/main/java/com/flowcrypt/email/api/retrofit/response/api/DomainOrgRulesResponse.kt Outdated
DenBond7 added 12 commits July 27, 2021 15:51
@DenBond7
ApiService. Renamed API(s).|#1202
06e04c6
@DenBond7
Added ClientConfigurationResponse. Refactored code.|#1202
f93bdca
@DenBond7
SignInActivityEnterpriseTest. Added test request timeout.|#1202
ed577cf
@DenBond7
Fixed openssl-ca.cnf.|#1202
26e536d
@DenBond7
Regen a cert for localhost to allow https connection for *.localhost.|…
2e2f0ae
…#1202
@DenBond7
Added one more case to test "fes availability == false && request tim…
3ccd2d3
…eout == true && no connection == false". Refactored code.| #1202
@DenBond7
Added testing "fes availability == false && connection_issue == false…
0dca576
… && HTTP status code == 404".| #1202
@DenBond7
Added testing "fes availability == false && connection_issue == false…
dc3a103
… && HTTP status code != 404".| #1202
@DenBond7
Added testing "fes availability == true && service != "enterprise-ser…
b396aaa
…ver"".| #1202
@DenBond7
Added testing "fes availability == true && service == "enterprise-ser…
ec9fff3
…ver" && GET "https://fes.$domain/api/v1/client-configuration?domain=$domain" == SUCCESS".| #1202
@DenBond7
Added testing "fes availability == true && service == "enterprise-ser…
cd93bab
…ver" && GET "https://fes.$domain/api/v1/client-configuration?domain=$domain" == FAILED".| #1202
@DenBond7
Improved tests in SignInActivityEnterpriseTest.|#1202
081d472
@DenBond7
DenBond7 marked this pull request as ready for review July 29, 2021 08:03
@DenBond7
DenBond7 requested a review from tomholubJuly 29, 2021 08:03
tomholub
tomholub approved these changes Jul 29, 2021
View reviewed changes

@tomholubtomholub left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good. Will try the app

Comment threadFlowCrypt/src/main/java/com/flowcrypt/email/util/GeneralUtil.kt

suspend fun hasInternetAccess(): Boolean = withContext(Dispatchers.IO) {
val url = "https://www.google.com"
val connectionTimeoutInSeconds = 2000L

@tomholubtomholubJul 29, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inMilliseconds

@DenBond7DenBond7Jul 29, 2021

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@DenBond7
DenBond7 merged commit 8e38333 into masterJul 29, 2021
@DenBond7
DenBond7 deleted the issue_1202_org_rules_from_fes branch July 29, 2021 08:58
@tomholub

tomholub commented Jul 29, 2021

Copy link
Copy Markdown
Collaborator

I haven't tried it yet. It's ok - I'll test it from master.

@DenBond7

DenBond7 commented Jul 29, 2021

Copy link
Copy Markdown
CollaboratorAuthor

Upps... Sorry.

For me approved PR means it's ready for merging.

@tomholub

tomholub commented Jul 29, 2021

Copy link
Copy Markdown
Collaborator

Understood - that's fair :-)

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tomholubtomholubtomholub approved these changes
@IvanPizhenkoIvanPizhenkoAwaiting requested review from IvanPizhenko
@seisvelasseisvelasAwaiting requested review from seisvelas

Assignees

No one assigned

Labels

PR submittedPR is submitted for this issue

Projects

None yet

Milestone

1.2.0: Enterprise features

Development

Successfully merging this pull request may close these issues.

Retrieve OrgRules from FES before trying backend

2 participants

@DenBond7@tomholub