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.

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

enable user hooks only for internal backend #95

Merged
merged 7 commits into from
Mar 7, 2018
Merged

Conversation

sualko
Copy link
Member

@sualko sualko commented Mar 1, 2018

fix #91

@sualko sualko requested a review from LEDfan March 1, 2018 14:21
@sualko sualko changed the title enable user hooks only for internal backend (fix #91) enable user hooks only for internal backend Mar 1, 2018
@codecov
Copy link

codecov bot commented Mar 2, 2018

Codecov Report

Merging #95 into master will not change coverage.
The diff coverage is 66.66%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master      #95   +/-   ##
=========================================
  Coverage     81.71%   81.71%           
+ Complexity      278      277    -1     
=========================================
  Files            31       31           
  Lines          1083     1083           
=========================================
  Hits            885      885           
  Misses          198      198
Impacted Files Coverage Δ Complexity Δ
lib/Settings/Admin.php 0% <0%> (ø) 4 <0> (-1) ⬇️
lib/Controller/SettingsController.php 57.8% <100%> (ø) 59 <0> (ø) ⬇️
lib/Controller/ManagedServerController.php 100% <100%> (ø) 15 <0> (ø) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6b5cce6...74c9c11. Read the comment docs.

@@ -52,7 +53,7 @@ public function process(IEntry $entry)
$config = \OC::$server->getConfig();
$xmppPreferMail = $config->getAppValue('ojsxc', 'xmppPreferMail', false);
$xmppPreferMail = $xmppPreferMail === true || $xmppPreferMail === 'true';
$serverType = $config->getAppValue('ojsxc', 'serverType', 'external');
Copy link
Member

Choose a reason for hiding this comment

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

@sualko This was not intentional I guess? (That the default is external)

Copy link
Member Author

Choose a reason for hiding this comment

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

You are right 👍

Copy link
Member Author

Choose a reason for hiding this comment

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

btw I added another commit which substitutes all server type string literals with constants.

@LEDfan
Copy link
Member

LEDfan commented Mar 7, 2018

@sualko AFAIK the default the backend is internal, but this wasn't used in the check. I added a static method to ensure it's the same in the whole code base.

@LEDfan LEDfan mentioned this pull request Mar 7, 2018
1 task
@LEDfan
Copy link
Member

LEDfan commented Mar 7, 2018

@sualko I just fixed an incompatibility with NC 14 (https://travis-ci.org/nextcloud/jsxc.nextcloud/jobs/350202403#L570)

@sualko
Copy link
Member Author

sualko commented Mar 7, 2018

This was already fixed in #96

@LEDfan LEDfan force-pushed the patch-user-hooks branch from 213e493 to deeeabc Compare March 7, 2018 08:22
@sualko
Copy link
Member Author

sualko commented Mar 7, 2018

I will remove your commit and merge master with a forced push.

@LEDfan
Copy link
Member

LEDfan commented Mar 7, 2018

.... I just discovered that, removed my commit again.. Sorry 🙈

@sualko sualko merged commit d373e0b into master Mar 7, 2018
@sualko sualko deleted the patch-user-hooks branch March 7, 2018 08:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

deleting an LDAP user takes several minutes when jsxc.nextcloud is active
2 participants