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

[stable15] Clear backupcode reminder when no 2fa #14559

Merged
merged 2 commits into from Mar 6, 2019

Conversation

@backportbot-nextcloud
Copy link

backportbot-nextcloud bot commented Mar 6, 2019

backport of #14553

rullzer added some commits Mar 5, 2019

Clear backupcodes reminder if no 2FA is enabled
Fixes #14125

Listen to 2FA disable event. If a provider is disabled for a user. We
check if there are no more providers. If there are no more providers we
Remove the backupcode reminder notification (if still present).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Do not send notification if no active 2fa
If the job is still present we should also not fire it off if there is
not a single active 2FA provider.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer

rullzer approved these changes Mar 6, 2019

@faily-bot

This comment has been minimized.

Copy link

faily-bot bot commented Mar 6, 2019

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 16807: failure

DB=mysql, ENABLE_REDIS=false, PHP=7.3

Show full log
There was 1 failure:

1) TrashbinTest::testExpireOldFiles
Failed asserting that null is identical to 'file2.txt'.

/drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:186

--

There was 1 risky test:

1) OCA\TwoFactorBackupCodes\Tests\Db\BackupCodeMapperTest::testInsertArgonEncryptedCodes
This test did not perform any assertions

TESTS=acceptance, TESTS-ACCEPTANCE=app-comments

  • cancelled - typically means that the tests took longer than the drone CI allows them to run

TESTS=acceptance, TESTS-ACCEPTANCE=app-files

  • tests/acceptance/features/app-files.feature:41
  • tests/acceptance/features/app-files.feature:79
  • tests/acceptance/features/app-files.feature:206
Show full log
  Scenario: viewing a favorite file in its folder shows the correct sidebar view # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files.feature:41
    Given I am logged in                                                         # LoginPageContext::iAmLoggedIn()
    And I create a new folder named "other"                                      # FileListContext::iCreateANewFolderNamed()
      │ Create menu button in file list could not be clicked
      │ Exception message: Element is not currently visible and so may not be interacted with
      │ Build info: version: '2.53.1', revision: 'a36b8b1', time: '2016-06-30 17:37:03'
      │ System info: host: '28f0b06e71c1', ip: '172.17.0.12', os.name: 'Linux', os.arch: 'amd64', os.version: '4.15.0-43-generic', java.version: '1.8.0_91'
      │ Driver info: driver.version: unknown
      │ Trying again
      │ 
    And I mark "other" as favorite                                               # FileListContext::iMarkAsFavorite()
    And I mark "welcome.txt" as favorite                                         # FileListContext::iMarkAsFavorite()
    And I see that "other" is marked as favorite                                 # FileListContext::iSeeThatIsMarkedAsFavorite()
    And I see that "welcome.txt" is marked as favorite                           # FileListContext::iSeeThatIsMarkedAsFavorite()
    And I open the "Favorites" section                                           # AppNavigationContext::iOpenTheSection()
    And I open the details view for "other"                                      # FileListContext::iOpenTheDetailsViewFor()
    And I see that the details view is open                                      # FilesAppContext::iSeeThatTheDetailsViewIsOpen()
    And I see that the file name shown in the details view is "other"            # FilesAppContext::iSeeThatTheFileNameShownInTheDetailsViewIs()
    When I view "welcome.txt" in folder                                          # FileListContext::iViewInFolder()
      Row for file welcome.txt in file list could not be found after 100 seconds
      File actions menu button for file welcome.txt in file list could not be found after 100 seconds (NoSuchElementException)
    Then I see that the current section is "All files"                           # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    And I see that the details view is open                                      # FilesAppContext::iSeeThatTheDetailsViewIsOpen()
    And I see that the file name shown in the details view is "welcome.txt"      # FilesAppContext::iSeeThatTheFileNameShownInTheDetailsViewIs()
    When I open the details view for "other"                                     # FileListContext::iOpenTheDetailsViewFor()
    And I see that the file name shown in the details view is "other"            # FilesAppContext::iSeeThatTheFileNameShownInTheDetailsViewIs()

  Scenario: show recent files for a second time                               # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files.feature:79
    Given I am logged in                                                      # LoginPageContext::iAmLoggedIn()
    And I open the "Recent" section                                           # AppNavigationContext::iOpenTheSection()
    And I see that the current section is "Recent"                            # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    And I open the "All files" section                                        # AppNavigationContext::iOpenTheSection()
    And I see that the current section is "All files"                         # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    And I create a new folder named "Folder just created"                     # FileListContext::iCreateANewFolderNamed()
    When I open the "Recent" section                                          # AppNavigationContext::iOpenTheSection()
    Then I see that the current section is "Recent"                           # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    Then I see that the file list contains a file named "Folder just created" # FileListContext::iSeeThatTheFileListContainsAFileNamed()
      Row for file Folder just created in file list could not be found after 100 seconds (NoSuchElementException)

  Scenario: rename a file with the details view open                         # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files.feature:206
    Given I am logged in                                                     # LoginPageContext::iAmLoggedIn()
    And I open the details view for "welcome.txt"                            # FileListContext::iOpenTheDetailsViewFor()
    When I rename "welcome.txt" to "farewell.txt"                            # FileListContext::iRenameTo()
    Then I see that the file list contains a file named "farewell.txt"       # FileListContext::iSeeThatTheFileListContainsAFileNamed()
      Row for file farewell.txt in file list could not be found after 100 seconds (NoSuchElementException)
    And I see that the file name shown in the details view is "farewell.txt" # FilesAppContext::iSeeThatTheFileNameShownInTheDetailsViewIs()

TESTS=acceptance, TESTS-ACCEPTANCE=app-files-tags

  • tests/acceptance/features/app-files-tags.feature:42
Show full log
  Scenario: add tags using the dropdown in the details view                                 # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files-tags.feature:42
    Given I am logged in as the admin                                                       # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I visit the settings page                                                           # SettingsMenuContext::iVisitTheSettingsPage()
    And I open the "Workflow" section                                                       # AppNavigationContext::iOpenTheSection()
    And I see that the button to select tags is shown                                       # SettingsContext::iSeeThatTheButtonToSelectTagsIsShown()
    And I create the tag "tag1" in the settings                                             # SettingsContext::iCreateTheTagInTheSettings()
    And I create the tag "tag2" in the settings                                             # SettingsContext::iCreateTheTagInTheSettings()
    And I create the tag "tag3" in the settings                                             # SettingsContext::iCreateTheTagInTheSettings()
    And I create the tag "tag4" in the settings                                             # SettingsContext::iCreateTheTagInTheSettings()
    And I see that the dropdown for tags in the settings eventually contains the tag "tag1" # SettingsContext::iSeeThatTheDropdownForTagsInTheSettingsEventuallyContainsTheTag()
    And I see that the dropdown for tags in the settings eventually contains the tag "tag2" # SettingsContext::iSeeThatTheDropdownForTagsInTheSettingsEventuallyContainsTheTag()
    And I see that the dropdown for tags in the settings eventually contains the tag "tag3" # SettingsContext::iSeeThatTheDropdownForTagsInTheSettingsEventuallyContainsTheTag()
    And I see that the dropdown for tags in the settings eventually contains the tag "tag4" # SettingsContext::iSeeThatTheDropdownForTagsInTheSettingsEventuallyContainsTheTag()
    And I log out                                                                           # SettingsMenuContext::iLogOut()
    And I am logged in                                                                      # LoginPageContext::iAmLoggedIn()
    And I open the details view for "welcome.txt"                                           # FileListContext::iOpenTheDetailsViewFor()
    And I open the input field for tags in the details view                                 # FilesAppContext::iOpenTheInputFieldForTagsInTheDetailsView()
    When I check the tag "tag2" in the dropdown for tags in the details view                # FilesAppContext::iCheckTheTagInTheDropdownForTagsInTheDetailsView()
    And I check the tag "tag4" in the dropdown for tags in the details view                 # FilesAppContext::iCheckTheTagInTheDropdownForTagsInTheDetailsView()
    Then I see that the tag "tag2" in the dropdown for tags in the details view is checked  # FilesAppContext::iSeeThatTheTagInTheDropdownForTagsInTheDetailsViewIsChecked()
    And I see that the tag "tag4" in the dropdown for tags in the details view is checked   # FilesAppContext::iSeeThatTheTagInTheDropdownForTagsInTheDetailsViewIsChecked()
    And I see that the input field for tags in the details view contains the tag "tag2"     # FilesAppContext::iSeeThatTheInputFieldForTagsInTheDetailsViewContainsTheTag()
      Failed asserting that false is true.
    And I see that the input field for tags in the details view contains the tag "tag4"     # FilesAppContext::iSeeThatTheInputFieldForTagsInTheDetailsViewContainsTheTag()

@MorrisJobke MorrisJobke merged commit 0da0ee1 into stable15 Mar 6, 2019

1 check failed

continuous-integration/drone/pr the build failed
Details

@MorrisJobke MorrisJobke deleted the backport/14553/stable15 branch Mar 6, 2019

@rullzer rullzer referenced this pull request Mar 29, 2019

Merged

15.0.6 RC 1 #14909

1 of 1 task complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.