From 8f399f3c64468c377198915511b13dd363d24252 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 4 Jun 2018 21:52:26 -0400 Subject: [PATCH] cleanout old angular.js app --- dist/.publish | 1 - gulpfile.js | 499 --- settings.Preview.json | 9 - settings.Production.json | 9 - settings.json | 9 - src/app/accounts/accountsLoginController.js | 279 -- src/app/accounts/accountsLogoutController.js | 8 - src/app/accounts/accountsModule.js | 2 - .../accountsOrganizationAcceptController.js | 45 - .../accountsPasswordHintController.js | 13 - src/app/accounts/accountsRecoverController.js | 21 - .../accountsRecoverDeleteController.js | 13 - .../accounts/accountsRegisterController.js | 101 - .../accountsTwoFactorMethodsController.js | 43 - .../accounts/accountsVerifyEmailController.js | 28 - .../accountsVerifyRecoverDeleteController.js | 36 - src/app/accounts/views/accountsLogin.html | 7 - src/app/accounts/views/accountsLoginInfo.html | 49 - .../views/accountsLoginTwoFactor.html | 168 - .../views/accountsOrganizationAccept.html | 32 - .../accounts/views/accountsPasswordHint.html | 39 - src/app/accounts/views/accountsRecover.html | 56 - .../accounts/views/accountsRecoverDelete.html | 39 - src/app/accounts/views/accountsRegister.html | 82 - .../views/accountsTwoFactorMethods.html | 25 - .../accounts/views/accountsVerifyEmail.html | 8 - .../views/accountsVerifyRecoverDelete.html | 21 - src/app/apiInterceptor.js | 33 - src/app/app.js | 27 - src/app/config.js | 367 -- src/app/constants.js | 220 -- src/app/directives/apiFieldDirective.js | 30 - src/app/directives/apiFormDirective.js | 45 - src/app/directives/directivesModule.js | 2 - src/app/directives/fallbackSrcDirective.js | 11 - src/app/directives/letterAvatarDirective.js | 151 - src/app/directives/masterPasswordDirective.js | 38 - src/app/directives/pageTitleDirective.js | 22 - src/app/directives/passwordMeterDirective.js | 73 - src/app/directives/passwordViewerDirective.js | 27 - src/app/directives/stopClickDirective.js | 11 - src/app/directives/stopPropDirective.js | 10 - src/app/directives/totpDirective.js | 193 - src/app/filters/enumLabelClassFilter.js | 32 - src/app/filters/enumNameFilter.js | 46 - src/app/filters/filtersModule.js | 2 - src/app/global/globalModule.js | 2 - src/app/global/mainController.js | 187 - src/app/global/paidOrgRequiredController.js | 26 - src/app/global/premiumRequiredController.js | 17 - src/app/global/sideNavController.js | 57 - src/app/global/topNavController.js | 14 - ...rganizationBillingAdjustSeatsController.js | 37 - ...anizationBillingAdjustStorageController.js | 37 - ...anizationBillingChangePaymentController.js | 64 - ...organizationBillingChangePlanController.js | 14 - .../organizationBillingController.js | 305 -- ...anizationBillingUpdateLicenseController.js | 30 - ...organizationBillingVerifyBankController.js | 25 - .../organizationCollectionsAddController.js | 120 - .../organizationCollectionsController.js | 107 - .../organizationCollectionsEditController.js | 139 - .../organizationCollectionsUsersController.js | 63 - .../organizationDashboardController.js | 19 - .../organizationDeleteController.js | 25 - .../organizationEventsController.js | 100 - .../organizationGroupsAddController.js | 87 - .../organizationGroupsController.js | 99 - .../organizationGroupsEditController.js | 110 - .../organizationGroupsUsersController.js | 57 - src/app/organization/organizationModule.js | 2 - .../organizationPeopleController.js | 162 - .../organizationPeopleEditController.js | 104 - .../organizationPeopleEventsController.js | 75 - .../organizationPeopleGroupsController.js | 85 - .../organizationPeopleInviteController.js | 91 - .../organizationSettingsController.js | 111 - .../organizationSettingsExportController.js | 155 - .../organizationSettingsImportController.js | 129 - .../organizationVaultAddCipherController.js | 141 - .../organizationVaultAttachmentsController.js | 90 - ...izationVaultCipherCollectionsController.js | 83 - ...organizationVaultCipherEventsController.js | 104 - .../organizationVaultController.js | 280 -- .../organizationVaultEditCipherController.js | 148 - .../views/organizationBilling.html | 230 -- .../views/organizationBillingAdjustSeats.html | 46 - .../views/organizationBillingChangePlan.html | 14 - .../views/organizationBillingVerifyBank.html | 43 - .../views/organizationCollections.html | 70 - .../views/organizationCollectionsAdd.html | 83 - .../views/organizationCollectionsEdit.html | 84 - .../views/organizationCollectionsUsers.html | 64 - .../views/organizationDashboard.html | 34 - .../views/organizationDelete.html | 34 - .../views/organizationEvents.html | 67 - .../views/organizationGroups.html | 70 - .../views/organizationGroupsAdd.html | 95 - .../views/organizationGroupsEdit.html | 95 - .../views/organizationGroupsUsers.html | 55 - .../views/organizationPeople.html | 96 - .../views/organizationPeopleEdit.html | 101 - .../views/organizationPeopleEvents.html | 56 - .../views/organizationPeopleGroups.html | 55 - .../views/organizationPeopleInvite.html | 110 - .../views/organizationSettings.html | 124 - .../organization/views/organizationVault.html | 142 - .../organizationVaultCipherCollections.html | 52 - .../views/organizationVaultCipherEvents.html | 60 - src/app/reports/reportsBreachController.js | 38 - src/app/reports/reportsModule.js | 2 - src/app/reports/views/reportsBreach.html | 74 - src/app/services/apiService.js | 222 -- src/app/services/authService.js | 259 -- src/app/services/cipherService.js | 570 --- src/app/services/cryptoService.js | 954 ----- src/app/services/eventService.js | 269 -- src/app/services/importService.js | 3184 ----------------- src/app/services/passwordService.js | 136 - src/app/services/servicesModule.js | 2 - src/app/services/tokenService.js | 90 - src/app/services/utilsService.js | 47 - src/app/services/validationService.js | 102 - src/app/settings.js | 2 - ...ttingsAddEditEquivalentDomainController.js | 19 - .../settingsBillingAdjustStorageController.js | 37 - .../settingsBillingChangePaymentController.js | 101 - src/app/settings/settingsBillingController.js | 225 -- .../settingsBillingUpdateLicenseController.js | 30 - .../settings/settingsChangeEmailController.js | 63 - .../settingsChangePasswordController.js | 63 - src/app/settings/settingsController.js | 143 - .../settingsCreateOrganizationController.js | 145 - src/app/settings/settingsDeleteController.js | 31 - src/app/settings/settingsDomainsController.js | 103 - src/app/settings/settingsModule.js | 2 - src/app/settings/settingsPremiumController.js | 136 - src/app/settings/settingsPurgeController.js | 24 - .../settings/settingsSessionsController.js | 32 - .../settingsTwoStepAuthenticatorController.js | 108 - src/app/settings/settingsTwoStepController.js | 83 - .../settings/settingsTwoStepDuoController.js | 124 - .../settingsTwoStepEmailController.js | 114 - .../settingsTwoStepRecoverController.js | 49 - .../settings/settingsTwoStepU2fController.js | 117 - .../settings/settingsTwoStepYubiController.js | 116 - .../settings/settingsUpdateKeyController.js | 81 - src/app/settings/views/settings.html | 164 - .../settingsAddEditEquivalentDomain.html | 35 - src/app/settings/views/settingsBilling.html | 178 - .../views/settingsBillingAdjustStorage.html | 46 - .../views/settingsBillingChangePayment.html | 433 --- .../views/settingsBillingUpdateLicense.html | 30 - .../settings/views/settingsChangeEmail.html | 58 - .../views/settingsChangePassword.html | 43 - .../views/settingsCreateOrganization.html | 697 ---- src/app/settings/views/settingsDelete.html | 30 - src/app/settings/views/settingsDomains.html | 117 - src/app/settings/views/settingsPremium.html | 487 --- src/app/settings/views/settingsPurge.html | 33 - src/app/settings/views/settingsSessions.html | 37 - src/app/settings/views/settingsTwoStep.html | 52 - .../views/settingsTwoStepAuthenticator.html | 116 - .../settings/views/settingsTwoStepDuo.html | 76 - .../settings/views/settingsTwoStepEmail.html | 77 - .../views/settingsTwoStepRecover.html | 48 - .../settings/views/settingsTwoStepU2f.html | 93 - .../settings/views/settingsTwoStepYubi.html | 127 - src/app/settings/views/settingsUpdateKey.html | 47 - src/app/tools/toolsController.js | 20 - src/app/tools/toolsExportController.js | 145 - src/app/tools/toolsImportController.js | 344 -- src/app/tools/toolsModule.js | 2 - src/app/tools/views/tools.html | 32 - src/app/tools/views/toolsExport.html | 33 - src/app/tools/views/toolsImport.html | 48 - src/app/vault/vaultAddCipherController.js | 156 - src/app/vault/vaultAddFolderController.js | 19 - src/app/vault/vaultAttachmentsController.js | 122 - .../vault/vaultCipherCollectionsController.js | 128 - src/app/vault/vaultController.js | 535 --- src/app/vault/vaultEditCipherController.js | 180 - src/app/vault/vaultEditFolderController.js | 25 - src/app/vault/vaultModule.js | 2 - src/app/vault/vaultMoveCiphersController.js | 28 - src/app/vault/vaultShareCipherController.js | 184 - src/app/vault/views/vault.html | 235 -- src/app/vault/views/vaultAddCipher.html | 616 ---- src/app/vault/views/vaultAddFolder.html | 24 - src/app/vault/views/vaultAttachments.html | 75 - .../vault/views/vaultCipherCollections.html | 55 - src/app/vault/views/vaultEditCipher.html | 621 ---- src/app/vault/views/vaultEditFolder.html | 24 - src/app/vault/views/vaultMoveCiphers.html | 34 - src/app/vault/views/vaultShareCipher.html | 75 - src/app/views/backendLayout.html | 10 - src/app/views/frontendLayout.html | 2 - src/app/views/organizationLayout.html | 110 - src/app/views/paidOrgRequired.html | 13 - src/app/views/premiumRequired.html | 36 - src/app/views/userLayout.html | 160 - src/images/boxed-bg-2x.png | Bin 84138 -> 0 bytes src/images/boxed-bg.png | Bin 63654 -> 0 bytes src/js/analytics.js | 10 - src/js/fallback-scripts.js | 9 - src/js/fallback-styles.js | 17 - src/js/main.js | 5 - src/js/settings.js | 1 - src/less/theme.less | 49 - src/less/vault.less | 833 ----- 210 files changed, 24301 deletions(-) delete mode 160000 dist/.publish delete mode 100644 gulpfile.js delete mode 100644 settings.Preview.json delete mode 100644 settings.Production.json delete mode 100644 settings.json delete mode 100644 src/app/accounts/accountsLoginController.js delete mode 100644 src/app/accounts/accountsLogoutController.js delete mode 100644 src/app/accounts/accountsModule.js delete mode 100644 src/app/accounts/accountsOrganizationAcceptController.js delete mode 100644 src/app/accounts/accountsPasswordHintController.js delete mode 100644 src/app/accounts/accountsRecoverController.js delete mode 100644 src/app/accounts/accountsRecoverDeleteController.js delete mode 100644 src/app/accounts/accountsRegisterController.js delete mode 100644 src/app/accounts/accountsTwoFactorMethodsController.js delete mode 100644 src/app/accounts/accountsVerifyEmailController.js delete mode 100644 src/app/accounts/accountsVerifyRecoverDeleteController.js delete mode 100644 src/app/accounts/views/accountsLogin.html delete mode 100644 src/app/accounts/views/accountsLoginInfo.html delete mode 100644 src/app/accounts/views/accountsLoginTwoFactor.html delete mode 100644 src/app/accounts/views/accountsOrganizationAccept.html delete mode 100644 src/app/accounts/views/accountsPasswordHint.html delete mode 100644 src/app/accounts/views/accountsRecover.html delete mode 100644 src/app/accounts/views/accountsRecoverDelete.html delete mode 100644 src/app/accounts/views/accountsRegister.html delete mode 100644 src/app/accounts/views/accountsTwoFactorMethods.html delete mode 100644 src/app/accounts/views/accountsVerifyEmail.html delete mode 100644 src/app/accounts/views/accountsVerifyRecoverDelete.html delete mode 100644 src/app/apiInterceptor.js delete mode 100644 src/app/app.js delete mode 100644 src/app/config.js delete mode 100644 src/app/constants.js delete mode 100644 src/app/directives/apiFieldDirective.js delete mode 100644 src/app/directives/apiFormDirective.js delete mode 100644 src/app/directives/directivesModule.js delete mode 100644 src/app/directives/fallbackSrcDirective.js delete mode 100644 src/app/directives/letterAvatarDirective.js delete mode 100644 src/app/directives/masterPasswordDirective.js delete mode 100644 src/app/directives/pageTitleDirective.js delete mode 100644 src/app/directives/passwordMeterDirective.js delete mode 100644 src/app/directives/passwordViewerDirective.js delete mode 100644 src/app/directives/stopClickDirective.js delete mode 100644 src/app/directives/stopPropDirective.js delete mode 100644 src/app/directives/totpDirective.js delete mode 100644 src/app/filters/enumLabelClassFilter.js delete mode 100644 src/app/filters/enumNameFilter.js delete mode 100644 src/app/filters/filtersModule.js delete mode 100644 src/app/global/globalModule.js delete mode 100644 src/app/global/mainController.js delete mode 100644 src/app/global/paidOrgRequiredController.js delete mode 100644 src/app/global/premiumRequiredController.js delete mode 100644 src/app/global/sideNavController.js delete mode 100644 src/app/global/topNavController.js delete mode 100644 src/app/organization/organizationBillingAdjustSeatsController.js delete mode 100644 src/app/organization/organizationBillingAdjustStorageController.js delete mode 100644 src/app/organization/organizationBillingChangePaymentController.js delete mode 100644 src/app/organization/organizationBillingChangePlanController.js delete mode 100644 src/app/organization/organizationBillingController.js delete mode 100644 src/app/organization/organizationBillingUpdateLicenseController.js delete mode 100644 src/app/organization/organizationBillingVerifyBankController.js delete mode 100644 src/app/organization/organizationCollectionsAddController.js delete mode 100644 src/app/organization/organizationCollectionsController.js delete mode 100644 src/app/organization/organizationCollectionsEditController.js delete mode 100644 src/app/organization/organizationCollectionsUsersController.js delete mode 100644 src/app/organization/organizationDashboardController.js delete mode 100644 src/app/organization/organizationDeleteController.js delete mode 100644 src/app/organization/organizationEventsController.js delete mode 100644 src/app/organization/organizationGroupsAddController.js delete mode 100644 src/app/organization/organizationGroupsController.js delete mode 100644 src/app/organization/organizationGroupsEditController.js delete mode 100644 src/app/organization/organizationGroupsUsersController.js delete mode 100644 src/app/organization/organizationModule.js delete mode 100644 src/app/organization/organizationPeopleController.js delete mode 100644 src/app/organization/organizationPeopleEditController.js delete mode 100644 src/app/organization/organizationPeopleEventsController.js delete mode 100644 src/app/organization/organizationPeopleGroupsController.js delete mode 100644 src/app/organization/organizationPeopleInviteController.js delete mode 100644 src/app/organization/organizationSettingsController.js delete mode 100644 src/app/organization/organizationSettingsExportController.js delete mode 100644 src/app/organization/organizationSettingsImportController.js delete mode 100644 src/app/organization/organizationVaultAddCipherController.js delete mode 100644 src/app/organization/organizationVaultAttachmentsController.js delete mode 100644 src/app/organization/organizationVaultCipherCollectionsController.js delete mode 100644 src/app/organization/organizationVaultCipherEventsController.js delete mode 100644 src/app/organization/organizationVaultController.js delete mode 100644 src/app/organization/organizationVaultEditCipherController.js delete mode 100644 src/app/organization/views/organizationBilling.html delete mode 100644 src/app/organization/views/organizationBillingAdjustSeats.html delete mode 100644 src/app/organization/views/organizationBillingChangePlan.html delete mode 100644 src/app/organization/views/organizationBillingVerifyBank.html delete mode 100644 src/app/organization/views/organizationCollections.html delete mode 100644 src/app/organization/views/organizationCollectionsAdd.html delete mode 100644 src/app/organization/views/organizationCollectionsEdit.html delete mode 100644 src/app/organization/views/organizationCollectionsUsers.html delete mode 100644 src/app/organization/views/organizationDashboard.html delete mode 100644 src/app/organization/views/organizationDelete.html delete mode 100644 src/app/organization/views/organizationEvents.html delete mode 100644 src/app/organization/views/organizationGroups.html delete mode 100644 src/app/organization/views/organizationGroupsAdd.html delete mode 100644 src/app/organization/views/organizationGroupsEdit.html delete mode 100644 src/app/organization/views/organizationGroupsUsers.html delete mode 100644 src/app/organization/views/organizationPeople.html delete mode 100644 src/app/organization/views/organizationPeopleEdit.html delete mode 100644 src/app/organization/views/organizationPeopleEvents.html delete mode 100644 src/app/organization/views/organizationPeopleGroups.html delete mode 100644 src/app/organization/views/organizationPeopleInvite.html delete mode 100644 src/app/organization/views/organizationSettings.html delete mode 100644 src/app/organization/views/organizationVault.html delete mode 100644 src/app/organization/views/organizationVaultCipherCollections.html delete mode 100644 src/app/organization/views/organizationVaultCipherEvents.html delete mode 100644 src/app/reports/reportsBreachController.js delete mode 100644 src/app/reports/reportsModule.js delete mode 100644 src/app/reports/views/reportsBreach.html delete mode 100644 src/app/services/apiService.js delete mode 100644 src/app/services/authService.js delete mode 100644 src/app/services/cipherService.js delete mode 100644 src/app/services/cryptoService.js delete mode 100644 src/app/services/eventService.js delete mode 100644 src/app/services/importService.js delete mode 100644 src/app/services/passwordService.js delete mode 100644 src/app/services/servicesModule.js delete mode 100644 src/app/services/tokenService.js delete mode 100644 src/app/services/utilsService.js delete mode 100644 src/app/services/validationService.js delete mode 100644 src/app/settings.js delete mode 100644 src/app/settings/settingsAddEditEquivalentDomainController.js delete mode 100644 src/app/settings/settingsBillingAdjustStorageController.js delete mode 100644 src/app/settings/settingsBillingChangePaymentController.js delete mode 100644 src/app/settings/settingsBillingController.js delete mode 100644 src/app/settings/settingsBillingUpdateLicenseController.js delete mode 100644 src/app/settings/settingsChangeEmailController.js delete mode 100644 src/app/settings/settingsChangePasswordController.js delete mode 100644 src/app/settings/settingsController.js delete mode 100644 src/app/settings/settingsCreateOrganizationController.js delete mode 100644 src/app/settings/settingsDeleteController.js delete mode 100644 src/app/settings/settingsDomainsController.js delete mode 100644 src/app/settings/settingsModule.js delete mode 100644 src/app/settings/settingsPremiumController.js delete mode 100644 src/app/settings/settingsPurgeController.js delete mode 100644 src/app/settings/settingsSessionsController.js delete mode 100644 src/app/settings/settingsTwoStepAuthenticatorController.js delete mode 100644 src/app/settings/settingsTwoStepController.js delete mode 100644 src/app/settings/settingsTwoStepDuoController.js delete mode 100644 src/app/settings/settingsTwoStepEmailController.js delete mode 100644 src/app/settings/settingsTwoStepRecoverController.js delete mode 100644 src/app/settings/settingsTwoStepU2fController.js delete mode 100644 src/app/settings/settingsTwoStepYubiController.js delete mode 100644 src/app/settings/settingsUpdateKeyController.js delete mode 100644 src/app/settings/views/settings.html delete mode 100644 src/app/settings/views/settingsAddEditEquivalentDomain.html delete mode 100644 src/app/settings/views/settingsBilling.html delete mode 100644 src/app/settings/views/settingsBillingAdjustStorage.html delete mode 100644 src/app/settings/views/settingsBillingChangePayment.html delete mode 100644 src/app/settings/views/settingsBillingUpdateLicense.html delete mode 100644 src/app/settings/views/settingsChangeEmail.html delete mode 100644 src/app/settings/views/settingsChangePassword.html delete mode 100644 src/app/settings/views/settingsCreateOrganization.html delete mode 100644 src/app/settings/views/settingsDelete.html delete mode 100644 src/app/settings/views/settingsDomains.html delete mode 100644 src/app/settings/views/settingsPremium.html delete mode 100644 src/app/settings/views/settingsPurge.html delete mode 100644 src/app/settings/views/settingsSessions.html delete mode 100644 src/app/settings/views/settingsTwoStep.html delete mode 100644 src/app/settings/views/settingsTwoStepAuthenticator.html delete mode 100644 src/app/settings/views/settingsTwoStepDuo.html delete mode 100644 src/app/settings/views/settingsTwoStepEmail.html delete mode 100644 src/app/settings/views/settingsTwoStepRecover.html delete mode 100644 src/app/settings/views/settingsTwoStepU2f.html delete mode 100644 src/app/settings/views/settingsTwoStepYubi.html delete mode 100644 src/app/settings/views/settingsUpdateKey.html delete mode 100644 src/app/tools/toolsController.js delete mode 100644 src/app/tools/toolsExportController.js delete mode 100644 src/app/tools/toolsImportController.js delete mode 100644 src/app/tools/toolsModule.js delete mode 100644 src/app/tools/views/tools.html delete mode 100644 src/app/tools/views/toolsExport.html delete mode 100644 src/app/tools/views/toolsImport.html delete mode 100644 src/app/vault/vaultAddCipherController.js delete mode 100644 src/app/vault/vaultAddFolderController.js delete mode 100644 src/app/vault/vaultAttachmentsController.js delete mode 100644 src/app/vault/vaultCipherCollectionsController.js delete mode 100644 src/app/vault/vaultController.js delete mode 100644 src/app/vault/vaultEditCipherController.js delete mode 100644 src/app/vault/vaultEditFolderController.js delete mode 100644 src/app/vault/vaultModule.js delete mode 100644 src/app/vault/vaultMoveCiphersController.js delete mode 100644 src/app/vault/vaultShareCipherController.js delete mode 100644 src/app/vault/views/vault.html delete mode 100644 src/app/vault/views/vaultAddCipher.html delete mode 100644 src/app/vault/views/vaultAddFolder.html delete mode 100644 src/app/vault/views/vaultAttachments.html delete mode 100644 src/app/vault/views/vaultCipherCollections.html delete mode 100644 src/app/vault/views/vaultEditCipher.html delete mode 100644 src/app/vault/views/vaultEditFolder.html delete mode 100644 src/app/vault/views/vaultMoveCiphers.html delete mode 100644 src/app/vault/views/vaultShareCipher.html delete mode 100644 src/app/views/backendLayout.html delete mode 100644 src/app/views/frontendLayout.html delete mode 100644 src/app/views/organizationLayout.html delete mode 100644 src/app/views/paidOrgRequired.html delete mode 100644 src/app/views/premiumRequired.html delete mode 100644 src/app/views/userLayout.html delete mode 100644 src/images/boxed-bg-2x.png delete mode 100644 src/images/boxed-bg.png delete mode 100644 src/js/analytics.js delete mode 100644 src/js/fallback-scripts.js delete mode 100644 src/js/fallback-styles.js delete mode 100644 src/js/main.js delete mode 100644 src/js/settings.js delete mode 100644 src/less/theme.less delete mode 100644 src/less/vault.less diff --git a/dist/.publish b/dist/.publish deleted file mode 160000 index be3a93a5..00000000 --- a/dist/.publish +++ /dev/null @@ -1 +0,0 @@ -Subproject commit be3a93a58193fb727b597657ef40aac9395b5f36 diff --git a/gulpfile.js b/gulpfile.js deleted file mode 100644 index 070c5c08..00000000 --- a/gulpfile.js +++ /dev/null @@ -1,499 +0,0 @@ -/// - -var gulp = require('gulp'), - rimraf = require('rimraf'), - concat = require('gulp-concat'), - rename = require('gulp-rename'), - cssmin = require('gulp-cssmin'), - uglify = require('gulp-uglify'), - ghPages = require('gulp-gh-pages'), - less = require('gulp-less'), - connect = require('gulp-connect'), - ngAnnotate = require('gulp-ng-annotate'), - preprocess = require('gulp-preprocess'), - runSequence = require('run-sequence'), - jeditor = require("gulp-json-editor"), - merge = require('merge-stream'), - ngConfig = require('gulp-ng-config'), - settings = require('./settings.json'), - project = require('./package.json'), - jshint = require('gulp-jshint'), - _ = require('lodash'), - webpack = require('webpack-stream'), - browserify = require('browserify'), - derequire = require('gulp-derequire'), - source = require('vinyl-source-stream'); - -var paths = {}; -paths.dist = './dist/'; -paths.webroot = './src/'; -paths.js = paths.webroot + 'js/**/*.js'; -paths.minJs = paths.webroot + 'js/**/*.min.js'; -paths.concatJsDest = paths.webroot + 'js/bw.min.js'; -paths.libDir = paths.webroot + 'lib/'; -paths.npmDir = 'node_modules/'; -paths.lessDir = paths.webroot + 'less/'; -paths.cssDir = paths.webroot + 'css/'; -paths.jsDir = paths.webroot + 'js/'; - -var randomString = Math.random().toString(36).substring(7); - -gulp.task('lint', function () { - return gulp.src(paths.webroot + 'app/**/*.js') - .pipe(jshint()) - .pipe(jshint.reporter('default')); -}); - -gulp.task('build', function (cb) { - return runSequence( - 'clean', - ['browserify', 'lib', 'webpack', 'less', 'settings', 'lint', 'min:js'], - cb); -}); - -gulp.task('clean:js', function (cb) { - return rimraf(paths.concatJsDest, cb); -}); - -gulp.task('clean:css', function (cb) { - return rimraf(paths.cssDir, cb); -}); - -gulp.task('clean:lib', function (cb) { - return rimraf(paths.libDir, cb); -}); - -gulp.task('clean', ['clean:js', 'clean:css', 'clean:lib', 'dist:clean']); - -gulp.task('min:js', ['clean:js'], function () { - return gulp.src( - [ - paths.js, - '!' + paths.minJs, - '!' + paths.jsDir + 'fallback*.js', - '!' + paths.jsDir + 'u2f-connector.js', - '!' + paths.jsDir + 'duo-connector.js', - '!' + paths.jsDir + 'duo.js', - '!' + paths.jsDir + 'settings.js' - ], { base: '.' }) - .pipe(preprocess({ context: { cacheTag: randomString, selfHosted: selfHosted } })) - .pipe(concat(paths.concatJsDest)) - //.pipe(uglify()) - .pipe(gulp.dest('.')); -}); - -gulp.task('min:css', [], function () { - return gulp.src([paths.cssDir + '**/*.css', '!' + paths.cssDir + '**/*.min.css'], { base: '.' }) - .pipe(cssmin()) - .pipe(rename({ suffix: '.min' })) - .pipe(gulp.dest('.')); -}); - -gulp.task('min', ['min:js', 'min:css']); - -gulp.task('lib', ['clean:lib'], function () { - var libs = [ - { - src: [ - paths.npmDir + 'bootstrap/dist/**/*', - '!' + paths.npmDir + 'bootstrap/dist/**/npm.js', - '!' + paths.npmDir + 'bootstrap/dist/**/css/*theme*' - ], - dest: paths.libDir + 'bootstrap' - }, - { - src: paths.npmDir + 'font-awesome/css/*', - dest: paths.libDir + 'font-awesome/css' - }, - { - src: paths.npmDir + 'font-awesome/fonts/*', - dest: paths.libDir + 'font-awesome/fonts' - }, - { - src: paths.npmDir + 'jquery/dist/*.js', - dest: paths.libDir + 'jquery' - }, - { - src: paths.npmDir + 'admin-lte/dist/js/app*.js', - dest: paths.libDir + 'admin-lte/js' - }, - { - src: paths.npmDir + 'angular/angular*.js', - dest: paths.libDir + 'angular' - }, - { - src: paths.npmDir + 'angular-ui-bootstrap/dist/*tpls*.js', - dest: paths.libDir + 'angular-ui-bootstrap' - }, - { - src: paths.npmDir + 'angular-bootstrap-show-errors/src/*.js', - dest: paths.libDir + 'angular-bootstrap-show-errors' - }, - { - src: paths.npmDir + 'angular-cookies/*cookies*.js', - dest: paths.libDir + 'angular-cookies' - }, - { - src: paths.npmDir + 'angular-jwt/dist/*.js', - dest: paths.libDir + 'angular-jwt' - }, - { - src: paths.npmDir + 'angular-resource/*resource*.js', - dest: paths.libDir + 'angular-resource' - }, - { - src: paths.npmDir + 'angular-sanitize/*sanitize*.js', - dest: paths.libDir + 'angular-sanitize' - }, - { - src: [paths.npmDir + 'angular-toastr/dist/**/*.css', paths.npmDir + 'angular-toastr/dist/**/*.js'], - dest: paths.libDir + 'angular-toastr' - }, - { - src: paths.npmDir + 'angular-ui-router/release/*.js', - dest: paths.libDir + 'angular-ui-router' - }, - { - src: paths.npmDir + 'angular-messages/*messages*.js', - dest: paths.libDir + 'angular-messages' - }, - { - src: paths.npmDir + 'ngstorage/*.js', - dest: paths.libDir + 'ngstorage' - }, - { - src: paths.npmDir + 'papaparse/papaparse*.js', - dest: paths.libDir + 'papaparse' - }, - { - src: paths.npmDir + 'ngclipboard/dist/ngclipboard*.js', - dest: paths.libDir + 'ngclipboard' - }, - { - src: paths.npmDir + 'clipboard/dist/clipboard*.js', - dest: paths.libDir + 'clipboard' - }, - { - src: paths.npmDir + 'node-forge/dist/prime.worker.*', - dest: paths.libDir + 'forge' - }, - { - src: [ - paths.npmDir + 'angulartics-google-analytics/lib/angulartics*.js', - paths.npmDir + 'angulartics/src/angulartics.js' - ], - dest: paths.libDir + 'angulartics' - }, - //{ - // src: paths.npmDir + 'duo_web_sdk/index.js', - // dest: paths.libDir + 'duo' - //}, - { - src: paths.jsDir + 'duo.js', - dest: paths.libDir + 'duo' - }, - { - src: paths.npmDir + 'angular-promise-polyfill/index.js', - dest: paths.libDir + 'angular-promise-polyfill' - } - ]; - - var tasks = libs.map(function (lib) { - return gulp.src(lib.src).pipe(gulp.dest(lib.dest)); - }); - - return merge(tasks); -}); - -gulp.task('webpack', ['webpack:forge']); - -gulp.task('webpack:forge', function () { - var forgeDir = paths.npmDir + '/node-forge/lib/'; - - return gulp.src([ - forgeDir + 'pbkdf2.js', - forgeDir + 'aes.js', - forgeDir + 'rsa.js', - forgeDir + 'hmac.js', - forgeDir + 'sha256.js', - forgeDir + 'random.js', - forgeDir + 'forge.js' - ]).pipe(webpack({ - output: { - filename: 'forge.js', - library: 'forge', - libraryTarget: 'umd' - }, - node: { - Buffer: false, - process: false, - crypto: false, - setImmediate: false - } - })).pipe(gulp.dest(paths.libDir + 'forge')); -}); - -gulp.task('settings', function () { - return config() - .pipe(gulp.dest(paths.webroot + 'app')); -}); - -function config() { - return gulp.src('./settings.json') - .pipe(ngConfig('bit', { - createModule: false, - constants: _.merge({}, { - appSettings: { - selfHosted: false, - version: project.version, - environment: project.env - } - }, require('./settings' + (project.env !== 'Development' ? ('.' + project.env) : '') + '.json') || {}) - })); -} - -gulp.task('less', function () { - return gulp.src(paths.lessDir + 'vault.less') - .pipe(less()) - .pipe(gulp.dest(paths.cssDir)); -}); - -gulp.task('watch', function () { - gulp.watch(paths.lessDir + '*.less', ['less']); - gulp.watch('./settings*.json', ['settings']); -}); - -gulp.task('browserify', ['browserify:stripe', 'browserify:cc']); - -gulp.task('browserify:stripe', function () { - return browserify(paths.npmDir + 'angular-stripe/src/index.js', - { - entry: '.', - standalone: 'angularStripe', - global: true - }) - .transform('exposify', { expose: { angular: 'angular' } }) - .bundle() - .pipe(source('angular-stripe.js')) - .pipe(derequire()) - .pipe(gulp.dest(paths.libDir + 'angular-stripe')); -}); - -gulp.task('browserify:cc', function () { - return browserify(paths.npmDir + 'angular-credit-cards/src/index.js', - { - entry: '.', - standalone: 'angularCreditCards' - }) - .transform('exposify', { expose: { angular: 'angular' } }) - .bundle() - .pipe(source('angular-credit-cards.js')) - .pipe(derequire()) - .pipe(gulp.dest(paths.libDir + 'angular-credit-cards')); -}); - -gulp.task('dist:clean', function (cb) { - return rimraf(paths.dist + '**/*', cb); -}); - -gulp.task('dist:move', function () { - var moves = [ - { - src: './CNAME', - dest: paths.dist - }, - { - src: [ - paths.npmDir + 'bootstrap/dist/**/bootstrap.min.js', - paths.npmDir + 'bootstrap/dist/**/bootstrap.min.css', - paths.npmDir + 'bootstrap/dist/**/fonts/**/*' - ], - dest: paths.dist + 'lib/bootstrap' - }, - { - src: [ - paths.npmDir + 'font-awesome/**/font-awesome.min.css', - paths.npmDir + 'font-awesome/**/fonts/**/*' - ], - dest: paths.dist + 'lib/font-awesome' - }, - { - src: paths.npmDir + 'jquery/dist/jquery.min.js', - dest: paths.dist + 'lib/jquery' - }, - { - src: paths.npmDir + 'angular/angular.min.js', - dest: paths.dist + 'lib/angular' - }, - { - src: paths.npmDir + 'node-forge/dist/prime.worker.*', - dest: paths.dist + 'lib/forge' - }, - //{ - // src: paths.npmDir + 'duo_web_sdk/index.js', - // dest: paths.dist + 'lib/duo' - //}, - { - src: paths.jsDir + 'duo.js', - dest: paths.dist + 'js' - }, - { - src: paths.jsDir + 'duo-connector.js', - dest: paths.dist + 'js' - }, - { - src: paths.jsDir + 'settings.js', - dest: paths.dist + 'js' - }, - { - src: paths.jsDir + 'bw.min.js', - dest: paths.dist + 'js' - }, - { - src: [ - paths.webroot + '**/app/**/*.html', - paths.webroot + '**/images/**/*', - paths.webroot + 'index.html', - paths.webroot + 'u2f-connector.html', - paths.webroot + 'duo-connector.html', - paths.webroot + 'favicon.ico', - paths.webroot + 'manifest.json', - paths.webroot + 'app-id.json' - ], - dest: paths.dist - } - ]; - - var tasks = moves.map(function (move) { - return gulp.src(move.src).pipe(gulp.dest(move.dest)); - }); - - return merge(tasks); -}); - -gulp.task('dist:css', function () { - return gulp - .src([ - paths.cssDir + '**/*.css', - '!' + paths.cssDir + '**/*.min.css' - ]) - .pipe(preprocess({ context: { cacheTag: randomString, selfHosted: selfHosted } })) - .pipe(cssmin()) - .pipe(rename({ suffix: '.min' })) - .pipe(gulp.dest(paths.dist + 'css')); -}); - -gulp.task('dist:js:app', function () { - var mainStream = gulp - .src([ - paths.webroot + 'app/app.js', - '!' + paths.webroot + 'app/settings.js', - paths.webroot + 'app/**/*Module.js', - paths.webroot + 'app/**/*.js' - ]); - - merge(mainStream, config()) - .pipe(preprocess({ context: { cacheTag: randomString, selfHosted: selfHosted } })) - .pipe(concat(paths.dist + '/js/app.min.js')) - .pipe(ngAnnotate()) - //.pipe(uglify()) - .pipe(gulp.dest('.')); -}); - -gulp.task('dist:js:fallback', function () { - var mainStream = gulp - .src([ - paths.jsDir + 'fallback*.js' - ]); - - merge(mainStream) - .pipe(preprocess({ context: { cacheTag: randomString, selfHosted: selfHosted } })) - //.pipe(uglify()) - .pipe(rename({ suffix: '.min' })) - .pipe(gulp.dest(paths.dist + 'js')); -}); - -gulp.task('dist:js:u2f', function () { - var mainStream = gulp - .src([ - paths.jsDir + 'u2f*.js' - ]); - - merge(mainStream) - .pipe(concat(paths.dist + '/js/u2f.min.js')) - //.pipe(uglify()) - .pipe(gulp.dest('.')); -}); - -gulp.task('dist:js:lib', function () { - return gulp - .src([ - paths.libDir + 'angulartics/angulartics.js', - paths.libDir + '**/*.js', - '!' + paths.libDir + '**/*.min.js', - '!' + paths.libDir + 'angular/**/*', - '!' + paths.libDir + 'bootstrap/**/*', - '!' + paths.libDir + 'jquery/**/*' - ]) - .pipe(concat(paths.dist + '/js/lib.min.js')) - //.pipe(uglify()) - .pipe(gulp.dest('.')); -}); - -gulp.task('dist:preprocess', function () { - return gulp - .src([ - paths.dist + '/**/*.html' - ], { base: '.' }) - .pipe(preprocess({ context: { cacheTag: randomString, selfHosted: selfHosted } })) - .pipe(gulp.dest('.')); -}); - -gulp.task('dist:version', function () { - gulp.src(paths.webroot + 'version.json').pipe(jeditor({ - 'version': project.version - })).pipe(gulp.dest(paths.dist)); -}); - -gulp.task('dist', ['build'], function (cb) { - return runSequence( - 'dist:clean', - ['dist:move', 'dist:css', 'dist:js:app', 'dist:js:lib', 'dist:js:fallback', 'dist:js:u2f', 'dist:version'], - 'dist:preprocess', - cb); -}); - -var selfHosted = false; -gulp.task('dist:selfHosted', function (cb) { - selfHosted = true; - return runSequence('dist', cb); -}); - -gulp.task('deploy', ['dist'], function () { - return gulp.src(paths.dist + '**/*') - .pipe(ghPages({ cacheDir: paths.dist + '.publish' })); -}); - -gulp.task('deploy-preview', ['dist'], function () { - return gulp.src(paths.dist + '**/*') - .pipe(ghPages({ - cacheDir: paths.dist + '.publish', - remoteUrl: 'git@github.com:bitwarden/web-preview.git' - })); -}); - -gulp.task('serve', function () { - connect.server({ - port: 4001, - root: ['src'], - //https: true, - middleware: function (connect, opt) { - return [function (req, res, next) { - if (req.originalUrl.indexOf('app-id.json') > -1) { - res.setHeader('Content-Type', 'application/fido.trusted-apps+json'); - } - next(); - }]; - } - }); -}); diff --git a/settings.Preview.json b/settings.Preview.json deleted file mode 100644 index aaf40b8a..00000000 --- a/settings.Preview.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "appSettings": { - "apiUri": "/api", - "identityUri": "/identity", - "iconsUri": "https://icons.bitwarden.com", - "stripeKey": "pk_test_KPoCfZXu7mznb9uSCPZ2JpTD", - "braintreeKey": "sandbox_r72q8jq6_9pnxkwm75f87sdc2" - } -} diff --git a/settings.Production.json b/settings.Production.json deleted file mode 100644 index e1b4909f..00000000 --- a/settings.Production.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "appSettings": { - "apiUri": "/api", - "identityUri": "/identity", - "iconsUri": "https://icons.bitwarden.com", - "stripeKey": "pk_live_bpN0P37nMxrMQkcaHXtAybJk", - "braintreeKey": "production_qfbsv8kc_njj2zjtyngtjmbjd" - } -} diff --git a/settings.json b/settings.json deleted file mode 100644 index 9029e0ca..00000000 --- a/settings.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "appSettings": { - "apiUri": "http://localhost:4000", - "identityUri": "http://localhost:33656", - "iconsUri": "https://icons.bitwarden.com", - "stripeKey": "pk_test_KPoCfZXu7mznb9uSCPZ2JpTD", - "braintreeKey": "sandbox_r72q8jq6_9pnxkwm75f87sdc2" - } -} diff --git a/src/app/accounts/accountsLoginController.js b/src/app/accounts/accountsLoginController.js deleted file mode 100644 index 94a86362..00000000 --- a/src/app/accounts/accountsLoginController.js +++ /dev/null @@ -1,279 +0,0 @@ -angular - .module('bit.accounts') - - .controller('accountsLoginController', function ($scope, $rootScope, $cookies, apiService, cryptoService, authService, - $state, constants, $analytics, $uibModal, $timeout, $window, $filter, toastr) { - $scope.state = $state; - $scope.twoFactorProviderConstants = constants.twoFactorProvider; - $scope.rememberTwoFactor = { checked: false }; - var stopU2fCheck = true; - - $scope.returnState = $state.params.returnState; - $scope.stateEmail = $state.params.email; - if (!$scope.returnState && $state.params.org) { - $scope.returnState = { - name: 'backend.user.settingsCreateOrg', - params: { plan: $state.params.org } - }; - } - else if (!$scope.returnState && $state.params.premium) { - $scope.returnState = { - name: 'backend.user.settingsPremium' - }; - } - - if ($state.current.name.indexOf('twoFactor') > -1 && (!$scope.twoFactorProviders || !$scope.twoFactorProviders.length)) { - $state.go('frontend.login.info', { returnState: $scope.returnState }); - } - - var rememberedEmail = $cookies.get(constants.rememberedEmailCookieName); - if (rememberedEmail || $scope.stateEmail) { - $scope.model = { - email: $scope.stateEmail || rememberedEmail, - rememberEmail: rememberedEmail !== null - }; - - $timeout(function () { - $("#masterPassword").focus(); - }); - } - else { - $timeout(function () { - $("#email").focus(); - }); - } - - var _email, - _masterPassword; - - $scope.twoFactorProviders = null; - $scope.twoFactorProvider = null; - - $scope.login = function (model) { - $scope.loginPromise = authService.logIn(model.email, model.masterPassword).then(function (twoFactorProviders) { - if (model.rememberEmail) { - var cookieExpiration = new Date(); - cookieExpiration.setFullYear(cookieExpiration.getFullYear() + 10); - - $cookies.put( - constants.rememberedEmailCookieName, - model.email, - { expires: cookieExpiration }); - } - else { - $cookies.remove(constants.rememberedEmailCookieName); - } - - if (twoFactorProviders && Object.keys(twoFactorProviders).length > 0) { - _email = model.email; - _masterPassword = model.masterPassword; - - $scope.twoFactorProviders = cleanProviders(twoFactorProviders); - $scope.twoFactorProvider = getDefaultProvider($scope.twoFactorProviders); - - $analytics.eventTrack('Logged In To Two-step'); - $state.go('frontend.login.twoFactor', { returnState: $scope.returnState }).then(function () { - $timeout(function () { - $("#code").focus(); - init(); - }); - }); - } - else { - $analytics.eventTrack('Logged In'); - loggedInGo(); - } - - model.masterPassword = ''; - }); - }; - - function getDefaultProvider(twoFactorProviders) { - var keys = Object.keys(twoFactorProviders); - var providerType = null; - var providerPriority = -1; - for (var i = 0; i < keys.length; i++) { - var provider = $filter('filter')(constants.twoFactorProviderInfo, { type: keys[i], active: true }); - if (provider.length && provider[0].priority > providerPriority) { - if (provider[0].type === constants.twoFactorProvider.u2f && !u2f.isSupported) { - continue; - } - - providerType = provider[0].type; - providerPriority = provider[0].priority; - } - } - - if (providerType === null) { - return null; - } - - return parseInt(providerType); - } - - function cleanProviders(twoFactorProviders) { - if (canUseSecurityKey()) { - return twoFactorProviders; - } - - var keys = Object.keys(twoFactorProviders); - for (var i = 0; i < keys.length; i++) { - var provider = $filter('filter')(constants.twoFactorProviderInfo, { - type: keys[i], - active: true, - requiresUsb: false - }); - if (!provider.length) { - delete twoFactorProviders[keys[i]]; - } - } - - return twoFactorProviders; - } - - // ref: https://stackoverflow.com/questions/11381673/detecting-a-mobile-browser - function canUseSecurityKey() { - var mobile = false; - (function (a) { - if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4))) { - mobile = true; - } - })(navigator.userAgent || navigator.vendor || window.opera); - - return !mobile && !navigator.userAgent.match(/iPad/i); - } - - $scope.twoFactor = function (token) { - if ($scope.twoFactorProvider === constants.twoFactorProvider.email || - $scope.twoFactorProvider === constants.twoFactorProvider.authenticator) { - token = token.replace(' ', ''); - } - - $scope.twoFactorPromise = authService.logIn(_email, _masterPassword, token, $scope.twoFactorProvider, - $scope.rememberTwoFactor.checked || false); - - $scope.twoFactorPromise.then(function () { - $analytics.eventTrack('Logged In From Two-step'); - loggedInGo(); - }, function () { - if ($scope.twoFactorProvider === constants.twoFactorProvider.u2f) { - init(); - } - }); - }; - - $scope.anotherMethod = function () { - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/accounts/views/accountsTwoFactorMethods.html', - controller: 'accountsTwoFactorMethodsController', - resolve: { - providers: function () { return $scope.twoFactorProviders; } - } - }); - - modal.result.then(function (provider) { - $scope.twoFactorProvider = provider; - $timeout(function () { - $("#code").focus(); - init(); - }); - }); - }; - - $scope.sendEmail = function (doToast) { - if ($scope.twoFactorProvider !== constants.twoFactorProvider.email) { - return; - } - - return cryptoService.makeKeyAndHash(_email, _masterPassword).then(function (result) { - return apiService.twoFactor.sendEmailLogin({ - email: _email, - masterPasswordHash: result.hash - }).$promise; - }).then(function () { - if (doToast) { - toastr.success('Verification email sent to ' + $scope.twoFactorEmail + '.'); - } - }, function () { - toastr.error('Could not send verification email.'); - }); - }; - - $scope.$on('$destroy', function () { - stopU2fCheck = true; - }); - - function loggedInGo() { - if ($scope.returnState) { - $state.go($scope.returnState.name, $scope.returnState.params); - } - else { - $state.go('backend.user.vault'); - } - } - - function init() { - stopU2fCheck = true; - var params; - if ($scope.twoFactorProvider === constants.twoFactorProvider.duo || - $scope.twoFactorProvider === constants.twoFactorProvider.organizationDuo) { - params = $scope.twoFactorProviders[$scope.twoFactorProvider]; - - $window.Duo.init({ - host: params.Host, - sig_request: params.Signature, - submit_callback: function (theForm) { - var response = $(theForm).find('input[name="sig_response"]').val(); - $scope.twoFactor(response); - } - }); - } - else if ($scope.twoFactorProvider === constants.twoFactorProvider.u2f) { - stopU2fCheck = false; - params = $scope.twoFactorProviders[constants.twoFactorProvider.u2f]; - var challenges = JSON.parse(params.Challenges); - - initU2f(challenges); - } - else if ($scope.twoFactorProvider === constants.twoFactorProvider.email) { - params = $scope.twoFactorProviders[constants.twoFactorProvider.email]; - $scope.twoFactorEmail = params.Email; - if (Object.keys($scope.twoFactorProviders).length > 1) { - $scope.sendEmail(false); - } - } - } - - function initU2f(challenges) { - if (stopU2fCheck) { - return; - } - - if (challenges.length < 1 || $scope.twoFactorProvider !== constants.twoFactorProvider.u2f) { - return; - } - - console.log('listening for u2f key...'); - - $window.u2f.sign(challenges[0].appId, challenges[0].challenge, [{ - version: challenges[0].version, - keyHandle: challenges[0].keyHandle - }], function (data) { - if ($scope.twoFactorProvider !== constants.twoFactorProvider.u2f) { - return; - } - - if (data.errorCode) { - console.log(data.errorCode); - - $timeout(function () { - initU2f(challenges); - }, data.errorCode === 5 ? 0 : 1000); - - return; - } - $scope.twoFactor(JSON.stringify(data)); - }, 10); - } - }); diff --git a/src/app/accounts/accountsLogoutController.js b/src/app/accounts/accountsLogoutController.js deleted file mode 100644 index 418e9689..00000000 --- a/src/app/accounts/accountsLogoutController.js +++ /dev/null @@ -1,8 +0,0 @@ -angular - .module('bit.accounts') - - .controller('accountsLogoutController', function ($scope, authService, $state, $analytics) { - authService.logOut(); - $analytics.eventTrack('Logged Out'); - $state.go('frontend.login.info'); - }); diff --git a/src/app/accounts/accountsModule.js b/src/app/accounts/accountsModule.js deleted file mode 100644 index dfa7f48b..00000000 --- a/src/app/accounts/accountsModule.js +++ /dev/null @@ -1,2 +0,0 @@ -angular - .module('bit.accounts', ['ui.bootstrap', 'ngCookies']); diff --git a/src/app/accounts/accountsOrganizationAcceptController.js b/src/app/accounts/accountsOrganizationAcceptController.js deleted file mode 100644 index 8ff0164e..00000000 --- a/src/app/accounts/accountsOrganizationAcceptController.js +++ /dev/null @@ -1,45 +0,0 @@ -angular - .module('bit.accounts') - - .controller('accountsOrganizationAcceptController', function ($scope, $state, apiService, authService, toastr, $analytics) { - $scope.state = { - name: $state.current.name, - params: $state.params - }; - - if (!$state.params.organizationId || !$state.params.organizationUserId || !$state.params.token || - !$state.params.email || !$state.params.organizationName) { - $state.go('frontend.login.info').then(function () { - toastr.error('Invalid parameters.'); - }); - return; - } - - $scope.$on('$viewContentLoaded', function () { - if (authService.isAuthenticated()) { - $scope.accepting = true; - apiService.organizationUsers.accept( - { - orgId: $state.params.organizationId, - id: $state.params.organizationUserId - }, - { - token: $state.params.token - }, function () { - $analytics.eventTrack('Accepted Invitation'); - $state.go('backend.user.vault', null, { location: 'replace' }).then(function () { - toastr.success('You can access this organization once an administrator confirms your membership.' + - ' We\'ll send an email when that happens.', 'Invite Accepted', { timeOut: 10000 }); - }); - }, function () { - $analytics.eventTrack('Failed To Accept Invitation'); - $state.go('backend.user.vault', null, { location: 'replace' }).then(function () { - toastr.error('Unable to accept invitation.', 'Error'); - }); - }); - } - else { - $scope.loading = false; - } - }); - }); diff --git a/src/app/accounts/accountsPasswordHintController.js b/src/app/accounts/accountsPasswordHintController.js deleted file mode 100644 index b26a2436..00000000 --- a/src/app/accounts/accountsPasswordHintController.js +++ /dev/null @@ -1,13 +0,0 @@ -angular - .module('bit.accounts') - - .controller('accountsPasswordHintController', function ($scope, $rootScope, apiService, $analytics) { - $scope.success = false; - - $scope.submit = function (model) { - $scope.submitPromise = apiService.accounts.postPasswordHint({ email: model.email }, function () { - $analytics.eventTrack('Requested Password Hint'); - $scope.success = true; - }).$promise; - }; - }); diff --git a/src/app/accounts/accountsRecoverController.js b/src/app/accounts/accountsRecoverController.js deleted file mode 100644 index d5db279e..00000000 --- a/src/app/accounts/accountsRecoverController.js +++ /dev/null @@ -1,21 +0,0 @@ -angular - .module('bit.accounts') - - .controller('accountsRecoverController', function ($scope, apiService, cryptoService, $analytics) { - $scope.success = false; - - $scope.submit = function (model) { - var email = model.email.toLowerCase(); - - $scope.submitPromise = cryptoService.makeKeyAndHash(model.email, model.masterPassword).then(function (result) { - return apiService.twoFactor.recover({ - email: email, - masterPasswordHash: result.hash, - recoveryCode: model.code.replace(/\s/g, '').toLowerCase() - }).$promise; - }).then(function () { - $analytics.eventTrack('Recovered 2FA'); - $scope.success = true; - }); - }; - }); diff --git a/src/app/accounts/accountsRecoverDeleteController.js b/src/app/accounts/accountsRecoverDeleteController.js deleted file mode 100644 index a6cc7bb5..00000000 --- a/src/app/accounts/accountsRecoverDeleteController.js +++ /dev/null @@ -1,13 +0,0 @@ -angular - .module('bit.accounts') - - .controller('accountsRecoverDeleteController', function ($scope, $rootScope, apiService, $analytics) { - $scope.success = false; - - $scope.submit = function (model) { - $scope.submitPromise = apiService.accounts.postDeleteRecover({ email: model.email }, function () { - $analytics.eventTrack('Started Delete Recovery'); - $scope.success = true; - }).$promise; - }; - }); diff --git a/src/app/accounts/accountsRegisterController.js b/src/app/accounts/accountsRegisterController.js deleted file mode 100644 index ebe9197b..00000000 --- a/src/app/accounts/accountsRegisterController.js +++ /dev/null @@ -1,101 +0,0 @@ -angular - .module('bit.accounts') - - .controller('accountsRegisterController', function ($scope, $location, apiService, cryptoService, validationService, - $analytics, $state, $timeout) { - var params = $location.search(); - var stateParams = $state.params; - $scope.createOrg = stateParams.org; - - if (!stateParams.returnState && stateParams.org) { - $scope.returnState = { - name: 'backend.user.settingsCreateOrg', - params: { plan: $state.params.org } - }; - } - else if (!stateParams.returnState && stateParams.premium) { - $scope.returnState = { - name: 'backend.user.settingsPremium', - params: { plan: $state.params.org } - }; - } - else { - $scope.returnState = stateParams.returnState; - } - - $scope.success = false; - $scope.model = { - email: params.email ? params.email : stateParams.email - }; - $scope.readOnlyEmail = stateParams.email !== null; - - var registerOrgUserId = null; - var registerToken = null; - if(stateParams.returnState && stateParams.returnState.params && - stateParams.returnState.name === 'frontend.organizationAccept') { - registerOrgUserId = stateParams.returnState.params.organizationUserId || null; - registerToken = stateParams.returnState.params.token || null; - } - - $timeout(function () { - if ($scope.model.email) { - $("#name").focus(); - } - else { - $("#email").focus(); - } - }); - - $scope.registerPromise = null; - $scope.register = function (form) { - var error = false; - - if ($scope.model.masterPassword.length < 8) { - validationService.addError(form, 'MasterPassword', 'Master password must be at least 8 characters long.', true); - error = true; - } - if ($scope.model.masterPassword !== $scope.model.confirmMasterPassword) { - validationService.addError(form, 'ConfirmMasterPassword', 'Master password confirmation does not match.', true); - error = true; - } - - if (error) { - return; - } - - var email = $scope.model.email.toLowerCase(); - var makeResult, encKey; - - $scope.registerPromise = cryptoService.makeKeyAndHash(email, $scope.model.masterPassword).then(function (result) { - makeResult = result; - encKey = cryptoService.makeEncKey(result.key); - return cryptoService.makeKeyPair(encKey.encKey); - }).then(function (result) { - var request = { - name: $scope.model.name, - email: email, - masterPasswordHash: makeResult.hash, - masterPasswordHint: $scope.model.masterPasswordHint, - key: encKey.encKeyEnc, - keys: { - publicKey: result.publicKey, - encryptedPrivateKey: result.privateKeyEnc - }, - token: registerToken, - organizationUserId: registerOrgUserId - }; - - return apiService.accounts.register(request).$promise; - }, function (errors) { - validationService.addError(form, null, 'Problem generating keys.', true); - return false; - }).then(function (result) { - if (result === false) { - return; - } - - $scope.success = true; - $analytics.eventTrack('Registered'); - }); - }; - }); diff --git a/src/app/accounts/accountsTwoFactorMethodsController.js b/src/app/accounts/accountsTwoFactorMethodsController.js deleted file mode 100644 index 15c17910..00000000 --- a/src/app/accounts/accountsTwoFactorMethodsController.js +++ /dev/null @@ -1,43 +0,0 @@ -angular - .module('bit.accounts') - - .controller('accountsTwoFactorMethodsController', function ($scope, $uibModalInstance, $analytics, providers, constants) { - $analytics.eventTrack('accountsTwoFactorMethodsController', { category: 'Modal' }); - - $scope.providers = []; - - if (providers.hasOwnProperty(constants.twoFactorProvider.organizationDuo)) { - add(constants.twoFactorProvider.organizationDuo); - } - if (providers.hasOwnProperty(constants.twoFactorProvider.authenticator)) { - add(constants.twoFactorProvider.authenticator); - } - if (providers.hasOwnProperty(constants.twoFactorProvider.yubikey)) { - add(constants.twoFactorProvider.yubikey); - } - if (providers.hasOwnProperty(constants.twoFactorProvider.email)) { - add(constants.twoFactorProvider.email); - } - if (providers.hasOwnProperty(constants.twoFactorProvider.duo)) { - add(constants.twoFactorProvider.duo); - } - if (providers.hasOwnProperty(constants.twoFactorProvider.u2f) && u2f.isSupported) { - add(constants.twoFactorProvider.u2f); - } - - $scope.choose = function (provider) { - $uibModalInstance.close(provider.type); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('close'); - }; - - function add(type) { - for (var i = 0; i < constants.twoFactorProviderInfo.length; i++) { - if (constants.twoFactorProviderInfo[i].type === type) { - $scope.providers.push(constants.twoFactorProviderInfo[i]); - } - } - } - }); diff --git a/src/app/accounts/accountsVerifyEmailController.js b/src/app/accounts/accountsVerifyEmailController.js deleted file mode 100644 index 8abcd366..00000000 --- a/src/app/accounts/accountsVerifyEmailController.js +++ /dev/null @@ -1,28 +0,0 @@ -angular - .module('bit.accounts') - - .controller('accountsVerifyEmailController', function ($scope, $state, apiService, toastr, $analytics) { - if (!$state.params.userId || !$state.params.token) { - $state.go('frontend.login.info').then(function () { - toastr.error('Invalid parameters.'); - }); - return; - } - - $scope.$on('$viewContentLoaded', function () { - apiService.accounts.verifyEmailToken({}, - { - token: $state.params.token, - userId: $state.params.userId - }, function () { - $analytics.eventTrack('Verified Email'); - $state.go('frontend.login.info', null, { location: 'replace' }).then(function () { - toastr.success('Your email has been verified. Thank you.', 'Success'); - }); - }, function () { - $state.go('frontend.login.info', null, { location: 'replace' }).then(function () { - toastr.error('Unable to verify email.', 'Error'); - }); - }); - }); - }); diff --git a/src/app/accounts/accountsVerifyRecoverDeleteController.js b/src/app/accounts/accountsVerifyRecoverDeleteController.js deleted file mode 100644 index e5a056e7..00000000 --- a/src/app/accounts/accountsVerifyRecoverDeleteController.js +++ /dev/null @@ -1,36 +0,0 @@ -angular - .module('bit.accounts') - - .controller('accountsVerifyRecoverDeleteController', function ($scope, $state, apiService, toastr, $analytics) { - if (!$state.params.userId || !$state.params.token || !$state.params.email) { - $state.go('frontend.login.info').then(function () { - toastr.error('Invalid parameters.'); - }); - return; - } - - $scope.email = $state.params.email; - - $scope.delete = function () { - if (!confirm('Are you sure you want to delete this account? This cannot be undone.')) { - return; - } - - $scope.deleting = true; - apiService.accounts.postDeleteRecoverToken({}, - { - token: $state.params.token, - userId: $state.params.userId - }, function () { - $analytics.eventTrack('Recovered Delete'); - $state.go('frontend.login.info', null, { location: 'replace' }).then(function () { - toastr.success('Your account has been deleted. You can register a new account again if you like.', - 'Success'); - }); - }, function () { - $state.go('frontend.login.info', null, { location: 'replace' }).then(function () { - toastr.error('Unable to delete account.', 'Error'); - }); - }); - }; - }); diff --git a/src/app/accounts/views/accountsLogin.html b/src/app/accounts/views/accountsLogin.html deleted file mode 100644 index 5775b44a..00000000 --- a/src/app/accounts/views/accountsLogin.html +++ /dev/null @@ -1,7 +0,0 @@ - \ No newline at end of file diff --git a/src/app/accounts/views/accountsLoginInfo.html b/src/app/accounts/views/accountsLoginInfo.html deleted file mode 100644 index af9d0ec8..00000000 --- a/src/app/accounts/views/accountsLoginInfo.html +++ /dev/null @@ -1,49 +0,0 @@ - -
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - - -
-
- - - -
-
-
-
- -
-
-
- -
-
-
- -
\ No newline at end of file diff --git a/src/app/accounts/views/accountsLoginTwoFactor.html b/src/app/accounts/views/accountsLoginTwoFactor.html deleted file mode 100644 index 744c9ea7..00000000 --- a/src/app/accounts/views/accountsLoginTwoFactor.html +++ /dev/null @@ -1,168 +0,0 @@ -
- -
- -

- Didn't get the email? - - Send it again - -

-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - - -
-
-
-
- -
-
-
- -
-
-
-
- -
- -
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-

Insert your YubiKey into your computer's USB port, then touch its button.

-

- -

-
- - -
-
-
-
- -
-
-
- -
-
-
-
- -
- -
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- -
-
-
-
- -
-
-
- - Logging in... - -
-
-
-
- -
- -
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-

Insert your Security Key into your computer's USB port. If it has a button, touch it.

-

- -

-
-
-
- -
-
-
- - Logging in... - -
-
-
-
- -
-

- This account has two-step login enabled, however, none of the configured two-step providers are supported by this - web browser. -

- Please use a supported web browser (such as Chrome) and/or add additional providers that are better supported - across web browsers (such as an authenticator app). -
- -
- diff --git a/src/app/accounts/views/accountsOrganizationAccept.html b/src/app/accounts/views/accountsOrganizationAccept.html deleted file mode 100644 index d66e6068..00000000 --- a/src/app/accounts/views/accountsOrganizationAccept.html +++ /dev/null @@ -1,32 +0,0 @@ - diff --git a/src/app/accounts/views/accountsPasswordHint.html b/src/app/accounts/views/accountsPasswordHint.html deleted file mode 100644 index 87b9757d..00000000 --- a/src/app/accounts/views/accountsPasswordHint.html +++ /dev/null @@ -1,39 +0,0 @@ - diff --git a/src/app/accounts/views/accountsRecover.html b/src/app/accounts/views/accountsRecover.html deleted file mode 100644 index 861a3766..00000000 --- a/src/app/accounts/views/accountsRecover.html +++ /dev/null @@ -1,56 +0,0 @@ - diff --git a/src/app/accounts/views/accountsRecoverDelete.html b/src/app/accounts/views/accountsRecoverDelete.html deleted file mode 100644 index fb97049c..00000000 --- a/src/app/accounts/views/accountsRecoverDelete.html +++ /dev/null @@ -1,39 +0,0 @@ - diff --git a/src/app/accounts/views/accountsRegister.html b/src/app/accounts/views/accountsRegister.html deleted file mode 100644 index 7b3434be..00000000 --- a/src/app/accounts/views/accountsRegister.html +++ /dev/null @@ -1,82 +0,0 @@ -
- -
- -
-
-

Account Created!

-

You may now log in to your new account.

-
- Ready to log in? -
-
-
-

Create Organization, Step 1

-

Before creating your organization, you first need to create a free personal account.

-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - - -

You'll use your email address to log in.

-
-
- - - -

What should we call you?

-
-
- - - -

The master password is the password you use to access your vault.

-
-
- - - -

- It is very important that you do not forget your master password. - There is no way to recover the password in the event that you forget it. -

-
-
- - - -

A master password hint can help you remember your password if you forget it.

-
-
-
- Already have an account? -
-
- -
-
-
- By clicking the above "Submit" button, you are agreeing to the - Terms of Service - and the - Privacy Policy. -
-
-
\ No newline at end of file diff --git a/src/app/accounts/views/accountsTwoFactorMethods.html b/src/app/accounts/views/accountsTwoFactorMethods.html deleted file mode 100644 index 7efd3309..00000000 --- a/src/app/accounts/views/accountsTwoFactorMethods.html +++ /dev/null @@ -1,25 +0,0 @@ -
- -

Two-step Providers

-
-
-
- - -

{{::provider.name}}

-

{{::provider.description}}

- -
-
- -

Recovery Code

-

- Lost access to all of your two-factor providers? Use your recovery code to disable - all two-factor providers from your account. -

- -
-
-
- -
diff --git a/src/app/accounts/views/accountsVerifyEmail.html b/src/app/accounts/views/accountsVerifyEmail.html deleted file mode 100644 index 7bd695ea..00000000 --- a/src/app/accounts/views/accountsVerifyEmail.html +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/src/app/accounts/views/accountsVerifyRecoverDelete.html b/src/app/accounts/views/accountsVerifyRecoverDelete.html deleted file mode 100644 index 0821995c..00000000 --- a/src/app/accounts/views/accountsVerifyRecoverDelete.html +++ /dev/null @@ -1,21 +0,0 @@ - diff --git a/src/app/apiInterceptor.js b/src/app/apiInterceptor.js deleted file mode 100644 index 76a79c22..00000000 --- a/src/app/apiInterceptor.js +++ /dev/null @@ -1,33 +0,0 @@ -angular - .module('bit') - - .factory('apiInterceptor', function ($injector, $q, toastr, appSettings, utilsService) { - return { - request: function (config) { - if (config.url.indexOf(appSettings.apiUri + '/') === 0) { - config.headers['Device-Type'] = utilsService.getDeviceType(); - } - - return config; - }, - response: function (response) { - if (response.status === 401 || response.status === 403) { - $injector.get('authService').logOut(); - $injector.get('$state').go('frontend.login.info').then(function () { - toastr.warning('Your login session has expired.', 'Logged out'); - }); - } - - return response || $q.when(response); - }, - responseError: function (rejection) { - if (rejection.status === 401 || rejection.status === 403) { - $injector.get('authService').logOut(); - $injector.get('$state').go('frontend.login.info').then(function () { - toastr.warning('Your login session has expired.', 'Logged out'); - }); - } - return $q.reject(rejection); - } - }; - }); \ No newline at end of file diff --git a/src/app/app.js b/src/app/app.js deleted file mode 100644 index 496bb2ac..00000000 --- a/src/app/app.js +++ /dev/null @@ -1,27 +0,0 @@ -angular - .module('bit', [ - 'ui.router', - 'ngMessages', - 'angular-jwt', - 'ui.bootstrap.showErrors', - 'toastr', - 'angulartics', - // @if !selfHosted - 'angulartics.google.analytics', - 'angular-stripe', - 'credit-cards', - // @endif - 'angular-promise-polyfill', - - 'bit.directives', - 'bit.filters', - 'bit.services', - - 'bit.global', - 'bit.accounts', - 'bit.vault', - 'bit.settings', - 'bit.tools', - 'bit.organization', - 'bit.reports' - ]); diff --git a/src/app/config.js b/src/app/config.js deleted file mode 100644 index 0b665f3f..00000000 --- a/src/app/config.js +++ /dev/null @@ -1,367 +0,0 @@ -angular - .module('bit') - - .config(function ($stateProvider, $urlRouterProvider, $httpProvider, jwtInterceptorProvider, jwtOptionsProvider, - $uibTooltipProvider, toastrConfig, $locationProvider, $qProvider, appSettings - // @if !selfHosted - /* jshint ignore:start */ - , stripeProvider - /* jshint ignore:end */ - // @endif - ) { - angular.extend(appSettings, window.bitwardenAppSettings); - - $qProvider.errorOnUnhandledRejections(false); - $locationProvider.hashPrefix(''); - - jwtOptionsProvider.config({ - whiteListedDomains: ['localhost', 'api.bitwarden.com', 'vault.bitwarden.com', 'haveibeenpwned.com'] - }); - - var refreshPromise; - jwtInterceptorProvider.tokenGetter = /*@ngInject*/ function (options, tokenService, authService) { - if (options.url.indexOf(appSettings.apiUri + '/') !== 0) { - return; - } - - if (refreshPromise) { - return refreshPromise; - } - - var token = tokenService.getToken(); - if (!token) { - return; - } - - if (!tokenService.tokenNeedsRefresh(token)) { - return token; - } - - var p = authService.refreshAccessToken(); - if (!p) { - return; - } - - refreshPromise = p.then(function (newToken) { - refreshPromise = null; - return newToken || token; - }); - return refreshPromise; - }; - - // @if !selfHosted - stripeProvider.setPublishableKey(appSettings.stripeKey); - // @endif - - angular.extend(toastrConfig, { - closeButton: true, - progressBar: true, - showMethod: 'slideDown', - target: '.toast-target' - }); - - $uibTooltipProvider.options({ - popupDelay: 600, - appendToBody: true - }); - - // stop IE from caching get requests - if (navigator.userAgent.indexOf('MSIE') !== -1 || navigator.appVersion.indexOf('Trident/') > 0) { - if (!$httpProvider.defaults.headers.get) { - $httpProvider.defaults.headers.get = {}; - } - $httpProvider.defaults.headers.get['Cache-Control'] = 'no-cache'; - $httpProvider.defaults.headers.get.Pragma = 'no-cache'; - } - - $httpProvider.interceptors.push('apiInterceptor'); - $httpProvider.interceptors.push('jwtInterceptor'); - - $urlRouterProvider.otherwise('/'); - - $stateProvider - // Backend - .state('backend', { - templateUrl: 'app/views/backendLayout.html', - abstract: true, - data: { - authorize: true - } - }) - .state('backend.user', { - templateUrl: 'app/views/userLayout.html', - abstract: true - }) - .state('backend.user.vault', { - url: '^/vault', - templateUrl: 'app/vault/views/vault.html', - controller: 'vaultController', - data: { - pageTitle: 'My Vault', - controlSidebar: true - }, - params: { - refreshFromServer: false - } - }) - .state('backend.user.settings', { - url: '^/settings', - templateUrl: 'app/settings/views/settings.html', - controller: 'settingsController', - data: { pageTitle: 'Settings' } - }) - .state('backend.user.settingsDomains', { - url: '^/settings/domains', - templateUrl: 'app/settings/views/settingsDomains.html', - controller: 'settingsDomainsController', - data: { pageTitle: 'Domain Settings' } - }) - .state('backend.user.settingsTwoStep', { - url: '^/settings/two-step', - templateUrl: 'app/settings/views/settingsTwoStep.html', - controller: 'settingsTwoStepController', - data: { pageTitle: 'Two-step Login' } - }) - .state('backend.user.settingsCreateOrg', { - url: '^/settings/create-organization', - templateUrl: 'app/settings/views/settingsCreateOrganization.html', - controller: 'settingsCreateOrganizationController', - data: { pageTitle: 'Create Organization' } - }) - .state('backend.user.settingsBilling', { - url: '^/settings/billing', - templateUrl: 'app/settings/views/settingsBilling.html', - controller: 'settingsBillingController', - data: { pageTitle: 'Billing' } - }) - .state('backend.user.settingsPremium', { - url: '^/settings/premium', - templateUrl: 'app/settings/views/settingsPremium.html', - controller: 'settingsPremiumController', - data: { pageTitle: 'Go Premium' } - }) - .state('backend.user.tools', { - url: '^/tools', - templateUrl: 'app/tools/views/tools.html', - controller: 'toolsController', - data: { pageTitle: 'Tools' } - }) - .state('backend.user.reportsBreach', { - url: '^/reports/breach', - templateUrl: 'app/reports/views/reportsBreach.html', - controller: 'reportsBreachController', - data: { pageTitle: 'Data Breach Report' } - }) - .state('backend.org', { - templateUrl: 'app/views/organizationLayout.html', - abstract: true - }) - .state('backend.org.dashboard', { - url: '^/organization/:orgId', - templateUrl: 'app/organization/views/organizationDashboard.html', - controller: 'organizationDashboardController', - data: { pageTitle: 'Organization Dashboard' } - }) - .state('backend.org.people', { - url: '/organization/:orgId/people?viewEvents&search', - templateUrl: 'app/organization/views/organizationPeople.html', - controller: 'organizationPeopleController', - data: { pageTitle: 'Organization People' } - }) - .state('backend.org.collections', { - url: '/organization/:orgId/collections?search', - templateUrl: 'app/organization/views/organizationCollections.html', - controller: 'organizationCollectionsController', - data: { pageTitle: 'Organization Collections' } - }) - .state('backend.org.settings', { - url: '/organization/:orgId/settings', - templateUrl: 'app/organization/views/organizationSettings.html', - controller: 'organizationSettingsController', - data: { pageTitle: 'Organization Settings' } - }) - .state('backend.org.billing', { - url: '/organization/:orgId/billing', - templateUrl: 'app/organization/views/organizationBilling.html', - controller: 'organizationBillingController', - data: { pageTitle: 'Organization Billing' } - }) - .state('backend.org.vault', { - url: '/organization/:orgId/vault?viewEvents&search', - templateUrl: 'app/organization/views/organizationVault.html', - controller: 'organizationVaultController', - data: { - pageTitle: 'Organization Vault', - controlSidebar: true - } - }) - .state('backend.org.groups', { - url: '/organization/:orgId/groups?search', - templateUrl: 'app/organization/views/organizationGroups.html', - controller: 'organizationGroupsController', - data: { pageTitle: 'Organization Groups' } - }) - .state('backend.org.events', { - url: '/organization/:orgId/events', - templateUrl: 'app/organization/views/organizationEvents.html', - controller: 'organizationEventsController', - data: { pageTitle: 'Organization Events' } - }) - - // Frontend - .state('frontend', { - templateUrl: 'app/views/frontendLayout.html', - abstract: true, - data: { - authorize: false - } - }) - .state('frontend.login', { - templateUrl: 'app/accounts/views/accountsLogin.html', - controller: 'accountsLoginController', - params: { - returnState: null, - email: null, - premium: null, - org: null - }, - data: { - bodyClass: 'login-page' - } - }) - .state('frontend.login.info', { - url: '^/?org&premium&email', - templateUrl: 'app/accounts/views/accountsLoginInfo.html', - data: { - pageTitle: 'Log In' - } - }) - .state('frontend.login.twoFactor', { - url: '^/two-step?org&premium&email', - templateUrl: 'app/accounts/views/accountsLoginTwoFactor.html', - data: { - pageTitle: 'Log In (Two-step)' - } - }) - .state('frontend.logout', { - url: '^/logout', - controller: 'accountsLogoutController', - data: { - authorize: true - } - }) - .state('frontend.passwordHint', { - url: '^/password-hint', - templateUrl: 'app/accounts/views/accountsPasswordHint.html', - controller: 'accountsPasswordHintController', - data: { - pageTitle: 'Master Password Hint', - bodyClass: 'login-page' - } - }) - .state('frontend.recover', { - url: '^/recover', - templateUrl: 'app/accounts/views/accountsRecover.html', - controller: 'accountsRecoverController', - data: { - pageTitle: 'Recover Account', - bodyClass: 'login-page' - } - }) - .state('frontend.recover-delete', { - url: '^/recover-delete', - templateUrl: 'app/accounts/views/accountsRecoverDelete.html', - controller: 'accountsRecoverDeleteController', - data: { - pageTitle: 'Delete Account', - bodyClass: 'login-page' - } - }) - .state('frontend.verify-recover-delete', { - url: '^/verify-recover-delete?userId&token&email', - templateUrl: 'app/accounts/views/accountsVerifyRecoverDelete.html', - controller: 'accountsVerifyRecoverDeleteController', - data: { - pageTitle: 'Confirm Delete Account', - bodyClass: 'login-page' - } - }) - .state('frontend.register', { - url: '^/register?org&premium', - templateUrl: 'app/accounts/views/accountsRegister.html', - controller: 'accountsRegisterController', - params: { - returnState: null, - email: null, - org: null, - premium: null - }, - data: { - pageTitle: 'Register', - bodyClass: 'register-page' - } - }) - .state('frontend.organizationAccept', { - url: '^/accept-organization?organizationId&organizationUserId&token&email&organizationName', - templateUrl: 'app/accounts/views/accountsOrganizationAccept.html', - controller: 'accountsOrganizationAcceptController', - data: { - pageTitle: 'Accept Organization Invite', - bodyClass: 'login-page', - skipAuthorize: true - } - }) - .state('frontend.verifyEmail', { - url: '^/verify-email?userId&token', - templateUrl: 'app/accounts/views/accountsVerifyEmail.html', - controller: 'accountsVerifyEmailController', - data: { - pageTitle: 'Verifying Email', - bodyClass: 'login-page', - skipAuthorize: true - } - }); - }) - .run(function ($rootScope, authService, $state) { - $rootScope.$on('$stateChangeSuccess', function () { - $('html, body').animate({ scrollTop: 0 }, 200); - }); - - $rootScope.$on('$stateChangeStart', function (event, toState, toParams) { - if (!toState.data || !toState.data.authorize) { - if (toState.data && toState.data.skipAuthorize) { - return; - } - - if (!authService.isAuthenticated()) { - return; - } - - event.preventDefault(); - $state.go('backend.user.vault'); - return; - } - - if (!authService.isAuthenticated()) { - event.preventDefault(); - authService.logOut(); - $state.go('frontend.login.info'); - return; - } - - // user is guaranteed to be authenticated becuase of previous check - if (toState.name.indexOf('backend.org.') > -1 && toParams.orgId) { - // clear vault rootScope when visiting org admin section - $rootScope.vaultCiphers = $rootScope.vaultFolders = $rootScope.vaultCollections = null; - - authService.getUserProfile().then(function (profile) { - var orgs = profile.organizations; - if (!orgs || !(toParams.orgId in orgs) || orgs[toParams.orgId].status !== 2 || - orgs[toParams.orgId].type === 2) { - event.preventDefault(); - $state.go('backend.user.vault'); - } - }); - } - }); - }); \ No newline at end of file diff --git a/src/app/constants.js b/src/app/constants.js deleted file mode 100644 index 24797a40..00000000 --- a/src/app/constants.js +++ /dev/null @@ -1,220 +0,0 @@ -angular.module('bit') - .constant('constants', { - rememberedEmailCookieName: 'bit.rememberedEmail', - encType: { - AesCbc256_B64: 0, - AesCbc128_HmacSha256_B64: 1, - AesCbc256_HmacSha256_B64: 2, - Rsa2048_OaepSha256_B64: 3, - Rsa2048_OaepSha1_B64: 4, - Rsa2048_OaepSha256_HmacSha256_B64: 5, - Rsa2048_OaepSha1_HmacSha256_B64: 6 - }, - orgUserType: { - owner: 0, - admin: 1, - user: 2 - }, - orgUserStatus: { - invited: 0, - accepted: 1, - confirmed: 2 - }, - twoFactorProvider: { - u2f: 4, - yubikey: 3, - duo: 2, - authenticator: 0, - email: 1, - remember: 5, - organizationDuo: 6 - }, - cipherType: { - login: 1, - secureNote: 2, - card: 3, - identity: 4 - }, - fieldType: { - text: 0, - hidden: 1, - boolean: 2 - }, - deviceType: { - android: 0, - ios: 1, - chromeExt: 2, - firefoxExt: 3, - operaExt: 4, - edgeExt: 5, - windowsDesktop: 6, - macOsDesktop: 7, - linuxDesktop: 8, - chrome: 9, - firefox: 10, - opera: 11, - edge: 12, - ie: 13, - unknown: 14, - uwp: 16, - safari: 17, - vivaldi: 18, - vivaldiExt: 19 - }, - eventType: { - User_LoggedIn: 1000, - User_ChangedPassword: 1001, - User_Enabled2fa: 1002, - User_Disabled2fa: 1003, - User_Recovered2fa: 1004, - User_FailedLogIn: 1005, - User_FailedLogIn2fa: 1006, - - Cipher_Created: 1100, - Cipher_Updated: 1101, - Cipher_Deleted: 1102, - Cipher_AttachmentCreated: 1103, - Cipher_AttachmentDeleted: 1104, - Cipher_Shared: 1105, - Cipher_UpdatedCollections: 1106, - - Collection_Created: 1300, - Collection_Updated: 1301, - Collection_Deleted: 1302, - - Group_Created: 1400, - Group_Updated: 1401, - Group_Deleted: 1402, - - OrganizationUser_Invited: 1500, - OrganizationUser_Confirmed: 1501, - OrganizationUser_Updated: 1502, - OrganizationUser_Removed: 1503, - OrganizationUser_UpdatedGroups: 1504, - - Organization_Updated: 1600 - }, - twoFactorProviderInfo: [ - { - type: 0, - name: 'Authenticator App', - description: 'Use an authenticator app (such as Authy or Google Authenticator) to generate time-based ' + - 'verification codes.', - enabled: false, - active: true, - free: true, - image: 'authapp.png', - displayOrder: 0, - priority: 1, - requiresUsb: false, - organization: false - }, - { - type: 3, - name: 'YubiKey OTP Security Key', - description: 'Use a YubiKey to access your account. Works with YubiKey 4, 4 Nano, 4C, and NEO devices.', - enabled: false, - active: true, - image: 'yubico.png', - displayOrder: 1, - priority: 3, - requiresUsb: true, - organization: false - }, - { - type: 2, - name: 'Duo', - description: 'Verify with Duo Security using the Duo Mobile app, SMS, phone call, or U2F security key.', - enabled: false, - active: true, - image: 'duo.png', - displayOrder: 2, - priority: 2, - requiresUsb: false, - organization: false - }, - { - type: 4, - name: 'FIDO U2F Security Key', - description: 'Use any FIDO U2F enabled security key to access your account.', - enabled: false, - active: true, - image: 'fido.png', - displayOrder: 3, - priority: 4, - requiresUsb: true, - organization: false - }, - { - type: 1, - name: 'Email', - description: 'Verification codes will be emailed to you.', - enabled: false, - active: true, - free: true, - image: 'gmail.png', - displayOrder: 4, - priority: 0, - requiresUsb: false, - organization: false - }, - { - type: 6, - name: 'Duo (Organization)', - description: 'Verify with Duo Security for your organization using the Duo Mobile app, SMS, ' + - 'phone call, or U2F security key.', - enabled: false, - active: true, - image: 'duo.png', - displayOrder: 1, - priority: 10, - requiresUsb: false, - organization: true - } - ], - plans: { - free: { - basePrice: 0, - noAdditionalSeats: true, - noPayment: true, - upgradeSortOrder: -1 - }, - families: { - basePrice: 1, - annualBasePrice: 12, - baseSeats: 5, - noAdditionalSeats: true, - annualPlanType: 'familiesAnnually', - upgradeSortOrder: 1 - }, - teams: { - basePrice: 5, - annualBasePrice: 60, - monthlyBasePrice: 8, - baseSeats: 5, - seatPrice: 2, - annualSeatPrice: 24, - monthlySeatPrice: 2.5, - monthPlanType: 'teamsMonthly', - annualPlanType: 'teamsAnnually', - upgradeSortOrder: 2 - }, - enterprise: { - seatPrice: 3, - annualSeatPrice: 36, - monthlySeatPrice: 4, - monthPlanType: 'enterpriseMonthly', - annualPlanType: 'enterpriseAnnually', - upgradeSortOrder: 3 - } - }, - storageGb: { - price: 0.33, - monthlyPrice: 0.50, - yearlyPrice: 4 - }, - premium: { - price: 10, - yearlyPrice: 10 - } - }); diff --git a/src/app/directives/apiFieldDirective.js b/src/app/directives/apiFieldDirective.js deleted file mode 100644 index a053712a..00000000 --- a/src/app/directives/apiFieldDirective.js +++ /dev/null @@ -1,30 +0,0 @@ -angular - .module('bit.directives') - - .directive('apiField', function () { - var linkFn = function (scope, element, attrs, ngModel) { - ngModel.$registerApiError = registerApiError; - ngModel.$validators.apiValidate = apiValidator; - - function apiValidator() { - ngModel.$setValidity('api', true); - return true; - } - - function registerApiError() { - ngModel.$setValidity('api', false); - } - }; - - return { - require: 'ngModel', - restrict: 'A', - compile: function (elem, attrs) { - if (!attrs.name || attrs.name === '') { - throw 'api-field element does not have a valid name attribute'; - } - - return linkFn; - } - }; - }); \ No newline at end of file diff --git a/src/app/directives/apiFormDirective.js b/src/app/directives/apiFormDirective.js deleted file mode 100644 index b1842cf2..00000000 --- a/src/app/directives/apiFormDirective.js +++ /dev/null @@ -1,45 +0,0 @@ -angular - .module('bit.directives') - - .directive('apiForm', function ($rootScope, validationService, $timeout) { - return { - require: 'form', - restrict: 'A', - link: function (scope, element, attrs, formCtrl) { - var watchPromise = attrs.apiForm || null; - if (watchPromise !== void 0) { - scope.$watch(watchPromise, formSubmitted.bind(null, formCtrl, scope)); - } - } - }; - - function formSubmitted(form, scope, promise) { - if (!promise || !promise.then) { - return; - } - - // reset errors - form.$errors = null; - - // start loading - form.$loading = true; - - promise.then(function success(response) { - $timeout(function () { - form.$loading = false; - }); - }, function failure(reason) { - $timeout(function () { - form.$loading = false; - if (typeof reason === 'string') { - validationService.addError(form, null, reason, true); - } - else { - validationService.addErrors(form, reason); - } - scope.$broadcast('show-errors-check-validity'); - $('html, body').animate({ scrollTop: 0 }, 200); - }); - }); - } - }); \ No newline at end of file diff --git a/src/app/directives/directivesModule.js b/src/app/directives/directivesModule.js deleted file mode 100644 index ad4865f1..00000000 --- a/src/app/directives/directivesModule.js +++ /dev/null @@ -1,2 +0,0 @@ -angular - .module('bit.directives', []); diff --git a/src/app/directives/fallbackSrcDirective.js b/src/app/directives/fallbackSrcDirective.js deleted file mode 100644 index 1df1015e..00000000 --- a/src/app/directives/fallbackSrcDirective.js +++ /dev/null @@ -1,11 +0,0 @@ -angular - .module('bit.directives') - - .directive('fallbackSrc', function () { - return function (scope, element, attrs) { - var el = $(element); - el.bind('error', function (event) { - el.attr('src', attrs.fallbackSrc); - }); - }; - }); diff --git a/src/app/directives/letterAvatarDirective.js b/src/app/directives/letterAvatarDirective.js deleted file mode 100644 index 774f6a18..00000000 --- a/src/app/directives/letterAvatarDirective.js +++ /dev/null @@ -1,151 +0,0 @@ -angular - .module('bit.directives') - - // adaptation of https://github.com/uttesh/ngletteravatar - .directive('letterAvatar', function () { - // ref: http://stackoverflow.com/a/16348977/1090359 - function stringToColor(str) { - var hash = 0, - i = 0; - for (i = 0; i < str.length; i++) { - hash = str.charCodeAt(i) + ((hash << 5) - hash); - } - - var color = '#'; - for (i = 0; i < 3; i++) { - var value = (hash >> (i * 8)) & 0xFF; - color += ('00' + value.toString(16)).substr(-2); - } - - return color; - } - - function getFirstLetters(data, count) { - var parts = data.split(' '); - if (parts && parts.length > 1) { - var text = ''; - for (var i = 0; i < count; i++) { - text += parts[i].substr(0, 1); - } - return text; - } - - return null; - } - - function getSvg(width, height, color) { - var svgTag = angular.element('') - .attr({ - 'xmlns': 'http://www.w3.org/2000/svg', - 'pointer-events': 'none', - 'width': width, - 'height': height - }) - .css({ - 'background-color': color, - 'width': width + 'px', - 'height': height + 'px' - }); - - return svgTag; - } - - function getCharText(character, textColor, fontFamily, fontWeight, fontsize) { - var textTag = angular.element('') - .attr({ - 'y': '50%', - 'x': '50%', - 'dy': '0.35em', - 'pointer-events': 'auto', - 'fill': textColor, - 'font-family': fontFamily - }) - .text(character) - .css({ - 'font-weight': fontWeight, - 'font-size': fontsize + 'px', - }); - - return textTag; - } - - return { - restrict: 'AE', - replace: true, - scope: { - data: '@' - }, - link: function (scope, element, attrs) { - var params = { - charCount: attrs.charcount || 2, - data: attrs.data, - textColor: attrs.textcolor || '#ffffff', - bgColor: attrs.bgcolor, - height: attrs.avheight || 45, - width: attrs.avwidth || 45, - fontSize: attrs.fontsize || 20, - fontWeight: attrs.fontweight || 300, - fontFamily: attrs.fontfamily || 'Open Sans, HelveticaNeue-Light, Helvetica Neue Light, ' + - 'Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif', - round: attrs.round || 'true', - dynamic: attrs.dynamic || 'true', - class: attrs.avclass || '', - border: attrs.avborder || 'false', - borderStyle: attrs.borderstyle || '3px solid white' - }; - - if (params.dynamic === 'true') { - scope.$watch('data', function () { - generateLetterAvatar(); - }); - } - else { - generateLetterAvatar(); - } - - function generateLetterAvatar() { - var c = null, - upperData = scope.data.toUpperCase(); - - if (params.charCount > 1) { - c = getFirstLetters(upperData, params.charCount); - } - - if (!c) { - c = upperData.substr(0, params.charCount); - } - - var cobj = getCharText(c, params.textColor, params.fontFamily, params.fontWeight, params.fontSize); - var color = params.bgColor ? params.bgColor : stringToColor(upperData); - var svg = getSvg(params.width, params.height, color); - svg.append(cobj); - var lvcomponent = angular.element('
').append(svg).html(); - - var svgHtml = window.btoa(unescape(encodeURIComponent(lvcomponent))); - var src = 'data:image/svg+xml;base64,' + svgHtml; - - var img = angular.element('').attr({ src: src, title: scope.data }); - - if (params.round === 'true') { - img.css('border-radius', '50%'); - } - - if (params.border === 'true') { - img.css('border', params.borderStyle); - } - - if (params.class) { - img.addClass(params.class); - } - - if (params.dynamic === 'true') { - element.empty(); - element.append(img); - } - else { - element.replaceWith(img); - } - } - } - }; - }); diff --git a/src/app/directives/masterPasswordDirective.js b/src/app/directives/masterPasswordDirective.js deleted file mode 100644 index f80d6d7c..00000000 --- a/src/app/directives/masterPasswordDirective.js +++ /dev/null @@ -1,38 +0,0 @@ -angular - .module('bit.directives') - - .directive('masterPassword', function (cryptoService, authService) { - return { - require: 'ngModel', - restrict: 'A', - link: function (scope, elem, attr, ngModel) { - authService.getUserProfile().then(function (profile) { - // For DOM -> model validation - ngModel.$parsers.unshift(function (value) { - if (!value) { - return undefined; - } - - return cryptoService.makeKey(value, profile.email).then(function (result) { - var valid = result.keyB64 === cryptoService.getKey().keyB64; - ngModel.$setValidity('masterPassword', valid); - return valid ? value : undefined; - }); - }); - - // For model -> DOM validation - ngModel.$formatters.unshift(function (value) { - if (!value) { - return undefined; - } - - return cryptoService.makeKey(value, profile.email).then(function (result) { - var valid = result.keyB64 === cryptoService.getKey().keyB64; - ngModel.$setValidity('masterPassword', valid); - return value; - }); - }); - }); - } - }; - }); \ No newline at end of file diff --git a/src/app/directives/pageTitleDirective.js b/src/app/directives/pageTitleDirective.js deleted file mode 100644 index a5fc2bdd..00000000 --- a/src/app/directives/pageTitleDirective.js +++ /dev/null @@ -1,22 +0,0 @@ -angular - .module('bit.directives') - - .directive('pageTitle', function ($rootScope, $timeout, appSettings) { - return { - link: function (scope, element) { - var listener = function (event, toState, toParams, fromState, fromParams) { - // Default title - var title = 'Bitwarden Web Vault'; - if (toState.data && toState.data.pageTitle) { - title = toState.data.pageTitle + ' - ' + title; - } - - $timeout(function () { - element.text(title); - }); - }; - - $rootScope.$on('$stateChangeStart', listener); - } - }; - }); \ No newline at end of file diff --git a/src/app/directives/passwordMeterDirective.js b/src/app/directives/passwordMeterDirective.js deleted file mode 100644 index 15b6e86f..00000000 --- a/src/app/directives/passwordMeterDirective.js +++ /dev/null @@ -1,73 +0,0 @@ -angular - .module('bit.directives') - - .directive('passwordMeter', function () { - return { - template: '
{{value}}%
', - restrict: 'A', - scope: { - password: '=passwordMeter', - username: '=passwordMeterUsername', - outerClass: '@?' - }, - link: function (scope) { - var measureStrength = function (username, password) { - if (!password || password === username) { - return 0; - } - - var strength = password.length; - - if (username && username !== '') { - if (username.indexOf(password) !== -1) strength -= 15; - if (password.indexOf(username) !== -1) strength -= username.length; - } - - if (password.length > 0 && password.length <= 4) strength += password.length; - else if (password.length >= 5 && password.length <= 7) strength += 6; - else if (password.length >= 8 && password.length <= 15) strength += 12; - else if (password.length >= 16) strength += 18; - - if (password.match(/[a-z]/)) strength += 1; - if (password.match(/[A-Z]/)) strength += 5; - if (password.match(/\d/)) strength += 5; - if (password.match(/.*\d.*\d.*\d/)) strength += 5; - if (password.match(/[!,@,#,$,%,^,&,*,?,_,~]/)) strength += 5; - if (password.match(/.*[!,@,#,$,%,^,&,*,?,_,~].*[!,@,#,$,%,^,&,*,?,_,~]/)) strength += 5; - if (password.match(/(?=.*[a-z])(?=.*[A-Z])/)) strength += 2; - if (password.match(/(?=.*\d)(?=.*[a-z])(?=.*[A-Z])/)) strength += 2; - if (password.match(/(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[!,@,#,$,%,^,&,*,?,_,~])/)) strength += 2; - - strength = Math.round(strength * 2); - return Math.max(0, Math.min(100, strength)); - }; - - var getClass = function (strength) { - switch (Math.round(strength / 33)) { - case 0: - case 1: - return 'danger'; - case 2: - return 'warning'; - case 3: - return 'success'; - } - }; - - var updateMeter = function (scope) { - scope.value = measureStrength(scope.username, scope.password); - scope.valueClass = getClass(scope.value); - }; - - scope.$watch('password', function () { - updateMeter(scope); - }); - - scope.$watch('username', function () { - updateMeter(scope); - }); - }, - }; - }); diff --git a/src/app/directives/passwordViewerDirective.js b/src/app/directives/passwordViewerDirective.js deleted file mode 100644 index 67f36267..00000000 --- a/src/app/directives/passwordViewerDirective.js +++ /dev/null @@ -1,27 +0,0 @@ -angular - .module('bit.directives') - - .directive('passwordViewer', function () { - return { - restrict: 'A', - link: function (scope, element, attr) { - var passwordViewer = attr.passwordViewer; - if (!passwordViewer) { - return; - } - - element.onclick = function (event) { }; - element.on('click', function (event) { - var passwordElement = $(passwordViewer); - if (passwordElement && passwordElement.attr('type') === 'password') { - element.removeClass('fa-eye').addClass('fa-eye-slash'); - passwordElement.attr('type', 'text'); - } - else if (passwordElement && passwordElement.attr('type') === 'text') { - element.removeClass('fa-eye-slash').addClass('fa-eye'); - passwordElement.attr('type', 'password'); - } - }); - } - }; - }); diff --git a/src/app/directives/stopClickDirective.js b/src/app/directives/stopClickDirective.js deleted file mode 100644 index edbcbe62..00000000 --- a/src/app/directives/stopClickDirective.js +++ /dev/null @@ -1,11 +0,0 @@ -angular - .module('bit.directives') - - // ref: https://stackoverflow.com/a/14165848/1090359 - .directive('stopClick', function () { - return function (scope, element, attrs) { - $(element).click(function (event) { - event.preventDefault(); - }); - }; - }); diff --git a/src/app/directives/stopPropDirective.js b/src/app/directives/stopPropDirective.js deleted file mode 100644 index 5b0f6060..00000000 --- a/src/app/directives/stopPropDirective.js +++ /dev/null @@ -1,10 +0,0 @@ -angular - .module('bit.directives') - - .directive('stopProp', function () { - return function (scope, element, attrs) { - $(element).click(function (event) { - event.stopPropagation(); - }); - }; - }); diff --git a/src/app/directives/totpDirective.js b/src/app/directives/totpDirective.js deleted file mode 100644 index 965c924e..00000000 --- a/src/app/directives/totpDirective.js +++ /dev/null @@ -1,193 +0,0 @@ -angular - .module('bit.directives') - - .directive('totp', function ($timeout, $q) { - return { - template: '
' + - '{{sec}}' + - '' + - '' + - '{{codeFormatted}}' + - '' + - '' + - '
', - restrict: 'A', - scope: { - key: '=totp' - }, - link: function (scope) { - var interval = null; - - var Totp = function () { - var b32Chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567'; - - var leftpad = function (s, l, p) { - if (l + 1 >= s.length) { - s = Array(l + 1 - s.length).join(p) + s; - } - return s; - }; - - var dec2hex = function (d) { - return (d < 15.5 ? '0' : '') + Math.round(d).toString(16); - }; - - var hex2dec = function (s) { - return parseInt(s, 16); - }; - - var hex2bytes = function (s) { - var bytes = new Uint8Array(s.length / 2); - for (var i = 0; i < s.length; i += 2) { - bytes[i / 2] = parseInt(s.substr(i, 2), 16); - } - return bytes; - }; - - var buff2hex = function (buff) { - var bytes = new Uint8Array(buff); - var hex = []; - for (var i = 0; i < bytes.length; i++) { - hex.push((bytes[i] >>> 4).toString(16)); - hex.push((bytes[i] & 0xF).toString(16)); - } - return hex.join(''); - }; - - var b32tohex = function (s) { - s = s.toUpperCase(); - var cleanedInput = ''; - var i; - for (i = 0; i < s.length; i++) { - if (b32Chars.indexOf(s[i]) < 0) { - continue; - } - - cleanedInput += s[i]; - } - s = cleanedInput; - - var bits = ''; - var hex = ''; - for (i = 0; i < s.length; i++) { - var byteIndex = b32Chars.indexOf(s.charAt(i)); - if (byteIndex < 0) { - continue; - } - bits += leftpad(byteIndex.toString(2), 5, '0'); - } - for (i = 0; i + 4 <= bits.length; i += 4) { - var chunk = bits.substr(i, 4); - hex = hex + parseInt(chunk, 2).toString(16); - } - return hex; - }; - - var b32tobytes = function (s) { - return hex2bytes(b32tohex(s)); - }; - - var sign = function (keyBytes, timeBytes) { - return window.crypto.subtle.importKey('raw', keyBytes, - { name: 'HMAC', hash: { name: 'SHA-1' } }, false, ['sign']).then(function (key) { - return window.crypto.subtle.sign({ name: 'HMAC', hash: { name: 'SHA-1' } }, key, timeBytes); - }).then(function (signature) { - return buff2hex(signature); - }).catch(function (err) { - return null; - }); - }; - - this.getCode = function (keyb32) { - var epoch = Math.round(new Date().getTime() / 1000.0); - var timeHex = leftpad(dec2hex(Math.floor(epoch / 30)), 16, '0'); - var timeBytes = hex2bytes(timeHex); - var keyBytes = b32tobytes(keyb32); - - if (!keyBytes.length || !timeBytes.length) { - return $q(function (resolve, reject) { - resolve(null); - }); - } - - return sign(keyBytes, timeBytes).then(function (hashHex) { - if (!hashHex) { - return null; - } - - var offset = hex2dec(hashHex.substring(hashHex.length - 1)); - var otp = (hex2dec(hashHex.substr(offset * 2, 8)) & hex2dec('7fffffff')) + ''; - otp = (otp).substr(otp.length - 6, 6); - return otp; - }); - }; - }; - - var totp = new Totp(); - - var updateCode = function (scope) { - totp.getCode(scope.key).then(function (code) { - $timeout(function () { - if (code) { - scope.codeFormatted = code.substring(0, 3) + ' ' + code.substring(3); - scope.code = code; - } - else { - scope.code = null; - if (interval) { - clearInterval(interval); - } - } - }); - }); - }; - - var tick = function (scope) { - $timeout(function () { - var epoch = Math.round(new Date().getTime() / 1000.0); - var mod = epoch % 30; - var sec = 30 - mod; - - scope.sec = sec; - scope.dash = (2.62 * mod).toFixed(2); - scope.low = sec <= 7; - if (mod === 0) { - updateCode(scope); - } - }); - }; - - scope.$watch('key', function () { - if (!scope.key) { - scope.code = null; - if (interval) { - clearInterval(interval); - } - return; - } - - updateCode(scope); - tick(scope); - - if (interval) { - clearInterval(interval); - } - - interval = setInterval(function () { - tick(scope); - }, 1000); - }); - - scope.$on('$destroy', function () { - if (interval) { - clearInterval(interval); - } - }); - - scope.clipboardError = function (e) { - alert('Your web browser does not support easy clipboard copying.'); - }; - }, - }; - }); diff --git a/src/app/filters/enumLabelClassFilter.js b/src/app/filters/enumLabelClassFilter.js deleted file mode 100644 index 84a5d57b..00000000 --- a/src/app/filters/enumLabelClassFilter.js +++ /dev/null @@ -1,32 +0,0 @@ -angular - .module('bit.filters') - - .filter('enumLabelClass', function () { - return function (input, name) { - if (typeof input !== 'number') { - return input.toString(); - } - - var output; - switch (name) { - case 'OrgUserStatus': - switch (input) { - case 0: - output = 'label-default'; - break; - case 1: - output = 'label-warning'; - break; - case 2: - /* falls through */ - default: - output = 'label-success'; - } - break; - default: - output = 'label-default'; - } - - return output; - }; - }); diff --git a/src/app/filters/enumNameFilter.js b/src/app/filters/enumNameFilter.js deleted file mode 100644 index 5678c497..00000000 --- a/src/app/filters/enumNameFilter.js +++ /dev/null @@ -1,46 +0,0 @@ -angular - .module('bit.filters') - - .filter('enumName', function () { - return function (input, name) { - if (typeof input !== 'number') { - return input.toString(); - } - - var output; - switch (name) { - case 'OrgUserStatus': - switch (input) { - case 0: - output = 'Invited'; - break; - case 1: - output = 'Accepted'; - break; - case 2: - /* falls through */ - default: - output = 'Confirmed'; - } - break; - case 'OrgUserType': - switch (input) { - case 0: - output = 'Owner'; - break; - case 1: - output = 'Admin'; - break; - case 2: - /* falls through */ - default: - output = 'User'; - } - break; - default: - output = input.toString(); - } - - return output; - }; - }); diff --git a/src/app/filters/filtersModule.js b/src/app/filters/filtersModule.js deleted file mode 100644 index 02c0dc59..00000000 --- a/src/app/filters/filtersModule.js +++ /dev/null @@ -1,2 +0,0 @@ -angular - .module('bit.filters', []); diff --git a/src/app/global/globalModule.js b/src/app/global/globalModule.js deleted file mode 100644 index 9af6c4b9..00000000 --- a/src/app/global/globalModule.js +++ /dev/null @@ -1,2 +0,0 @@ -angular - .module('bit.global', []); diff --git a/src/app/global/mainController.js b/src/app/global/mainController.js deleted file mode 100644 index a6878c43..00000000 --- a/src/app/global/mainController.js +++ /dev/null @@ -1,187 +0,0 @@ -angular - .module('bit.global') - - .controller('mainController', function ($scope, $state, authService, appSettings, toastr, $window, $document, - cryptoService, $uibModal, apiService) { - var vm = this; - vm.skinClass = appSettings.selfHosted ? 'skin-blue-light' : 'skin-blue'; - vm.bodyClass = ''; - vm.usingControlSidebar = vm.openControlSidebar = false; - vm.searchVaultText = null; - vm.version = appSettings.version; - vm.outdatedBrowser = $window.navigator.userAgent.indexOf('MSIE') !== -1 || - $window.navigator.userAgent.indexOf('SamsungBrowser') !== -1; - - $scope.currentYear = new Date().getFullYear(); - - $scope.$on('$viewContentLoaded', function () { - authService.getUserProfile().then(function (profile) { - vm.userProfile = profile; - }); - - if ($.AdminLTE) { - if ($.AdminLTE.layout) { - $.AdminLTE.layout.fix(); - $.AdminLTE.layout.fixSidebar(); - } - - if ($.AdminLTE.pushMenu) { - $.AdminLTE.pushMenu.expandOnHover(); - } - - $document.off('click', '.sidebar li a'); - } - }); - - $scope.$on('$stateChangeSuccess', function (event, toState, toParams, fromState, fromParams) { - vm.usingEncKey = !!cryptoService.getEncKey(); - vm.searchVaultText = null; - - if (toState.data.bodyClass) { - vm.bodyClass = toState.data.bodyClass; - return; - } - else { - vm.bodyClass = ''; - } - - vm.usingControlSidebar = !!toState.data.controlSidebar; - vm.openControlSidebar = vm.usingControlSidebar && $document.width() > 768; - }); - - $scope.addCipher = function () { - $scope.$broadcast('vaultAddCipher'); - }; - - $scope.addFolder = function () { - $scope.$broadcast('vaultAddFolder'); - }; - - $scope.addOrganizationCipher = function () { - $scope.$broadcast('organizationVaultAddCipher'); - }; - - $scope.addOrganizationCollection = function () { - $scope.$broadcast('organizationCollectionsAdd'); - }; - - $scope.inviteOrganizationUser = function () { - $scope.$broadcast('organizationPeopleInvite'); - }; - - $scope.addOrganizationGroup = function () { - $scope.$broadcast('organizationGroupsAdd'); - }; - - $scope.updateKey = function () { - $uibModal.open({ - animation: true, - templateUrl: 'app/settings/views/settingsUpdateKey.html', - controller: 'settingsUpdateKeyController' - }); - }; - - $scope.verifyEmail = function () { - if ($scope.sendingVerify) { - return; - } - - $scope.sendingVerify = true; - apiService.accounts.verifyEmail({}, null).$promise.then(function () { - toastr.success('Verification email sent.'); - $scope.sendingVerify = false; - $scope.verifyEmailSent = true; - }).catch(function () { - toastr.success('Verification email failed.'); - $scope.sendingVerify = false; - }); - }; - - $scope.updateBrowser = function () { - $window.open('https://browser-update.org/update.html', '_blank'); - }; - - // Append dropdown menu somewhere else - var bodyScrollbarWidth, - appendedDropdownMenu, - appendedDropdownMenuParent; - - var dropdownHelpers = { - scrollbarWidth: function () { - if (!bodyScrollbarWidth) { - var bodyElem = $('body'); - bodyElem.addClass('bit-position-body-scrollbar-measure'); - bodyScrollbarWidth = $window.innerWidth - bodyElem[0].clientWidth; - bodyScrollbarWidth = isFinite(bodyScrollbarWidth) ? bodyScrollbarWidth : 0; - bodyElem.removeClass('bit-position-body-scrollbar-measure'); - } - - return bodyScrollbarWidth; - }, - scrollbarInfo: function () { - return { - width: dropdownHelpers.scrollbarWidth(), - visible: $document.height() > $($window).height() - }; - } - }; - - $(window).on('show.bs.dropdown', function (e) { - /*jshint -W120 */ - var target = appendedDropdownMenuParent = $(e.target); - - var appendTo = target.data('appendTo'); - if (!appendTo) { - return true; - } - - appendedDropdownMenu = target.find('.dropdown-menu'); - var appendToEl = $(appendTo); - appendToEl.append(appendedDropdownMenu.detach()); - - var offset = target.offset(); - var css = { - display: 'block', - top: offset.top + target.outerHeight() - (appendTo !== 'body' ? $(window).scrollTop() : 0) - }; - - if (appendedDropdownMenu.hasClass('dropdown-menu-right')) { - var scrollbarInfo = dropdownHelpers.scrollbarInfo(); - var scrollbarWidth = 0; - if (scrollbarInfo.visible && scrollbarInfo.width) { - scrollbarWidth = scrollbarInfo.width; - } - - css.right = $window.innerWidth - scrollbarWidth - (offset.left + target.prop('offsetWidth')) + 'px'; - css.left = 'auto'; - } - else { - css.left = offset.left + 'px'; - css.right = 'auto'; - } - - appendedDropdownMenu.css(css); - }); - - $(window).on('hide.bs.dropdown', function (e) { - if (!appendedDropdownMenu) { - return true; - } - - $(e.target).append(appendedDropdownMenu.detach()); - appendedDropdownMenu.hide(); - appendedDropdownMenu = null; - appendedDropdownMenuParent = null; - }); - - $scope.$on('removeAppendedDropdownMenu', function (event, args) { - if (!appendedDropdownMenu && !appendedDropdownMenuParent) { - return true; - } - - appendedDropdownMenuParent.append(appendedDropdownMenu.detach()); - appendedDropdownMenu.hide(); - appendedDropdownMenu = null; - appendedDropdownMenuParent = null; - }); - }); diff --git a/src/app/global/paidOrgRequiredController.js b/src/app/global/paidOrgRequiredController.js deleted file mode 100644 index e303d542..00000000 --- a/src/app/global/paidOrgRequiredController.js +++ /dev/null @@ -1,26 +0,0 @@ -angular - .module('bit.global') - - .controller('paidOrgRequiredController', function ($scope, $state, $uibModalInstance, $analytics, $uibModalStack, orgId, - constants, authService) { - $analytics.eventTrack('paidOrgRequiredController', { category: 'Modal' }); - - authService.getUserProfile().then(function (profile) { - $scope.admin = profile.organizations[orgId].type !== constants.orgUserType.user; - }); - - $scope.go = function () { - if (!$scope.admin) { - return; - } - - $analytics.eventTrack('Get Paid Org'); - $state.go('backend.org.billing', { orgId: orgId }).then(function () { - $uibModalStack.dismissAll(); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('close'); - }; - }); diff --git a/src/app/global/premiumRequiredController.js b/src/app/global/premiumRequiredController.js deleted file mode 100644 index 9b870eb8..00000000 --- a/src/app/global/premiumRequiredController.js +++ /dev/null @@ -1,17 +0,0 @@ -angular - .module('bit.global') - - .controller('premiumRequiredController', function ($scope, $state, $uibModalInstance, $analytics, $uibModalStack) { - $analytics.eventTrack('premiumRequiredController', { category: 'Modal' }); - - $scope.go = function () { - $analytics.eventTrack('Get Premium'); - $state.go('backend.user.settingsPremium').then(function () { - $uibModalStack.dismissAll(); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('close'); - }; - }); diff --git a/src/app/global/sideNavController.js b/src/app/global/sideNavController.js deleted file mode 100644 index 287e60d6..00000000 --- a/src/app/global/sideNavController.js +++ /dev/null @@ -1,57 +0,0 @@ -angular - .module('bit.global') - - .controller('sideNavController', function ($scope, $state, authService, toastr, $analytics, constants, appSettings) { - $scope.$state = $state; - $scope.params = $state.params; - $scope.orgs = []; - $scope.name = ''; - - if(appSettings.selfHosted) { - $scope.orgIconBgColor = '#ffffff'; - $scope.orgIconBorder = '3px solid #a0a0a0'; - $scope.orgIconTextColor = '#333333'; - } - else { - $scope.orgIconBgColor = '#2c3b41'; - $scope.orgIconBorder = '3px solid #1a2226'; - $scope.orgIconTextColor = '#ffffff'; - } - - authService.getUserProfile().then(function (userProfile) { - $scope.name = userProfile.extended && userProfile.extended.name ? - userProfile.extended.name : userProfile.email; - - if (!userProfile.organizations) { - return; - } - - if ($state.includes('backend.org') && ($state.params.orgId in userProfile.organizations)) { - $scope.orgProfile = userProfile.organizations[$state.params.orgId]; - } - else { - var orgs = []; - for (var orgId in userProfile.organizations) { - if (userProfile.organizations.hasOwnProperty(orgId) && - (userProfile.organizations[orgId].enabled || userProfile.organizations[orgId].type < 2)) { // 2 = User - orgs.push(userProfile.organizations[orgId]); - } - } - $scope.orgs = orgs; - } - }); - - $scope.viewOrganization = function (org) { - if (org.type === constants.orgUserType.user) { - toastr.error('You cannot manage this organization.'); - return; - } - - $analytics.eventTrack('View Organization From Side Nav'); - $state.go('backend.org.dashboard', { orgId: org.id }); - }; - - $scope.isOrgOwner = function (org) { - return org && org.type === constants.orgUserType.owner; - }; - }); diff --git a/src/app/global/topNavController.js b/src/app/global/topNavController.js deleted file mode 100644 index 521f9b5d..00000000 --- a/src/app/global/topNavController.js +++ /dev/null @@ -1,14 +0,0 @@ -angular - .module('bit.global') - - .controller('topNavController', function ($scope) { - $scope.toggleControlSidebar = function () { - var bod = $('body'); - if (!bod.hasClass('control-sidebar-open')) { - bod.addClass('control-sidebar-open'); - } - else { - bod.removeClass('control-sidebar-open'); - } - }; - }); diff --git a/src/app/organization/organizationBillingAdjustSeatsController.js b/src/app/organization/organizationBillingAdjustSeatsController.js deleted file mode 100644 index 8aa31d15..00000000 --- a/src/app/organization/organizationBillingAdjustSeatsController.js +++ /dev/null @@ -1,37 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationBillingAdjustSeatsController', function ($scope, $state, $uibModalInstance, apiService, - $analytics, toastr, add) { - $analytics.eventTrack('organizationBillingAdjustSeatsController', { category: 'Modal' }); - $scope.add = add; - $scope.seatAdjustment = 0; - - $scope.submit = function () { - var request = { - seatAdjustment: $scope.seatAdjustment - }; - - if (!add) { - request.seatAdjustment *= -1; - } - - $scope.submitPromise = apiService.organizations.putSeat({ id: $state.params.orgId }, request) - .$promise.then(function (response) { - if (add) { - $analytics.eventTrack('Added Seats'); - toastr.success('You have added ' + $scope.seatAdjustment + ' seats.'); - } - else { - $analytics.eventTrack('Removed Seats'); - toastr.success('You have removed ' + $scope.seatAdjustment + ' seats.'); - } - - $uibModalInstance.close(); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationBillingAdjustStorageController.js b/src/app/organization/organizationBillingAdjustStorageController.js deleted file mode 100644 index 7363da1b..00000000 --- a/src/app/organization/organizationBillingAdjustStorageController.js +++ /dev/null @@ -1,37 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationBillingAdjustStorageController', function ($scope, $state, $uibModalInstance, apiService, - $analytics, toastr, add) { - $analytics.eventTrack('organizationBillingAdjustStorageController', { category: 'Modal' }); - $scope.add = add; - $scope.storageAdjustment = 0; - - $scope.submit = function () { - var request = { - storageGbAdjustment: $scope.storageAdjustment - }; - - if (!add) { - request.storageGbAdjustment *= -1; - } - - $scope.submitPromise = apiService.organizations.putStorage({ id: $state.params.orgId }, request) - .$promise.then(function (response) { - if (add) { - $analytics.eventTrack('Added Organization Storage'); - toastr.success('You have added ' + $scope.storageAdjustment + ' GB.'); - } - else { - $analytics.eventTrack('Removed Organization Storage'); - toastr.success('You have removed ' + $scope.storageAdjustment + ' GB.'); - } - - $uibModalInstance.close(); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationBillingChangePaymentController.js b/src/app/organization/organizationBillingChangePaymentController.js deleted file mode 100644 index 8b31b045..00000000 --- a/src/app/organization/organizationBillingChangePaymentController.js +++ /dev/null @@ -1,64 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationBillingChangePaymentController', function ($scope, $state, $uibModalInstance, apiService, - $analytics, toastr, existingPaymentMethod - // @if !selfHosted - /* jshint ignore:start */ - , stripe - /* jshint ignore:end */ - // @endif - ) { - $analytics.eventTrack('organizationBillingChangePaymentController', { category: 'Modal' }); - $scope.existingPaymentMethod = existingPaymentMethod; - $scope.paymentMethod = 'card'; - $scope.showPaymentOptions = true; - $scope.hidePaypal = true; - $scope.card = {}; - $scope.bank = {}; - - $scope.changePaymentMethod = function (val) { - $scope.paymentMethod = val; - }; - - $scope.submit = function () { - var stripeReq = null; - if ($scope.paymentMethod === 'card') { - stripeReq = stripe.card.createToken($scope.card); - } - else if ($scope.paymentMethod === 'bank') { - $scope.bank.currency = 'USD'; - $scope.bank.country = 'US'; - stripeReq = stripe.bankAccount.createToken($scope.bank); - } - else { - return; - } - - $scope.submitPromise = stripeReq.then(function (response) { - var request = { - paymentToken: response.id - }; - - return apiService.organizations.putPayment({ id: $state.params.orgId }, request).$promise; - }, function (err) { - throw err.message; - }).then(function (response) { - $scope.card = null; - if (existingPaymentMethod) { - $analytics.eventTrack('Changed Organization Payment Method'); - toastr.success('You have changed your payment method.'); - } - else { - $analytics.eventTrack('Added Organization Payment Method'); - toastr.success('You have added a payment method.'); - } - - $uibModalInstance.close(); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationBillingChangePlanController.js b/src/app/organization/organizationBillingChangePlanController.js deleted file mode 100644 index bf587a57..00000000 --- a/src/app/organization/organizationBillingChangePlanController.js +++ /dev/null @@ -1,14 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationBillingChangePlanController', function ($scope, $state, apiService, $uibModalInstance, - toastr, $analytics) { - $analytics.eventTrack('organizationBillingChangePlanController', { category: 'Modal' }); - $scope.submit = function () { - - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationBillingController.js b/src/app/organization/organizationBillingController.js deleted file mode 100644 index 88c09f5f..00000000 --- a/src/app/organization/organizationBillingController.js +++ /dev/null @@ -1,305 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationBillingController', function ($scope, apiService, $state, $uibModal, toastr, $analytics, - appSettings, tokenService, $window) { - $scope.selfHosted = appSettings.selfHosted; - $scope.charges = []; - $scope.paymentSource = null; - $scope.plan = null; - $scope.subscription = null; - $scope.loading = true; - var license = null; - $scope.expiration = null; - - $scope.$on('$viewContentLoaded', function () { - load(); - }); - - $scope.changePayment = function () { - if ($scope.selfHosted) { - return; - } - - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/settings/views/settingsBillingChangePayment.html', - controller: 'organizationBillingChangePaymentController', - resolve: { - existingPaymentMethod: function () { - return $scope.paymentSource ? $scope.paymentSource.description : null; - } - } - }); - - modal.result.then(function () { - load(); - }); - }; - - $scope.changePlan = function () { - if ($scope.selfHosted) { - return; - } - - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/organization/views/organizationBillingChangePlan.html', - controller: 'organizationBillingChangePlanController', - resolve: { - plan: function () { - return $scope.plan; - } - } - }); - - modal.result.then(function () { - load(); - }); - }; - - $scope.adjustSeats = function (add) { - if ($scope.selfHosted || !$scope.canAdjustSeats) { - return; - } - - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/organization/views/organizationBillingAdjustSeats.html', - controller: 'organizationBillingAdjustSeatsController', - resolve: { - add: function () { - return add; - } - } - }); - - modal.result.then(function () { - load(); - }); - }; - - $scope.adjustStorage = function (add) { - if ($scope.selfHosted) { - return; - } - - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/settings/views/settingsBillingAdjustStorage.html', - controller: 'organizationBillingAdjustStorageController', - resolve: { - add: function () { - return add; - } - } - }); - - modal.result.then(function () { - load(); - }); - }; - - $scope.verifyBank = function () { - if ($scope.selfHosted) { - return; - } - - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/organization/views/organizationBillingVerifyBank.html', - controller: 'organizationBillingVerifyBankController' - }); - - modal.result.then(function () { - load(); - }); - }; - - $scope.cancel = function () { - if ($scope.selfHosted) { - return; - } - - if (!confirm('Are you sure you want to cancel? All users will lose access to the organization ' + - 'at the end of this billing cycle.')) { - return; - } - - apiService.organizations.putCancel({ id: $state.params.orgId }, {}) - .$promise.then(function (response) { - $analytics.eventTrack('Canceled Plan'); - toastr.success('Organization subscription has been canceled.'); - load(); - }); - }; - - $scope.reinstate = function () { - if ($scope.selfHosted) { - return; - } - - if (!confirm('Are you sure you want to remove the cancellation request and reinstate this organization?')) { - return; - } - - apiService.organizations.putReinstate({ id: $state.params.orgId }, {}) - .$promise.then(function (response) { - $analytics.eventTrack('Reinstated Plan'); - toastr.success('Organization cancellation request has been removed.'); - load(); - }); - }; - - $scope.updateLicense = function () { - if (!$scope.selfHosted) { - return; - } - - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/settings/views/settingsBillingUpdateLicense.html', - controller: 'organizationBillingUpdateLicenseController' - }); - - modal.result.then(function () { - load(); - }); - }; - - $scope.license = function () { - if ($scope.selfHosted) { - return; - } - - var installationId = prompt("Enter your installation id"); - if (!installationId || installationId === '') { - return; - } - - apiService.organizations.getLicense({ - id: $state.params.orgId, - installationId: installationId - }, function (license) { - var licenseString = JSON.stringify(license, null, 2); - var licenseBlob = new Blob([licenseString]); - - // IE hack. ref http://msdn.microsoft.com/en-us/library/ie/hh779016.aspx - if (window.navigator.msSaveOrOpenBlob) { - window.navigator.msSaveBlob(licenseBlob, 'bitwarden_organization_license.json'); - } - else { - var a = window.document.createElement('a'); - a.href = window.URL.createObjectURL(licenseBlob, { type: 'text/plain' }); - a.download = 'bitwarden_organization_license.json'; - document.body.appendChild(a); - // IE: "Access is denied". - // ref: https://connect.microsoft.com/IE/feedback/details/797361/ie-10-treats-blob-url-as-cross-origin-and-denies-access - a.click(); - document.body.removeChild(a); - } - }, function (err) { - if (err.status === 400) { - toastr.error("Invalid installation id."); - } - else { - toastr.error("Unable to generate license."); - } - }); - }; - - $scope.viewInvoice = function (charge) { - if ($scope.selfHosted) { - return; - } - var url = appSettings.apiUri + '/organizations/' + $state.params.orgId + - '/billing-invoice/' + charge.invoiceId + '?access_token=' + tokenService.getToken(); - $window.open(url); - }; - - function load() { - apiService.organizations.getBilling({ id: $state.params.orgId }, function (org) { - $scope.loading = false; - $scope.noSubscription = org.PlanType === 0; - $scope.canAdjustSeats = org.PlanType > 1; - - var i = 0; - $scope.expiration = org.Expiration; - license = org.License; - - $scope.plan = { - name: org.Plan, - type: org.PlanType, - seats: org.Seats - }; - - $scope.storage = null; - if ($scope && org.MaxStorageGb) { - $scope.storage = { - currentGb: org.StorageGb || 0, - maxGb: org.MaxStorageGb, - currentName: org.StorageName || '0 GB' - }; - - $scope.storage.percentage = +(100 * ($scope.storage.currentGb / $scope.storage.maxGb)).toFixed(2); - } - - $scope.subscription = null; - if (org.Subscription) { - $scope.subscription = { - trialEndDate: org.Subscription.TrialEndDate, - cancelledDate: org.Subscription.CancelledDate, - status: org.Subscription.Status, - cancelled: org.Subscription.Cancelled, - markedForCancel: !org.Subscription.Cancelled && org.Subscription.CancelAtEndDate - }; - } - - $scope.nextInvoice = null; - if (org.UpcomingInvoice) { - $scope.nextInvoice = { - date: org.UpcomingInvoice.Date, - amount: org.UpcomingInvoice.Amount - }; - } - - if (org.Subscription && org.Subscription.Items) { - $scope.subscription.items = []; - for (i = 0; i < org.Subscription.Items.length; i++) { - $scope.subscription.items.push({ - amount: org.Subscription.Items[i].Amount, - name: org.Subscription.Items[i].Name, - interval: org.Subscription.Items[i].Interval, - qty: org.Subscription.Items[i].Quantity - }); - } - } - - $scope.paymentSource = null; - if (org.PaymentSource) { - $scope.paymentSource = { - type: org.PaymentSource.Type, - description: org.PaymentSource.Description, - cardBrand: org.PaymentSource.CardBrand, - needsVerification: org.PaymentSource.NeedsVerification - }; - } - - var charges = []; - for (i = 0; i < org.Charges.length; i++) { - charges.push({ - date: org.Charges[i].CreatedDate, - paymentSource: org.Charges[i].PaymentSource ? org.Charges[i].PaymentSource.Description : '-', - amount: org.Charges[i].Amount, - status: org.Charges[i].Status, - failureMessage: org.Charges[i].FailureMessage, - refunded: org.Charges[i].Refunded, - partiallyRefunded: org.Charges[i].PartiallyRefunded, - refundedAmount: org.Charges[i].RefundedAmount, - invoiceId: org.Charges[i].InvoiceId - }); - } - $scope.charges = charges; - }); - } - }); diff --git a/src/app/organization/organizationBillingUpdateLicenseController.js b/src/app/organization/organizationBillingUpdateLicenseController.js deleted file mode 100644 index 0b8d3ba2..00000000 --- a/src/app/organization/organizationBillingUpdateLicenseController.js +++ /dev/null @@ -1,30 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationBillingUpdateLicenseController', function ($scope, $state, $uibModalInstance, apiService, - $analytics, toastr, validationService) { - $analytics.eventTrack('organizationBillingUpdateLicenseController', { category: 'Modal' }); - - $scope.submit = function (form) { - var fileEl = document.getElementById('file'); - var files = fileEl.files; - if (!files || !files.length) { - validationService.addError(form, 'file', 'Select a license file.', true); - return; - } - - var fd = new FormData(); - fd.append('license', files[0]); - - $scope.submitPromise = apiService.organizations.putLicense({ id: $state.params.orgId }, fd) - .$promise.then(function (response) { - $analytics.eventTrack('Updated License'); - toastr.success('You have updated your license.'); - $uibModalInstance.close(); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationBillingVerifyBankController.js b/src/app/organization/organizationBillingVerifyBankController.js deleted file mode 100644 index 9489ebbc..00000000 --- a/src/app/organization/organizationBillingVerifyBankController.js +++ /dev/null @@ -1,25 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationBillingVerifyBankController', function ($scope, $state, $uibModalInstance, apiService, - $analytics, toastr) { - $analytics.eventTrack('organizationBillingVerifyBankController', { category: 'Modal' }); - - $scope.submit = function () { - var request = { - amount1: $scope.amount1, - amount2: $scope.amount2 - }; - - $scope.submitPromise = apiService.organizations.postVerifyBank({ id: $state.params.orgId }, request) - .$promise.then(function (response) { - $analytics.eventTrack('Verified Bank Account'); - toastr.success('You have successfully verified your bank account.'); - $uibModalInstance.close(); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationCollectionsAddController.js b/src/app/organization/organizationCollectionsAddController.js deleted file mode 100644 index a8516a97..00000000 --- a/src/app/organization/organizationCollectionsAddController.js +++ /dev/null @@ -1,120 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationCollectionsAddController', function ($scope, $state, $uibModalInstance, apiService, cipherService, - $analytics, authService) { - $analytics.eventTrack('organizationCollectionsAddController', { category: 'Modal' }); - var groupsLength = 0; - $scope.groups = []; - $scope.selectedGroups = {}; - $scope.loading = true; - $scope.useGroups = false; - - $uibModalInstance.opened.then(function () { - return authService.getUserProfile(); - }).then(function (profile) { - if (profile.organizations) { - var org = profile.organizations[$state.params.orgId]; - $scope.useGroups = !!org.useGroups; - } - - if ($scope.useGroups) { - return apiService.groups.listOrganization({ orgId: $state.params.orgId }).$promise; - } - - return null; - }).then(function (groups) { - if (!groups) { - $scope.loading = false; - return; - } - - var groupsArr = []; - for (var i = 0; i < groups.Data.length; i++) { - groupsArr.push({ - id: groups.Data[i].Id, - name: groups.Data[i].Name, - accessAll: groups.Data[i].AccessAll - }); - - if (!groups.Data[i].AccessAll) { - groupsLength++; - } - } - - $scope.groups = groupsArr; - $scope.loading = false; - }); - - $scope.toggleGroupSelectionAll = function ($event) { - var groups = {}; - if ($event.target.checked) { - for (var i = 0; i < $scope.groups.length; i++) { - groups[$scope.groups[i].id] = { - id: $scope.groups[i].id, - readOnly: ($scope.groups[i].id in $scope.selectedGroups) ? - $scope.selectedGroups[$scope.groups[i].id].readOnly : false - }; - } - } - - $scope.selectedGroups = groups; - }; - - $scope.toggleGroupSelection = function (id) { - if (id in $scope.selectedGroups) { - delete $scope.selectedGroups[id]; - } - else { - $scope.selectedGroups[id] = { - id: id, - readOnly: false - }; - } - }; - - $scope.toggleGroupReadOnlySelection = function (group) { - if (group.id in $scope.selectedGroups) { - $scope.selectedGroups[group.id].readOnly = !group.accessAll && !!!$scope.selectedGroups[group.id].readOnly; - } - }; - - $scope.groupSelected = function (group) { - return group.id in $scope.selectedGroups || group.accessAll; - }; - - $scope.allSelected = function () { - return Object.keys($scope.selectedGroups).length >= groupsLength; - }; - - $scope.submit = function (model) { - var collection = cipherService.encryptCollection(model, $state.params.orgId); - - if ($scope.useGroups) { - collection.groups = []; - - for (var groupId in $scope.selectedGroups) { - if ($scope.selectedGroups.hasOwnProperty(groupId)) { - for (var i = 0; i < $scope.groups.length; i++) { - if ($scope.groups[i].id === $scope.selectedGroups[groupId].id) { - if (!$scope.groups[i].accessAll) { - collection.groups.push($scope.selectedGroups[groupId]); - } - break; - } - } - } - } - } - - $scope.submitPromise = apiService.collections.post({ orgId: $state.params.orgId }, collection, function (response) { - $analytics.eventTrack('Created Collection'); - var decCollection = cipherService.decryptCollection(response, $state.params.orgId, true); - $uibModalInstance.close(decCollection); - }).$promise; - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationCollectionsController.js b/src/app/organization/organizationCollectionsController.js deleted file mode 100644 index 880d3932..00000000 --- a/src/app/organization/organizationCollectionsController.js +++ /dev/null @@ -1,107 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationCollectionsController', function ($scope, $state, apiService, $uibModal, cipherService, $filter, - toastr, $analytics, $uibModalStack) { - $scope.collections = []; - $scope.loading = true; - $scope.$on('$viewContentLoaded', function () { - loadList(); - }); - - $scope.$on('organizationCollectionsAdd', function (event, args) { - $scope.add(); - }); - - $scope.add = function () { - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/organization/views/organizationCollectionsAdd.html', - controller: 'organizationCollectionsAddController' - }); - - modal.result.then(function (collection) { - $scope.collections.push(collection); - }); - }; - - $scope.edit = function (collection) { - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/organization/views/organizationCollectionsEdit.html', - controller: 'organizationCollectionsEditController', - resolve: { - id: function () { return collection.id; } - } - }); - - modal.result.then(function (editedCollection) { - var existingCollections = $filter('filter')($scope.collections, { id: editedCollection.id }, true); - if (existingCollections && existingCollections.length > 0) { - existingCollections[0].name = editedCollection.name; - } - }); - }; - - $scope.users = function (collection) { - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/organization/views/organizationCollectionsUsers.html', - controller: 'organizationCollectionsUsersController', - size: 'lg', - resolve: { - collection: function () { return collection; } - } - }); - - modal.result.then(function () { - // nothing to do - }); - }; - - $scope.groups = function (collection) { - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/organization/views/organizationCollectionsGroups.html', - controller: 'organizationCollectionsGroupsController', - resolve: { - collection: function () { return collection; } - } - }); - - modal.result.then(function () { - // nothing to do - }); - }; - - $scope.delete = function (collection) { - if (!confirm('Are you sure you want to delete this collection (' + collection.name + ')?')) { - return; - } - - apiService.collections.del({ orgId: $state.params.orgId, id: collection.id }, function () { - var index = $scope.collections.indexOf(collection); - if (index > -1) { - $scope.collections.splice(index, 1); - } - - $analytics.eventTrack('Deleted Collection'); - toastr.success(collection.name + ' has been deleted.', 'Collection Deleted'); - }, function () { - toastr.error(collection.name + ' was not able to be deleted.', 'Error'); - }); - }; - - function loadList() { - apiService.collections.listOrganization({ orgId: $state.params.orgId }, function (list) { - $scope.collections = cipherService.decryptCollections(list.Data, $state.params.orgId, true); - $scope.loading = false; - - if ($state.params.search) { - $uibModalStack.dismissAll(); - $scope.filterSearch = $state.params.search; - $('#filterSearch').focus(); - } - }); - } - }); diff --git a/src/app/organization/organizationCollectionsEditController.js b/src/app/organization/organizationCollectionsEditController.js deleted file mode 100644 index 26bb0f22..00000000 --- a/src/app/organization/organizationCollectionsEditController.js +++ /dev/null @@ -1,139 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationCollectionsEditController', function ($scope, $state, $uibModalInstance, apiService, cipherService, - $analytics, id, authService) { - $analytics.eventTrack('organizationCollectionsEditController', { category: 'Modal' }); - var groupsLength = 0; - $scope.collection = {}; - $scope.groups = []; - $scope.selectedGroups = {}; - $scope.loading = true; - $scope.useGroups = false; - - $uibModalInstance.opened.then(function () { - return apiService.collections.getDetails({ orgId: $state.params.orgId, id: id }).$promise; - }).then(function (collection) { - $scope.collection = cipherService.decryptCollection(collection); - - var groups = {}; - if (collection.Groups) { - for (var i = 0; i < collection.Groups.length; i++) { - groups[collection.Groups[i].Id] = { - id: collection.Groups[i].Id, - readOnly: collection.Groups[i].ReadOnly - }; - } - } - $scope.selectedGroups = groups; - - return authService.getUserProfile(); - }).then(function (profile) { - if (profile.organizations) { - var org = profile.organizations[$state.params.orgId]; - $scope.useGroups = !!org.useGroups; - } - - if ($scope.useGroups) { - return apiService.groups.listOrganization({ orgId: $state.params.orgId }).$promise; - } - - return null; - }).then(function (groups) { - if (!groups) { - $scope.loading = false; - return; - } - - var groupsArr = []; - for (var i = 0; i < groups.Data.length; i++) { - groupsArr.push({ - id: groups.Data[i].Id, - name: groups.Data[i].Name, - accessAll: groups.Data[i].AccessAll - }); - - if (!groups.Data[i].AccessAll) { - groupsLength++; - } - } - - $scope.groups = groupsArr; - $scope.loading = false; - }); - - $scope.toggleGroupSelectionAll = function ($event) { - var groups = {}; - if ($event.target.checked) { - for (var i = 0; i < $scope.groups.length; i++) { - groups[$scope.groups[i].id] = { - id: $scope.groups[i].id, - readOnly: ($scope.groups[i].id in $scope.selectedGroups) ? - $scope.selectedGroups[$scope.groups[i].id].readOnly : false - }; - } - } - - $scope.selectedGroups = groups; - }; - - $scope.toggleGroupSelection = function (id) { - if (id in $scope.selectedGroups) { - delete $scope.selectedGroups[id]; - } - else { - $scope.selectedGroups[id] = { - id: id, - readOnly: false - }; - } - }; - - $scope.toggleGroupReadOnlySelection = function (group) { - if (group.id in $scope.selectedGroups) { - $scope.selectedGroups[group.id].readOnly = !group.accessAll && !!!$scope.selectedGroups[group.id].readOnly; - } - }; - - $scope.groupSelected = function (group) { - return group.id in $scope.selectedGroups || group.accessAll; - }; - - $scope.allSelected = function () { - return Object.keys($scope.selectedGroups).length >= groupsLength; - }; - - $scope.submit = function (model) { - var collection = cipherService.encryptCollection(model, $state.params.orgId); - - if ($scope.useGroups) { - collection.groups = []; - - for (var groupId in $scope.selectedGroups) { - if ($scope.selectedGroups.hasOwnProperty(groupId)) { - for (var i = 0; i < $scope.groups.length; i++) { - if ($scope.groups[i].id === $scope.selectedGroups[groupId].id) { - if (!$scope.groups[i].accessAll) { - collection.groups.push($scope.selectedGroups[groupId]); - } - break; - } - } - } - } - } - - $scope.submitPromise = apiService.collections.put({ - orgId: $state.params.orgId, - id: id - }, collection, function (response) { - $analytics.eventTrack('Edited Collection'); - var decCollection = cipherService.decryptCollection(response, $state.params.orgId, true); - $uibModalInstance.close(decCollection); - }).$promise; - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationCollectionsUsersController.js b/src/app/organization/organizationCollectionsUsersController.js deleted file mode 100644 index 7b230671..00000000 --- a/src/app/organization/organizationCollectionsUsersController.js +++ /dev/null @@ -1,63 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationCollectionsUsersController', function ($scope, $state, $uibModalInstance, apiService, cipherService, - $analytics, collection, toastr) { - $analytics.eventTrack('organizationCollectionsUsersController', { category: 'Modal' }); - $scope.loading = true; - $scope.collection = collection; - $scope.users = []; - - $uibModalInstance.opened.then(function () { - $scope.loading = false; - apiService.collections.listUsers( - { - orgId: $state.params.orgId, - id: collection.id - }, - function (userList) { - if (userList && userList.Data.length) { - var users = []; - for (var i = 0; i < userList.Data.length; i++) { - users.push({ - organizationUserId: userList.Data[i].OrganizationUserId, - name: userList.Data[i].Name, - email: userList.Data[i].Email, - type: userList.Data[i].Type, - status: userList.Data[i].Status, - readOnly: userList.Data[i].ReadOnly, - accessAll: userList.Data[i].AccessAll - }); - } - $scope.users = users; - } - }); - }); - - $scope.remove = function (user) { - if (!confirm('Are you sure you want to remove this user (' + user.email + ') from this ' + - 'collection (' + collection.name + ')?')) { - return; - } - - apiService.collections.delUser( - { - orgId: $state.params.orgId, - id: collection.id, - orgUserId: user.organizationUserId - }, null, function () { - toastr.success(user.email + ' has been removed.', 'User Removed'); - $analytics.eventTrack('Removed User From Collection'); - var index = $scope.users.indexOf(user); - if (index > -1) { - $scope.users.splice(index, 1); - } - }, function () { - toastr.error('Unable to remove user.', 'Error'); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationDashboardController.js b/src/app/organization/organizationDashboardController.js deleted file mode 100644 index 2ad7f5f7..00000000 --- a/src/app/organization/organizationDashboardController.js +++ /dev/null @@ -1,19 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationDashboardController', function ($scope, authService, $state, appSettings) { - $scope.selfHosted = appSettings.selfHosted; - - $scope.$on('$viewContentLoaded', function () { - authService.getUserProfile().then(function (userProfile) { - if (!userProfile.organizations) { - return; - } - $scope.orgProfile = userProfile.organizations[$state.params.orgId]; - }); - }); - - $scope.goBilling = function () { - $state.go('backend.org.billing', { orgId: $state.params.orgId }); - }; - }); diff --git a/src/app/organization/organizationDeleteController.js b/src/app/organization/organizationDeleteController.js deleted file mode 100644 index 9ec08781..00000000 --- a/src/app/organization/organizationDeleteController.js +++ /dev/null @@ -1,25 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationDeleteController', function ($scope, $state, apiService, $uibModalInstance, cryptoService, - authService, toastr, $analytics) { - $analytics.eventTrack('organizationDeleteController', { category: 'Modal' }); - $scope.submit = function () { - $scope.submitPromise = cryptoService.hashPassword($scope.masterPassword).then(function (hash) { - return apiService.organizations.del({ id: $state.params.orgId }, { - masterPasswordHash: hash - }).$promise; - }).then(function () { - $uibModalInstance.dismiss('cancel'); - authService.removeProfileOrganization($state.params.orgId); - $analytics.eventTrack('Deleted Organization'); - return $state.go('backend.user.vault'); - }).then(function () { - toastr.success('This organization and all associated data has been deleted.', 'Organization Deleted'); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationEventsController.js b/src/app/organization/organizationEventsController.js deleted file mode 100644 index 9857cb93..00000000 --- a/src/app/organization/organizationEventsController.js +++ /dev/null @@ -1,100 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationEventsController', function ($scope, $state, apiService, $uibModal, $filter, - toastr, $analytics, constants, eventService, $compile, $sce) { - $scope.events = []; - $scope.orgUsers = []; - $scope.loading = true; - $scope.continuationToken = null; - - var defaultFilters = eventService.getDefaultDateFilters(); - $scope.filterStart = defaultFilters.start; - $scope.filterEnd = defaultFilters.end; - - $scope.$on('$viewContentLoaded', function () { - load(); - }); - - $scope.refresh = function () { - loadEvents(true); - }; - - $scope.next = function () { - loadEvents(false); - }; - - var i = 0, - orgUsersUserIdDict = {}, - orgUsersIdDict = {}; - - function load() { - apiService.organizationUsers.list({ orgId: $state.params.orgId }).$promise.then(function (list) { - var users = []; - for (i = 0; i < list.Data.length; i++) { - var user = { - id: list.Data[i].Id, - userId: list.Data[i].UserId, - name: list.Data[i].Name, - email: list.Data[i].Email - }; - - users.push(user); - - var displayName = user.name || user.email; - orgUsersUserIdDict[user.userId] = displayName; - orgUsersIdDict[user.id] = displayName; - } - - $scope.orgUsers = users; - - return loadEvents(true); - }); - } - - function loadEvents(clearExisting) { - var filterResult = eventService.formatDateFilters($scope.filterStart, $scope.filterEnd); - if (filterResult.error) { - alert(filterResult.error); - return; - } - - if (clearExisting) { - $scope.continuationToken = null; - $scope.events = []; - } - - $scope.loading = true; - return apiService.events.listOrganization({ - orgId: $state.params.orgId, - start: filterResult.start, - end: filterResult.end, - continuationToken: $scope.continuationToken - }).$promise.then(function (list) { - $scope.continuationToken = list.ContinuationToken; - - var events = []; - for (i = 0; i < list.Data.length; i++) { - var userId = list.Data[i].ActingUserId || list.Data[i].UserId; - var eventInfo = eventService.getEventInfo(list.Data[i]); - var htmlMessage = $compile('' + eventInfo.message + '')($scope); - events.push({ - message: $sce.trustAsHtml(htmlMessage[0].outerHTML), - appIcon: eventInfo.appIcon, - appName: eventInfo.appName, - userId: userId, - userName: userId ? (orgUsersUserIdDict[userId] || '-') : '-', - date: list.Data[i].Date, - ip: list.Data[i].IpAddress - }); - } - if ($scope.events && $scope.events.length > 0) { - $scope.events = $scope.events.concat(events); - } - else { - $scope.events = events; - } - $scope.loading = false; - }); - } - }); diff --git a/src/app/organization/organizationGroupsAddController.js b/src/app/organization/organizationGroupsAddController.js deleted file mode 100644 index 8d0bf031..00000000 --- a/src/app/organization/organizationGroupsAddController.js +++ /dev/null @@ -1,87 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationGroupsAddController', function ($scope, $state, $uibModalInstance, apiService, cipherService, - $analytics) { - $analytics.eventTrack('organizationGroupsAddController', { category: 'Modal' }); - $scope.collections = []; - $scope.selectedCollections = {}; - $scope.loading = true; - - $uibModalInstance.opened.then(function () { - return apiService.collections.listOrganization({ orgId: $state.params.orgId }).$promise; - }).then(function (collections) { - $scope.collections = cipherService.decryptCollections(collections.Data, $state.params.orgId, true); - $scope.loading = false; - }); - - $scope.toggleCollectionSelectionAll = function ($event) { - var collections = {}; - if ($event.target.checked) { - for (var i = 0; i < $scope.collections.length; i++) { - collections[$scope.collections[i].id] = { - id: $scope.collections[i].id, - readOnly: ($scope.collections[i].id in $scope.selectedCollections) ? - $scope.selectedCollections[$scope.collections[i].id].readOnly : false - }; - } - } - - $scope.selectedCollections = collections; - }; - - $scope.toggleCollectionSelection = function (id) { - if (id in $scope.selectedCollections) { - delete $scope.selectedCollections[id]; - } - else { - $scope.selectedCollections[id] = { - id: id, - readOnly: false - }; - } - }; - - $scope.toggleCollectionReadOnlySelection = function (id) { - if (id in $scope.selectedCollections) { - $scope.selectedCollections[id].readOnly = !!!$scope.selectedCollections[id].readOnly; - } - }; - - $scope.collectionSelected = function (collection) { - return collection.id in $scope.selectedCollections; - }; - - $scope.allSelected = function () { - return Object.keys($scope.selectedCollections).length === $scope.collections.length; - }; - - $scope.submit = function (model) { - var group = { - name: model.name, - accessAll: !!model.accessAll, - externalId: model.externalId - }; - - if (!group.accessAll) { - group.collections = []; - for (var collectionId in $scope.selectedCollections) { - if ($scope.selectedCollections.hasOwnProperty(collectionId)) { - group.collections.push($scope.selectedCollections[collectionId]); - } - } - } - - $scope.submitPromise = apiService.groups.post({ orgId: $state.params.orgId }, group, function (response) { - $analytics.eventTrack('Created Group'); - $uibModalInstance.close({ - id: response.Id, - name: response.Name - }); - }).$promise; - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationGroupsController.js b/src/app/organization/organizationGroupsController.js deleted file mode 100644 index 7ff81d21..00000000 --- a/src/app/organization/organizationGroupsController.js +++ /dev/null @@ -1,99 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationGroupsController', function ($scope, $state, apiService, $uibModal, $filter, - toastr, $analytics, $uibModalStack) { - $scope.groups = []; - $scope.loading = true; - $scope.$on('$viewContentLoaded', function () { - loadList(); - }); - - $scope.$on('organizationGroupsAdd', function (event, args) { - $scope.add(); - }); - - $scope.add = function () { - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/organization/views/organizationGroupsAdd.html', - controller: 'organizationGroupsAddController' - }); - - modal.result.then(function (group) { - $scope.groups.push(group); - }); - }; - - $scope.edit = function (group) { - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/organization/views/organizationGroupsEdit.html', - controller: 'organizationGroupsEditController', - resolve: { - id: function () { return group.id; } - } - }); - - modal.result.then(function (editedGroup) { - var existingGroups = $filter('filter')($scope.groups, { id: editedGroup.id }, true); - if (existingGroups && existingGroups.length > 0) { - existingGroups[0].name = editedGroup.name; - } - }); - }; - - $scope.users = function (group) { - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/organization/views/organizationGroupsUsers.html', - controller: 'organizationGroupsUsersController', - size: 'lg', - resolve: { - group: function () { return group; } - } - }); - - modal.result.then(function () { - // nothing to do - }); - }; - - $scope.delete = function (group) { - if (!confirm('Are you sure you want to delete this group (' + group.name + ')?')) { - return; - } - - apiService.groups.del({ orgId: $state.params.orgId, id: group.id }, function () { - var index = $scope.groups.indexOf(group); - if (index > -1) { - $scope.groups.splice(index, 1); - } - - $analytics.eventTrack('Deleted Group'); - toastr.success(group.name + ' has been deleted.', 'Group Deleted'); - }, function () { - toastr.error(group.name + ' was not able to be deleted.', 'Error'); - }); - }; - - function loadList() { - apiService.groups.listOrganization({ orgId: $state.params.orgId }, function (list) { - var groups = []; - for (var i = 0; i < list.Data.length; i++) { - groups.push({ - id: list.Data[i].Id, - name: list.Data[i].Name - }); - } - $scope.groups = groups; - $scope.loading = false; - - if ($state.params.search) { - $uibModalStack.dismissAll(); - $scope.filterSearch = $state.params.search; - $('#filterSearch').focus(); - } - }); - } - }); diff --git a/src/app/organization/organizationGroupsEditController.js b/src/app/organization/organizationGroupsEditController.js deleted file mode 100644 index bdaaf071..00000000 --- a/src/app/organization/organizationGroupsEditController.js +++ /dev/null @@ -1,110 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationGroupsEditController', function ($scope, $state, $uibModalInstance, apiService, cipherService, - $analytics, id) { - $analytics.eventTrack('organizationGroupsEditController', { category: 'Modal' }); - $scope.collections = []; - $scope.selectedCollections = {}; - $scope.loading = true; - - $uibModalInstance.opened.then(function () { - return apiService.groups.getDetails({ orgId: $state.params.orgId, id: id }).$promise; - }).then(function (group) { - $scope.group = { - id: id, - name: group.Name, - externalId: group.ExternalId, - accessAll: group.AccessAll - }; - - var collections = {}; - if (group.Collections) { - for (var i = 0; i < group.Collections.length; i++) { - collections[group.Collections[i].Id] = { - id: group.Collections[i].Id, - readOnly: group.Collections[i].ReadOnly - }; - } - } - $scope.selectedCollections = collections; - - return apiService.collections.listOrganization({ orgId: $state.params.orgId }).$promise; - }).then(function (collections) { - $scope.collections = cipherService.decryptCollections(collections.Data, $state.params.orgId, true); - $scope.loading = false; - }); - - $scope.toggleCollectionSelectionAll = function ($event) { - var collections = {}; - if ($event.target.checked) { - for (var i = 0; i < $scope.collections.length; i++) { - collections[$scope.collections[i].id] = { - id: $scope.collections[i].id, - readOnly: ($scope.collections[i].id in $scope.selectedCollections) ? - $scope.selectedCollections[$scope.collections[i].id].readOnly : false - }; - } - } - - $scope.selectedCollections = collections; - }; - - $scope.toggleCollectionSelection = function (id) { - if (id in $scope.selectedCollections) { - delete $scope.selectedCollections[id]; - } - else { - $scope.selectedCollections[id] = { - id: id, - readOnly: false - }; - } - }; - - $scope.toggleCollectionReadOnlySelection = function (id) { - if (id in $scope.selectedCollections) { - $scope.selectedCollections[id].readOnly = !!!$scope.selectedCollections[id].readOnly; - } - }; - - $scope.collectionSelected = function (collection) { - return collection.id in $scope.selectedCollections; - }; - - $scope.allSelected = function () { - return Object.keys($scope.selectedCollections).length === $scope.collections.length; - }; - - $scope.submit = function () { - var group = { - name: $scope.group.name, - accessAll: !!$scope.group.accessAll, - externalId: $scope.group.externalId - }; - - if (!group.accessAll) { - group.collections = []; - for (var collectionId in $scope.selectedCollections) { - if ($scope.selectedCollections.hasOwnProperty(collectionId)) { - group.collections.push($scope.selectedCollections[collectionId]); - } - } - } - - $scope.submitPromise = apiService.groups.put({ - orgId: $state.params.orgId, - id: id - }, group, function (response) { - $analytics.eventTrack('Edited Group'); - $uibModalInstance.close({ - id: response.Id, - name: response.Name - }); - }).$promise; - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationGroupsUsersController.js b/src/app/organization/organizationGroupsUsersController.js deleted file mode 100644 index 4b3f1188..00000000 --- a/src/app/organization/organizationGroupsUsersController.js +++ /dev/null @@ -1,57 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationGroupsUsersController', function ($scope, $state, $uibModalInstance, apiService, - $analytics, group, toastr) { - $analytics.eventTrack('organizationGroupUsersController', { category: 'Modal' }); - $scope.loading = true; - $scope.group = group; - $scope.users = []; - - $uibModalInstance.opened.then(function () { - return apiService.groups.listUsers({ - orgId: $state.params.orgId, - id: group.id - }).$promise; - }).then(function (userList) { - var users = []; - if (userList && userList.Data.length) { - for (var i = 0; i < userList.Data.length; i++) { - users.push({ - organizationUserId: userList.Data[i].OrganizationUserId, - name: userList.Data[i].Name, - email: userList.Data[i].Email, - type: userList.Data[i].Type, - status: userList.Data[i].Status, - accessAll: userList.Data[i].AccessAll - }); - } - } - - $scope.users = users; - $scope.loading = false; - }); - - $scope.remove = function (user) { - if (!confirm('Are you sure you want to remove this user (' + user.email + ') from this ' + - 'group (' + group.name + ')?')) { - return; - } - - apiService.groups.delUser({ orgId: $state.params.orgId, id: group.id, orgUserId: user.organizationUserId }, null, - function () { - toastr.success(user.email + ' has been removed.', 'User Removed'); - $analytics.eventTrack('Removed User From Group'); - var index = $scope.users.indexOf(user); - if (index > -1) { - $scope.users.splice(index, 1); - } - }, function () { - toastr.error('Unable to remove user.', 'Error'); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationModule.js b/src/app/organization/organizationModule.js deleted file mode 100644 index 0880ae47..00000000 --- a/src/app/organization/organizationModule.js +++ /dev/null @@ -1,2 +0,0 @@ -angular - .module('bit.organization', ['ui.bootstrap']); diff --git a/src/app/organization/organizationPeopleController.js b/src/app/organization/organizationPeopleController.js deleted file mode 100644 index 46195dc7..00000000 --- a/src/app/organization/organizationPeopleController.js +++ /dev/null @@ -1,162 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationPeopleController', function ($scope, $state, $uibModal, cryptoService, apiService, authService, - toastr, $analytics, $filter, $uibModalStack) { - $scope.users = []; - $scope.useGroups = false; - $scope.useEvents = false; - - $scope.$on('$viewContentLoaded', function () { - loadList(); - - authService.getUserProfile().then(function (profile) { - if (profile.organizations) { - var org = profile.organizations[$state.params.orgId]; - $scope.useGroups = !!org.useGroups; - $scope.useEvents = !!org.useEvents; - } - }); - }); - - $scope.reinvite = function (user) { - apiService.organizationUsers.reinvite({ orgId: $state.params.orgId, id: user.id }, null, function () { - $analytics.eventTrack('Reinvited User'); - toastr.success(user.email + ' has been invited again.', 'User Invited'); - }, function () { - toastr.error('Unable to invite user.', 'Error'); - }); - }; - - $scope.delete = function (user) { - if (!confirm('Are you sure you want to remove this user (' + user.email + ')?')) { - return; - } - - apiService.organizationUsers.del({ orgId: $state.params.orgId, id: user.id }, null, function () { - $analytics.eventTrack('Deleted User'); - toastr.success(user.email + ' has been removed.', 'User Removed'); - var index = $scope.users.indexOf(user); - if (index > -1) { - $scope.users.splice(index, 1); - } - }, function () { - toastr.error('Unable to remove user.', 'Error'); - }); - }; - - $scope.confirm = function (user) { - apiService.users.getPublicKey({ id: user.userId }, function (userKey) { - var orgKey = cryptoService.getOrgKey($state.params.orgId); - if (!orgKey) { - toastr.error('Unable to confirm user.', 'Error'); - return; - } - - var key = cryptoService.rsaEncrypt(orgKey.key, userKey.PublicKey); - apiService.organizationUsers.confirm({ orgId: $state.params.orgId, id: user.id }, { key: key }, function () { - user.status = 2; - $analytics.eventTrack('Confirmed User'); - toastr.success(user.email + ' has been confirmed.', 'User Confirmed'); - }, function () { - toastr.error('Unable to confirm user.', 'Error'); - }); - }, function () { - toastr.error('Unable to confirm user.', 'Error'); - }); - }; - - $scope.$on('organizationPeopleInvite', function (event, args) { - $scope.invite(); - }); - - $scope.invite = function () { - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/organization/views/organizationPeopleInvite.html', - controller: 'organizationPeopleInviteController' - }); - - modal.result.then(function () { - loadList(); - }); - }; - - $scope.edit = function (orgUser) { - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/organization/views/organizationPeopleEdit.html', - controller: 'organizationPeopleEditController', - resolve: { - orgUser: function () { return orgUser; } - } - }); - - modal.result.then(function () { - loadList(); - }); - }; - - $scope.groups = function (user) { - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/organization/views/organizationPeopleGroups.html', - controller: 'organizationPeopleGroupsController', - resolve: { - orgUser: function () { return user; } - } - }); - - modal.result.then(function () { - - }); - }; - - $scope.events = function (user) { - $uibModal.open({ - animation: true, - templateUrl: 'app/organization/views/organizationPeopleEvents.html', - controller: 'organizationPeopleEventsController', - resolve: { - orgUser: function () { return user; }, - orgId: function () { return $state.params.orgId; } - } - }); - }; - - function loadList() { - apiService.organizationUsers.list({ orgId: $state.params.orgId }, function (list) { - var users = []; - - for (var i = 0; i < list.Data.length; i++) { - var user = { - id: list.Data[i].Id, - userId: list.Data[i].UserId, - name: list.Data[i].Name, - email: list.Data[i].Email, - status: list.Data[i].Status, - type: list.Data[i].Type, - accessAll: list.Data[i].AccessAll - }; - - users.push(user); - } - - $scope.users = users; - - if ($state.params.search) { - $uibModalStack.dismissAll(); - $scope.filterSearch = $state.params.search; - $('#filterSearch').focus(); - } - - if ($state.params.viewEvents) { - $uibModalStack.dismissAll(); - var eventUser = $filter('filter')($scope.users, { id: $state.params.viewEvents }); - if (eventUser && eventUser.length) { - $scope.events(eventUser[0]); - } - } - }); - } - }); diff --git a/src/app/organization/organizationPeopleEditController.js b/src/app/organization/organizationPeopleEditController.js deleted file mode 100644 index c35a8d38..00000000 --- a/src/app/organization/organizationPeopleEditController.js +++ /dev/null @@ -1,104 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationPeopleEditController', function ($scope, $state, $uibModalInstance, apiService, cipherService, - orgUser, $analytics) { - $analytics.eventTrack('organizationPeopleEditController', { category: 'Modal' }); - - $scope.loading = true; - $scope.collections = []; - $scope.selectedCollections = {}; - - $uibModalInstance.opened.then(function () { - apiService.collections.listOrganization({ orgId: $state.params.orgId }, function (list) { - $scope.collections = cipherService.decryptCollections(list.Data, $state.params.orgId, true); - $scope.loading = false; - }); - - apiService.organizationUsers.get({ orgId: $state.params.orgId, id: orgUser.id }, function (user) { - var collections = {}; - if (user && user.Collections) { - for (var i = 0; i < user.Collections.length; i++) { - collections[user.Collections[i].Id] = { - id: user.Collections[i].Id, - readOnly: user.Collections[i].ReadOnly - }; - } - } - $scope.email = orgUser.email; - $scope.type = user.Type; - $scope.accessAll = user.AccessAll; - $scope.selectedCollections = collections; - }); - }); - - $scope.toggleCollectionSelectionAll = function ($event) { - var collections = {}; - if ($event.target.checked) { - for (var i = 0; i < $scope.collections.length; i++) { - collections[$scope.collections[i].id] = { - id: $scope.collections[i].id, - readOnly: ($scope.collections[i].id in $scope.selectedCollections) ? - $scope.selectedCollections[$scope.collections[i].id].readOnly : false - }; - } - } - - $scope.selectedCollections = collections; - }; - - $scope.toggleCollectionSelection = function (id) { - if (id in $scope.selectedCollections) { - delete $scope.selectedCollections[id]; - } - else { - $scope.selectedCollections[id] = { - id: id, - readOnly: false - }; - } - }; - - $scope.toggleCollectionReadOnlySelection = function (id) { - if (id in $scope.selectedCollections) { - $scope.selectedCollections[id].readOnly = !!!$scope.selectedCollections[id].readOnly; - } - }; - - $scope.collectionSelected = function (collection) { - return collection.id in $scope.selectedCollections; - }; - - $scope.allSelected = function () { - return Object.keys($scope.selectedCollections).length === $scope.collections.length; - }; - - $scope.submitPromise = null; - $scope.submit = function (model) { - var collections = []; - if (!$scope.accessAll) { - for (var collectionId in $scope.selectedCollections) { - if ($scope.selectedCollections.hasOwnProperty(collectionId)) { - collections.push($scope.selectedCollections[collectionId]); - } - } - } - - $scope.submitPromise = apiService.organizationUsers.put( - { - orgId: $state.params.orgId, - id: orgUser.id - }, { - type: $scope.type, - collections: collections, - accessAll: $scope.accessAll - }, function () { - $analytics.eventTrack('Edited User'); - $uibModalInstance.close(); - }).$promise; - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationPeopleEventsController.js b/src/app/organization/organizationPeopleEventsController.js deleted file mode 100644 index 02a56936..00000000 --- a/src/app/organization/organizationPeopleEventsController.js +++ /dev/null @@ -1,75 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationPeopleEventsController', function ($scope, apiService, $uibModalInstance, - orgUser, $analytics, eventService, orgId, $compile, $sce) { - $analytics.eventTrack('organizationPeopleEventsController', { category: 'Modal' }); - $scope.email = orgUser.email; - $scope.events = []; - $scope.loading = true; - $scope.continuationToken = null; - - var defaultFilters = eventService.getDefaultDateFilters(); - $scope.filterStart = defaultFilters.start; - $scope.filterEnd = defaultFilters.end; - - $uibModalInstance.opened.then(function () { - loadEvents(true); - }); - - $scope.refresh = function () { - loadEvents(true); - }; - - $scope.next = function () { - loadEvents(false); - }; - - function loadEvents(clearExisting) { - var filterResult = eventService.formatDateFilters($scope.filterStart, $scope.filterEnd); - if (filterResult.error) { - alert(filterResult.error); - return; - } - - if (clearExisting) { - $scope.continuationToken = null; - $scope.events = []; - } - - $scope.loading = true; - return apiService.events.listOrganizationUser({ - orgId: orgId, - id: orgUser.id, - start: filterResult.start, - end: filterResult.end, - continuationToken: $scope.continuationToken - }).$promise.then(function (list) { - $scope.continuationToken = list.ContinuationToken; - - var events = []; - for (var i = 0; i < list.Data.length; i++) { - var eventInfo = eventService.getEventInfo(list.Data[i]); - var htmlMessage = $compile('' + eventInfo.message + '')($scope); - events.push({ - message: $sce.trustAsHtml(htmlMessage[0].outerHTML), - appIcon: eventInfo.appIcon, - appName: eventInfo.appName, - date: list.Data[i].Date, - ip: list.Data[i].IpAddress - }); - } - if ($scope.events && $scope.events.length > 0) { - $scope.events = $scope.events.concat(events); - } - else { - $scope.events = events; - } - $scope.loading = false; - }); - } - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationPeopleGroupsController.js b/src/app/organization/organizationPeopleGroupsController.js deleted file mode 100644 index 25c90842..00000000 --- a/src/app/organization/organizationPeopleGroupsController.js +++ /dev/null @@ -1,85 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationPeopleGroupsController', function ($scope, $state, $uibModalInstance, apiService, - orgUser, $analytics) { - $analytics.eventTrack('organizationPeopleGroupsController', { category: 'Modal' }); - - $scope.loading = true; - $scope.groups = []; - $scope.selectedGroups = {}; - $scope.orgUser = orgUser; - - $uibModalInstance.opened.then(function () { - return apiService.groups.listOrganization({ orgId: $state.params.orgId }).$promise; - }).then(function (groupsList) { - var groups = []; - for (var i = 0; i < groupsList.Data.length; i++) { - groups.push({ - id: groupsList.Data[i].Id, - name: groupsList.Data[i].Name - }); - } - $scope.groups = groups; - - return apiService.organizationUsers.listGroups({ orgId: $state.params.orgId, id: orgUser.id }).$promise; - }).then(function (groupIds) { - var selectedGroups = {}; - if (groupIds) { - for (var i = 0; i < groupIds.length; i++) { - selectedGroups[groupIds[i]] = true; - } - } - $scope.selectedGroups = selectedGroups; - $scope.loading = false; - }); - - $scope.toggleGroupSelectionAll = function ($event) { - var groups = {}; - if ($event.target.checked) { - for (var i = 0; i < $scope.groups.length; i++) { - groups[$scope.groups[i].id] = true; - } - } - - $scope.selectedGroups = groups; - }; - - $scope.toggleGroupSelection = function (id) { - if (id in $scope.selectedGroups) { - delete $scope.selectedGroups[id]; - } - else { - $scope.selectedGroups[id] = true; - } - }; - - $scope.groupSelected = function (group) { - return group.id in $scope.selectedGroups; - }; - - $scope.allSelected = function () { - return Object.keys($scope.selectedGroups).length === $scope.groups.length; - }; - - $scope.submitPromise = null; - $scope.submit = function (model) { - var groups = []; - for (var groupId in $scope.selectedGroups) { - if ($scope.selectedGroups.hasOwnProperty(groupId)) { - groups.push(groupId); - } - } - - $scope.submitPromise = apiService.organizationUsers.putGroups({ orgId: $state.params.orgId, id: orgUser.id }, { - groupIds: groups, - }, function () { - $analytics.eventTrack('Edited User Groups'); - $uibModalInstance.close(); - }).$promise; - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationPeopleInviteController.js b/src/app/organization/organizationPeopleInviteController.js deleted file mode 100644 index 80114e82..00000000 --- a/src/app/organization/organizationPeopleInviteController.js +++ /dev/null @@ -1,91 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationPeopleInviteController', function ($scope, $state, $uibModalInstance, apiService, cipherService, - $analytics) { - $analytics.eventTrack('organizationPeopleInviteController', { category: 'Modal' }); - - $scope.loading = true; - $scope.collections = []; - $scope.selectedCollections = {}; - $scope.model = { - type: 'User' - }; - - $uibModalInstance.opened.then(function () { - apiService.collections.listOrganization({ orgId: $state.params.orgId }, function (list) { - $scope.collections = cipherService.decryptCollections(list.Data, $state.params.orgId, true); - $scope.loading = false; - }); - }); - - $scope.toggleCollectionSelectionAll = function ($event) { - var collections = {}; - if ($event.target.checked) { - for (var i = 0; i < $scope.collections.length; i++) { - collections[$scope.collections[i].id] = { - id: $scope.collections[i].id, - readOnly: ($scope.collections[i].id in $scope.selectedCollections) ? - $scope.selectedCollections[$scope.collections[i].id].readOnly : false - }; - } - } - - $scope.selectedCollections = collections; - }; - - $scope.toggleCollectionSelection = function (id) { - if (id in $scope.selectedCollections) { - delete $scope.selectedCollections[id]; - } - else { - $scope.selectedCollections[id] = { - id: id, - readOnly: false - }; - } - }; - - $scope.toggleCollectionReadOnlySelection = function (id) { - if (id in $scope.selectedCollections) { - $scope.selectedCollections[id].readOnly = !!!$scope.selectedCollections[id].readOnly; - } - }; - - $scope.collectionSelected = function (collection) { - return collection.id in $scope.selectedCollections; - }; - - $scope.allSelected = function () { - return Object.keys($scope.selectedCollections).length === $scope.collections.length; - }; - - $scope.submitPromise = null; - $scope.submit = function (model) { - var collections = []; - - if (!model.accessAll) { - for (var collectionId in $scope.selectedCollections) { - if ($scope.selectedCollections.hasOwnProperty(collectionId)) { - collections.push($scope.selectedCollections[collectionId]); - } - } - } - - var splitEmails = model.emails.trim().split(/\s*,\s*/); - - $scope.submitPromise = apiService.organizationUsers.invite({ orgId: $state.params.orgId }, { - emails: splitEmails, - type: model.type, - collections: collections, - accessAll: model.accessAll - }, function () { - $analytics.eventTrack('Invited User'); - $uibModalInstance.close(); - }).$promise; - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationSettingsController.js b/src/app/organization/organizationSettingsController.js deleted file mode 100644 index 1128b968..00000000 --- a/src/app/organization/organizationSettingsController.js +++ /dev/null @@ -1,111 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationSettingsController', function ($scope, $state, apiService, toastr, authService, $uibModal, - $analytics, appSettings, constants, $filter) { - $scope.selfHosted = appSettings.selfHosted; - $scope.model = {}; - $scope.twoStepProviders = $filter('filter')(constants.twoFactorProviderInfo, { organization: true }); - $scope.use2fa = false; - - $scope.$on('$viewContentLoaded', function () { - apiService.organizations.get({ id: $state.params.orgId }).$promise.then(function (org) { - $scope.model = { - name: org.Name, - billingEmail: org.BillingEmail, - businessName: org.BusinessName, - businessAddress1: org.BusinessAddress1, - businessAddress2: org.BusinessAddress2, - businessAddress3: org.BusinessAddress3, - businessCountry: org.BusinessCountry, - businessTaxNumber: org.BusinessTaxNumber - }; - - $scope.use2fa = org.Use2fa; - if (org.Use2fa) { - return apiService.twoFactor.listOrganization({ orgId: $state.params.orgId }).$promise; - } - else { - return null; - } - }).then(function (response) { - if (!response || !response.Data) { - return; - } - - for (var i = 0; i < response.Data.length; i++) { - if (!response.Data[i].Enabled) { - continue; - } - - var provider = $filter('filter')($scope.twoStepProviders, { type: response.Data[i].Type }); - if (provider.length) { - provider[0].enabled = true; - } - } - }); - }); - - $scope.generalSave = function () { - if ($scope.selfHosted) { - return; - } - - $scope.generalPromise = apiService.organizations.put({ id: $state.params.orgId }, $scope.model, function (org) { - authService.updateProfileOrganization(org).then(function (updatedOrg) { - $analytics.eventTrack('Updated Organization Settings'); - toastr.success('Organization has been updated.', 'Success!'); - }); - }).$promise; - }; - - $scope.import = function () { - $uibModal.open({ - animation: true, - templateUrl: 'app/tools/views/toolsImport.html', - controller: 'organizationSettingsImportController' - }); - }; - - $scope.export = function () { - $uibModal.open({ - animation: true, - templateUrl: 'app/tools/views/toolsExport.html', - controller: 'organizationSettingsExportController' - }); - }; - - $scope.delete = function () { - $uibModal.open({ - animation: true, - templateUrl: 'app/organization/views/organizationDelete.html', - controller: 'organizationDeleteController' - }); - }; - - $scope.edit = function (provider) { - if (provider.type === constants.twoFactorProvider.organizationDuo) { - typeName = 'Duo'; - } - else { - return; - } - - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/settings/views/settingsTwoStep' + typeName + '.html', - controller: 'settingsTwoStep' + typeName + 'Controller', - resolve: { - enabled: function () { return provider.enabled; }, - orgId: function () { return $state.params.orgId; } - } - }); - - modal.result.then(function (enabled) { - if (enabled || enabled === false) { - // do not adjust when undefined or null - provider.enabled = enabled; - } - }); - }; - }); diff --git a/src/app/organization/organizationSettingsExportController.js b/src/app/organization/organizationSettingsExportController.js deleted file mode 100644 index 1f70fbfa..00000000 --- a/src/app/organization/organizationSettingsExportController.js +++ /dev/null @@ -1,155 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationSettingsExportController', function ($scope, apiService, $uibModalInstance, cipherService, - $q, toastr, $analytics, $state, constants) { - $analytics.eventTrack('organizationSettingsExportController', { category: 'Modal' }); - $scope.export = function (model) { - $scope.startedExport = true; - var decCiphers = [], - decCollections = []; - - var collectionsPromise = apiService.collections.listOrganization({ orgId: $state.params.orgId }, - function (collections) { - decCollections = cipherService.decryptCollections(collections.Data, $state.params.orgId, true); - }).$promise; - - var ciphersPromise = apiService.ciphers.listOrganizationDetails({ organizationId: $state.params.orgId }, - function (ciphers) { - decCiphers = cipherService.decryptCiphers(ciphers.Data); - }).$promise; - - $q.all([collectionsPromise, ciphersPromise]).then(function () { - if (!decCiphers.length) { - toastr.error('Nothing to export.', 'Error!'); - $scope.close(); - return; - } - - var i; - var collectionsDict = {}; - for (i = 0; i < decCollections.length; i++) { - collectionsDict[decCollections[i].id] = decCollections[i]; - } - - try { - var exportCiphers = []; - for (i = 0; i < decCiphers.length; i++) { - // only export logins and secure notes - if (decCiphers[i].type !== constants.cipherType.login && - decCiphers[i].type !== constants.cipherType.secureNote) { - continue; - } - - var cipher = { - collections: [], - type: null, - name: decCiphers[i].name, - notes: decCiphers[i].notes, - fields: null, - // Login props - login_uri: null, - login_username: null, - login_password: null, - login_totp: null - }; - - var j; - if (decCiphers[i].collectionIds) { - for (j = 0; j < decCiphers[i].collectionIds.length; j++) { - if (collectionsDict.hasOwnProperty(decCiphers[i].collectionIds[j])) { - cipher.collections.push(collectionsDict[decCiphers[i].collectionIds[j]].name); - } - } - } - - if (decCiphers[i].fields) { - for (j = 0; j < decCiphers[i].fields.length; j++) { - if (!cipher.fields) { - cipher.fields = ''; - } - else { - cipher.fields += '\n'; - } - - cipher.fields += ((decCiphers[i].fields[j].name || '') + ': ' + decCiphers[i].fields[j].value); - } - } - - switch (decCiphers[i].type) { - case constants.cipherType.login: - cipher.type = 'login'; - cipher.login_uri = null; - cipher.login_username = decCiphers[i].login.username; - cipher.login_password = decCiphers[i].login.password; - cipher.login_totp = decCiphers[i].login.totp; - - if (decCiphers[i].login.uris && decCiphers[i].login.uris.length) { - cipher.login_uri = []; - for (j = 0; j < decCiphers[i].login.uris.length; j++) { - cipher.login_uri.push(decCiphers[i].login.uris[j].uri); - } - } - break; - case constants.cipherType.secureNote: - cipher.type = 'note'; - break; - default: - continue; - } - - exportCiphers.push(cipher); - } - - var csvString = Papa.unparse(exportCiphers); - var csvBlob = new Blob([csvString]); - - // IE hack. ref http://msdn.microsoft.com/en-us/library/ie/hh779016.aspx - if (window.navigator.msSaveOrOpenBlob) { - window.navigator.msSaveBlob(csvBlob, makeFileName()); - } - else { - var a = window.document.createElement('a'); - a.href = window.URL.createObjectURL(csvBlob, { type: 'text/plain' }); - a.download = makeFileName(); - document.body.appendChild(a); - // IE: "Access is denied". - // ref: https://connect.microsoft.com/IE/feedback/details/797361/ie-10-treats-blob-url-as-cross-origin-and-denies-access - a.click(); - document.body.removeChild(a); - } - - $analytics.eventTrack('Exported Organization Data'); - toastr.success('Your data has been exported. Check your browser\'s downloads folder.', 'Success!'); - $scope.close(); - } - catch (err) { - toastr.error('Something went wrong. Please try again.', 'Error!'); - $scope.close(); - } - }, function () { - toastr.error('Something went wrong. Please try again.', 'Error!'); - $scope.close(); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - - function makeFileName() { - var now = new Date(); - var dateString = - now.getFullYear() + '' + padNumber(now.getMonth() + 1, 2) + '' + padNumber(now.getDate(), 2) + - padNumber(now.getHours(), 2) + '' + padNumber(now.getMinutes(), 2) + - padNumber(now.getSeconds(), 2); - - return 'bitwarden_org_export_' + dateString + '.csv'; - } - - function padNumber(number, width, paddingCharacter) { - paddingCharacter = paddingCharacter || '0'; - number = number + ''; - return number.length >= width ? number : new Array(width - number.length + 1).join(paddingCharacter) + number; - } - }); diff --git a/src/app/organization/organizationSettingsImportController.js b/src/app/organization/organizationSettingsImportController.js deleted file mode 100644 index 0c783446..00000000 --- a/src/app/organization/organizationSettingsImportController.js +++ /dev/null @@ -1,129 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationSettingsImportController', function ($scope, $state, apiService, $uibModalInstance, cipherService, - toastr, importService, $analytics, $sce, validationService, cryptoService) { - $analytics.eventTrack('organizationSettingsImportController', { category: 'Modal' }); - $scope.model = { source: '' }; - $scope.source = {}; - $scope.splitFeatured = false; - - $scope.options = [ - { - id: 'bitwardencsv', - name: 'Bitwarden (csv)', - featured: true, - sort: 1, - instructions: $sce.trustAsHtml('Export using the web vault (vault.bitwarden.com). ' + - 'Log into the web vault and navigate to your organization\'s admin area. Then to go ' + - '"Settings" > "Tools" > "Export".') - }, - { - id: 'lastpass', - name: 'LastPass (csv)', - featured: true, - sort: 2, - instructions: $sce.trustAsHtml('See detailed instructions on our help site at ' + - '' + - 'https://help.bitwarden.com/article/import-from-lastpass/') - } - ]; - - $scope.setSource = function () { - for (var i = 0; i < $scope.options.length; i++) { - if ($scope.options[i].id === $scope.model.source) { - $scope.source = $scope.options[i]; - break; - } - } - }; - $scope.setSource(); - - $scope.import = function (model, form) { - if (!model.source || model.source === '') { - validationService.addError(form, 'source', 'Select the format of the import file.', true); - return; - } - - var file = document.getElementById('file').files[0]; - if (!file && (!model.fileContents || model.fileContents === '')) { - validationService.addError(form, 'file', 'Select the import file or copy/paste the import file contents.', true); - return; - } - - $scope.processing = true; - importService.importOrg(model.source, file || model.fileContents, importSuccess, importError); - }; - - function importSuccess(collections, ciphers, collectionRelationships) { - if (!collections.length && !ciphers.length) { - importError('Nothing was imported.'); - return; - } - else if (ciphers.length) { - var halfway = Math.floor(ciphers.length / 2); - var last = ciphers.length - 1; - if (cipherIsBadData(ciphers[0]) && cipherIsBadData(ciphers[halfway]) && cipherIsBadData(ciphers[last])) { - importError('Data is not formatted correctly. Please check your import file and try again.'); - return; - } - } - - apiService.ciphers.importOrg({ orgId: $state.params.orgId }, { - collections: cipherService.encryptCollections(collections, $state.params.orgId), - ciphers: cipherService.encryptCiphers(ciphers, cryptoService.getOrgKey($state.params.orgId)), - collectionRelationships: collectionRelationships - }, function () { - $uibModalInstance.dismiss('cancel'); - $state.go('backend.org.vault', { orgId: $state.params.orgId }).then(function () { - $analytics.eventTrack('Imported Org Data', { label: $scope.model.source }); - toastr.success('Data has been successfully imported into your vault.', 'Import Success'); - }); - }, importError); - } - - function cipherIsBadData(cipher) { - return (cipher.name === null || cipher.name === '--') && - (cipher.login && (cipher.login.password === null || cipher.login.password === '')); - } - - function importError(error) { - $analytics.eventTrack('Import Org Data Failed', { label: $scope.model.source }); - $uibModalInstance.dismiss('cancel'); - - if (error) { - var data = error.data; - if (data && data.ValidationErrors) { - var message = ''; - for (var key in data.ValidationErrors) { - if (!data.ValidationErrors.hasOwnProperty(key)) { - continue; - } - - for (var i = 0; i < data.ValidationErrors[key].length; i++) { - message += (key + ': ' + data.ValidationErrors[key][i] + ' '); - } - } - - if (message !== '') { - toastr.error(message); - return; - } - } - else if (data && data.Message) { - toastr.error(data.Message); - return; - } - else { - toastr.error(error); - return; - } - } - - toastr.error('Something went wrong. Try again.', 'Oh No!'); - } - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationVaultAddCipherController.js b/src/app/organization/organizationVaultAddCipherController.js deleted file mode 100644 index d7c659a9..00000000 --- a/src/app/organization/organizationVaultAddCipherController.js +++ /dev/null @@ -1,141 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationVaultAddCipherController', function ($scope, apiService, $uibModalInstance, cryptoService, - cipherService, passwordService, $analytics, authService, orgId, $uibModal, constants, selectedType) { - $analytics.eventTrack('organizationVaultAddCipherController', { category: 'Modal' }); - $scope.constants = constants; - $scope.selectedType = selectedType ? selectedType.toString() : constants.cipherType.login.toString(); - $scope.cipher = { - type: selectedType || constants.cipherType.login, - login: { - uris: [{ - uri: null, - match: null, - matchValue: null - }] - }, - identity: {}, - card: {}, - secureNote: { - type: '0' - } - }; - $scope.hideFolders = $scope.hideFavorite = $scope.fromOrg = true; - - authService.getUserProfile().then(function (userProfile) { - var orgProfile = userProfile.organizations[orgId]; - $scope.useTotp = orgProfile.useTotp; - }); - - $scope.typeChanged = function () { - $scope.cipher.type = parseInt($scope.selectedType); - }; - - $scope.savePromise = null; - $scope.save = function () { - $scope.cipher.organizationId = orgId; - var cipher = cipherService.encryptCipher($scope.cipher); - $scope.savePromise = apiService.ciphers.postAdmin(cipher, function (cipherResponse) { - $analytics.eventTrack('Created Organization Cipher'); - var decCipher = cipherService.decryptCipherPreview(cipherResponse); - $uibModalInstance.close(decCipher); - }).$promise; - }; - - $scope.generatePassword = function () { - if (!$scope.cipher.login.password || confirm('Are you sure you want to overwrite the current password?')) { - $analytics.eventTrack('Generated Password From Add'); - $scope.cipher.login.password = passwordService.generatePassword({ length: 14, special: true }); - } - }; - - $scope.addUri = function () { - if (!$scope.cipher.login) { - return; - } - - if (!$scope.cipher.login.uris) { - $scope.cipher.login.uris = []; - } - - $scope.cipher.login.uris.push({ - uri: null, - match: null, - matchValue: null - }); - }; - - $scope.removeUri = function (uri) { - if (!$scope.cipher.login || !$scope.cipher.login.uris) { - return; - } - - var index = $scope.cipher.login.uris.indexOf(uri); - if (index > -1) { - $scope.cipher.login.uris.splice(index, 1); - } - }; - - $scope.uriMatchChanged = function (uri) { - if ((!uri.matchValue && uri.matchValue !== 0) || uri.matchValue === '') { - uri.match = null; - } - else { - uri.match = parseInt(uri.matchValue); - } - }; - - $scope.addField = function () { - if (!$scope.cipher.fields) { - $scope.cipher.fields = []; - } - - $scope.cipher.fields.push({ - type: constants.fieldType.text.toString(), - name: null, - value: null - }); - }; - - $scope.removeField = function (field) { - var index = $scope.cipher.fields.indexOf(field); - if (index > -1) { - $scope.cipher.fields.splice(index, 1); - } - }; - - $scope.clipboardSuccess = function (e) { - e.clearSelection(); - selectPassword(e); - }; - - $scope.clipboardError = function (e, password) { - if (password) { - selectPassword(e); - } - alert('Your web browser does not support easy clipboard copying. Copy it manually instead.'); - }; - - function selectPassword(e) { - var target = $(e.trigger).parent().prev(); - if (target.attr('type') === 'text') { - target.select(); - } - } - - $scope.close = function () { - $uibModalInstance.dismiss('close'); - }; - - $scope.showUpgrade = function () { - $uibModal.open({ - animation: true, - templateUrl: 'app/views/paidOrgRequired.html', - controller: 'paidOrgRequiredController', - resolve: { - orgId: function () { return orgId; } - } - }); - }; - }); diff --git a/src/app/organization/organizationVaultAttachmentsController.js b/src/app/organization/organizationVaultAttachmentsController.js deleted file mode 100644 index c87f2ca9..00000000 --- a/src/app/organization/organizationVaultAttachmentsController.js +++ /dev/null @@ -1,90 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationVaultAttachmentsController', function ($scope, apiService, $uibModalInstance, cryptoService, - cipherService, cipherId, $analytics, validationService, toastr, $timeout) { - $analytics.eventTrack('organizationVaultAttachmentsController', { category: 'Modal' }); - $scope.cipher = {}; - $scope.loading = true; - $scope.isPremium = true; - $scope.canUseAttachments = true; - var closing = false; - - apiService.ciphers.getAdmin({ id: cipherId }, function (cipher) { - $scope.cipher = cipherService.decryptCipher(cipher); - $scope.loading = false; - }, function () { - $scope.loading = false; - }); - - $scope.save = function (form) { - var files = document.getElementById('file').files; - if (!files || !files.length) { - validationService.addError(form, 'file', 'Select a file.', true); - return; - } - - var key = cryptoService.getOrgKey($scope.cipher.organizationId); - $scope.savePromise = cipherService.encryptAttachmentFile(key, files[0]).then(function (encValue) { - var fd = new FormData(); - var blob = new Blob([encValue.data], { type: 'application/octet-stream' }); - fd.append('data', blob, encValue.fileName); - return apiService.ciphers.postAttachmentAdmin({ id: cipherId }, fd).$promise; - }).then(function (response) { - $analytics.eventTrack('Added Attachment'); - toastr.success('The attachment has been added.'); - closing = true; - $uibModalInstance.close(true); - }, function (e) { - var errors = validationService.parseErrors(e); - toastr.error(errors.length ? errors[0] : 'An error occurred.'); - }); - }; - - $scope.download = function (attachment) { - attachment.loading = true; - var key = cryptoService.getOrgKey($scope.cipher.organizationId); - cipherService.downloadAndDecryptAttachment(key, attachment, true).then(function (res) { - $timeout(function () { - attachment.loading = false; - }); - }, function () { - $timeout(function () { - attachment.loading = false; - }); - }); - }; - - $scope.remove = function (attachment) { - if (!confirm('Are you sure you want to delete this attachment (' + attachment.fileName + ')?')) { - return; - } - - attachment.loading = true; - apiService.ciphers.delAttachmentAdmin({ id: cipherId, attachmentId: attachment.id }).$promise.then(function () { - attachment.loading = false; - $analytics.eventTrack('Deleted Organization Attachment'); - var index = $scope.cipher.attachments.indexOf(attachment); - if (index > -1) { - $scope.cipher.attachments.splice(index, 1); - } - }, function () { - toastr.error('Cannot delete attachment.'); - attachment.loading = false; - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - - $scope.$on('modal.closing', function (e, reason, closed) { - if (closing) { - return; - } - - e.preventDefault(); - closing = true; - $uibModalInstance.close(!!$scope.cipher.attachments && $scope.cipher.attachments.length > 0); - }); - }); diff --git a/src/app/organization/organizationVaultCipherCollectionsController.js b/src/app/organization/organizationVaultCipherCollectionsController.js deleted file mode 100644 index 1537da53..00000000 --- a/src/app/organization/organizationVaultCipherCollectionsController.js +++ /dev/null @@ -1,83 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationVaultCipherCollectionsController', function ($scope, apiService, $uibModalInstance, cipherService, - cipher, $analytics, collections) { - $analytics.eventTrack('organizationVaultCipherCollectionsController', { category: 'Modal' }); - $scope.cipher = {}; - $scope.collections = []; - $scope.selectedCollections = {}; - - $uibModalInstance.opened.then(function () { - var collectionUsed = []; - for (var i = 0; i < collections.length; i++) { - if (collections[i].id) { - collectionUsed.push(collections[i]); - } - } - $scope.collections = collectionUsed; - - $scope.cipher = cipher; - - var selectedCollections = {}; - if ($scope.cipher.collectionIds) { - for (i = 0; i < $scope.cipher.collectionIds.length; i++) { - selectedCollections[$scope.cipher.collectionIds[i]] = true; - } - } - $scope.selectedCollections = selectedCollections; - }); - - $scope.toggleCollectionSelectionAll = function ($event) { - var collections = {}; - if ($event.target.checked) { - for (var i = 0; i < $scope.collections.length; i++) { - collections[$scope.collections[i].id] = true; - } - } - - $scope.selectedCollections = collections; - }; - - $scope.toggleCollectionSelection = function (id) { - if (id in $scope.selectedCollections) { - delete $scope.selectedCollections[id]; - } - else { - $scope.selectedCollections[id] = true; - } - }; - - $scope.collectionSelected = function (collection) { - return collection.id in $scope.selectedCollections; - }; - - $scope.allSelected = function () { - return Object.keys($scope.selectedCollections).length === $scope.collections.length; - }; - - $scope.submit = function () { - var request = { - collectionIds: [] - }; - - for (var id in $scope.selectedCollections) { - if ($scope.selectedCollections.hasOwnProperty(id)) { - request.collectionIds.push(id); - } - } - - $scope.submitPromise = apiService.ciphers.putCollectionsAdmin({ id: cipher.id }, request) - .$promise.then(function (response) { - $analytics.eventTrack('Edited Cipher Collections'); - $uibModalInstance.close({ - action: 'collectionsEdit', - collectionIds: request.collectionIds - }); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationVaultCipherEventsController.js b/src/app/organization/organizationVaultCipherEventsController.js deleted file mode 100644 index ad642ef7..00000000 --- a/src/app/organization/organizationVaultCipherEventsController.js +++ /dev/null @@ -1,104 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationVaultCipherEventsController', function ($scope, apiService, $uibModalInstance, - cipher, $analytics, eventService) { - $analytics.eventTrack('organizationVaultCipherEventsController', { category: 'Modal' }); - $scope.cipher = cipher; - $scope.events = []; - $scope.loading = true; - $scope.continuationToken = null; - - var defaultFilters = eventService.getDefaultDateFilters(); - $scope.filterStart = defaultFilters.start; - $scope.filterEnd = defaultFilters.end; - - $uibModalInstance.opened.then(function () { - load(); - }); - - $scope.refresh = function () { - loadEvents(true); - }; - - $scope.next = function () { - loadEvents(false); - }; - - var i = 0, - orgUsersUserIdDict = {}, - orgUsersIdDict = {}; - - function load() { - apiService.organizationUsers.list({ orgId: cipher.organizationId }).$promise.then(function (list) { - var users = []; - for (i = 0; i < list.Data.length; i++) { - var user = { - id: list.Data[i].Id, - userId: list.Data[i].UserId, - name: list.Data[i].Name, - email: list.Data[i].Email - }; - - users.push(user); - - var displayName = user.name || user.email; - orgUsersUserIdDict[user.userId] = displayName; - orgUsersIdDict[user.id] = displayName; - } - - $scope.orgUsers = users; - - return loadEvents(true); - }); - } - - function loadEvents(clearExisting) { - var filterResult = eventService.formatDateFilters($scope.filterStart, $scope.filterEnd); - if (filterResult.error) { - alert(filterResult.error); - return; - } - - if (clearExisting) { - $scope.continuationToken = null; - $scope.events = []; - } - - $scope.loading = true; - return apiService.events.listCipher({ - id: cipher.id, - start: filterResult.start, - end: filterResult.end, - continuationToken: $scope.continuationToken - }).$promise.then(function (list) { - $scope.continuationToken = list.ContinuationToken; - - var events = []; - for (i = 0; i < list.Data.length; i++) { - var userId = list.Data[i].ActingUserId || list.Data[i].UserId; - var eventInfo = eventService.getEventInfo(list.Data[i], { cipherInfo: false }); - events.push({ - message: eventInfo.message, - appIcon: eventInfo.appIcon, - appName: eventInfo.appName, - userId: userId, - userName: userId ? (orgUsersUserIdDict[userId] || '-') : '-', - date: list.Data[i].Date, - ip: list.Data[i].IpAddress - }); - } - if ($scope.events && $scope.events.length > 0) { - $scope.events = $scope.events.concat(events); - } - else { - $scope.events = events; - } - $scope.loading = false; - }); - } - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/organization/organizationVaultController.js b/src/app/organization/organizationVaultController.js deleted file mode 100644 index 4ac7b82f..00000000 --- a/src/app/organization/organizationVaultController.js +++ /dev/null @@ -1,280 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationVaultController', function ($scope, apiService, cipherService, $analytics, $q, $state, - $localStorage, $uibModal, $filter, authService, $uibModalStack, constants, $timeout) { - $scope.ciphers = []; - $scope.collections = []; - $scope.loading = true; - $scope.useEvents = false; - $scope.constants = constants; - $scope.filter = undefined; - $scope.selectedType = undefined; - $scope.selectedCollection = undefined; - $scope.selectedAll = true; - $scope.selectedTitle = 'All'; - $scope.selectedIcon = 'fa-th'; - - $scope.$on('$viewContentLoaded', function () { - authService.getUserProfile().then(function (profile) { - if (profile.organizations) { - var org = profile.organizations[$state.params.orgId]; - $scope.useEvents = !!org.useEvents; - } - }); - - var collectionPromise = apiService.collections.listOrganization({ orgId: $state.params.orgId }, function (collections) { - var decCollections = [{ - id: null, - name: 'Unassigned' - }]; - - for (var i = 0; i < collections.Data.length; i++) { - var decCollection = cipherService.decryptCollection(collections.Data[i], null, true); - decCollections.push(decCollection); - } - - $scope.collections = decCollections; - }).$promise; - - var cipherPromise = apiService.ciphers.listOrganizationDetails({ organizationId: $state.params.orgId }, - function (ciphers) { - var decCiphers = []; - - for (var i = 0; i < ciphers.Data.length; i++) { - var decCipher = cipherService.decryptCipherPreview(ciphers.Data[i]); - decCiphers.push(decCipher); - } - - $scope.ciphers = decCiphers; - }).$promise; - - $q.all([collectionPromise, cipherPromise]).then(function () { - $scope.loading = false; - $timeout(function () { - if ($('body').hasClass('control-sidebar-open')) { - $("#search").focus(); - } - }, 500); - - if ($state.params.search) { - $uibModalStack.dismissAll(); - $scope.searchVaultText = $state.params.search; - } - - if ($state.params.viewEvents) { - $uibModalStack.dismissAll(); - var cipher = $filter('filter')($scope.ciphers, { id: $state.params.viewEvents }); - if (cipher && cipher.length) { - $scope.viewEvents(cipher[0]); - } - } - }); - }); - - $scope.collectionSort = function (item) { - if (!item.id) { - return ''; - } - - return item.name.toLowerCase(); - }; - - $scope.editCipher = function (cipher) { - var editModel = $uibModal.open({ - animation: true, - templateUrl: 'app/vault/views/vaultEditCipher.html', - controller: 'organizationVaultEditCipherController', - resolve: { - cipherId: function () { return cipher.id; }, - orgId: function () { return $state.params.orgId; } - } - }); - - editModel.result.then(function (returnVal) { - var index; - if (returnVal.action === 'edit') { - index = $scope.ciphers.indexOf(cipher); - if (index > -1) { - returnVal.data.collectionIds = $scope.ciphers[index].collectionIds; - $scope.ciphers[index] = returnVal.data; - } - } - else if (returnVal.action === 'delete') { - index = $scope.ciphers.indexOf(cipher); - if (index > -1) { - $scope.ciphers.splice(index, 1); - } - } - }); - }; - - $scope.$on('organizationVaultAddCipher', function (event, args) { - $scope.addCipher(); - }); - - $scope.addCipher = function () { - var addModel = $uibModal.open({ - animation: true, - templateUrl: 'app/vault/views/vaultAddCipher.html', - controller: 'organizationVaultAddCipherController', - resolve: { - orgId: function () { return $state.params.orgId; }, - selectedType: function () { return $scope.selectedType; } - } - }); - - addModel.result.then(function (addedCipher) { - $scope.ciphers.push(addedCipher); - }); - }; - - $scope.editCollections = function (cipher) { - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/organization/views/organizationVaultCipherCollections.html', - controller: 'organizationVaultCipherCollectionsController', - resolve: { - cipher: function () { return cipher; }, - collections: function () { return $scope.collections; } - } - }); - - modal.result.then(function (response) { - if (response.collectionIds) { - cipher.collectionIds = response.collectionIds; - } - }); - }; - - $scope.viewEvents = function (cipher) { - $uibModal.open({ - animation: true, - templateUrl: 'app/organization/views/organizationVaultCipherEvents.html', - controller: 'organizationVaultCipherEventsController', - resolve: { - cipher: function () { return cipher; } - } - }); - }; - - $scope.attachments = function (cipher) { - authService.getUserProfile().then(function (profile) { - return !!profile.organizations[cipher.organizationId].maxStorageGb; - }).then(function (useStorage) { - if (!useStorage) { - $uibModal.open({ - animation: true, - templateUrl: 'app/views/paidOrgRequired.html', - controller: 'paidOrgRequiredController', - resolve: { - orgId: function () { return cipher.organizationId; } - } - }); - return; - } - - var attachmentModel = $uibModal.open({ - animation: true, - templateUrl: 'app/vault/views/vaultAttachments.html', - controller: 'organizationVaultAttachmentsController', - resolve: { - cipherId: function () { return cipher.id; } - } - }); - - attachmentModel.result.then(function (hasAttachments) { - cipher.hasAttachments = hasAttachments; - }); - }); - }; - - $scope.deleteCipher = function (cipher) { - if (!confirm('Are you sure you want to delete this item (' + cipher.name + ')?')) { - return; - } - - apiService.ciphers.delAdmin({ id: cipher.id }, function () { - $analytics.eventTrack('Deleted Cipher'); - var index = $scope.ciphers.indexOf(cipher); - if (index > -1) { - $scope.ciphers.splice(index, 1); - } - }); - }; - - $scope.filterCollection = function (col) { - resetSelected(); - $scope.selectedCollection = col; - $scope.selectedIcon = 'fa-cube'; - if (col.id) { - $scope.filter = function (c) { - return c.collectionIds && c.collectionIds.indexOf(col.id) > -1; - }; - } - else { - $scope.filter = function (c) { - return !c.collectionIds || c.collectionIds.length === 0; - }; - } - fixLayout(); - }; - - $scope.filterType = function (t) { - resetSelected(); - $scope.selectedType = t; - switch (t) { - case constants.cipherType.login: - $scope.selectedTitle = 'Login'; - $scope.selectedIcon = 'fa-globe'; - break; - case constants.cipherType.card: - $scope.selectedTitle = 'Card'; - $scope.selectedIcon = 'fa-credit-card'; - break; - case constants.cipherType.identity: - $scope.selectedTitle = 'Identity'; - $scope.selectedIcon = 'fa-id-card-o'; - break; - case constants.cipherType.secureNote: - $scope.selectedTitle = 'Secure Note'; - $scope.selectedIcon = 'fa-sticky-note-o'; - break; - default: - break; - } - $scope.filter = function (c) { - return c.type === t; - }; - fixLayout(); - }; - - $scope.filterAll = function () { - resetSelected(); - $scope.selectedAll = true; - $scope.selectedTitle = 'All'; - $scope.selectedIcon = 'fa-th'; - $scope.filter = null; - fixLayout(); - }; - - function resetSelected() { - $scope.selectedCollection = undefined; - $scope.selectedType = undefined; - $scope.selectedAll = false; - } - - function fixLayout() { - if ($.AdminLTE && $.AdminLTE.layout) { - $timeout(function () { - $.AdminLTE.layout.fix(); - }, 0); - } - } - - $scope.cipherFilter = function () { - return function (cipher) { - return !$scope.filter || $scope.filter(cipher); - }; - }; - }); diff --git a/src/app/organization/organizationVaultEditCipherController.js b/src/app/organization/organizationVaultEditCipherController.js deleted file mode 100644 index 87bf870a..00000000 --- a/src/app/organization/organizationVaultEditCipherController.js +++ /dev/null @@ -1,148 +0,0 @@ -angular - .module('bit.organization') - - .controller('organizationVaultEditCipherController', function ($scope, apiService, $uibModalInstance, cryptoService, - cipherService, passwordService, cipherId, $analytics, orgId, $uibModal, constants) { - $analytics.eventTrack('organizationVaultEditCipherController', { category: 'Modal' }); - $scope.cipher = {}; - $scope.hideFolders = $scope.hideFavorite = $scope.fromOrg = true; - $scope.constants = constants; - - apiService.ciphers.getAdmin({ id: cipherId }, function (cipher) { - $scope.cipher = cipherService.decryptCipher(cipher); - $scope.useTotp = $scope.cipher.organizationUseTotp; - setUriMatchValues(); - }); - - $scope.save = function (model) { - var cipher = cipherService.encryptCipher(model, $scope.cipher.type); - $scope.savePromise = apiService.ciphers.putAdmin({ id: cipherId }, cipher, function (cipherResponse) { - $analytics.eventTrack('Edited Organization Cipher'); - var decCipher = cipherService.decryptCipherPreview(cipherResponse); - $uibModalInstance.close({ - action: 'edit', - data: decCipher - }); - }).$promise; - }; - - $scope.generatePassword = function () { - if (!$scope.cipher.login.password || confirm('Are you sure you want to overwrite the current password?')) { - $analytics.eventTrack('Generated Password From Edit'); - $scope.cipher.login.password = passwordService.generatePassword({ length: 14, special: true }); - } - }; - - $scope.addUri = function () { - if (!$scope.cipher.login) { - return; - } - - if (!$scope.cipher.login.uris) { - $scope.cipher.login.uris = []; - } - - $scope.cipher.login.uris.push({ - uri: null, - match: null, - matchValue: null - }); - }; - - $scope.removeUri = function (uri) { - if (!$scope.cipher.login || !$scope.cipher.login.uris) { - return; - } - - var index = $scope.cipher.login.uris.indexOf(uri); - if (index > -1) { - $scope.cipher.login.uris.splice(index, 1); - } - }; - - $scope.uriMatchChanged = function (uri) { - if ((!uri.matchValue && uri.matchValue !== 0) || uri.matchValue === '') { - uri.match = null; - } - else { - uri.match = parseInt(uri.matchValue); - } - }; - - $scope.addField = function () { - if (!$scope.cipher.login.fields) { - $scope.cipher.login.fields = []; - } - - $scope.cipher.fields.push({ - type: constants.fieldType.text.toString(), - name: null, - value: null - }); - }; - - $scope.removeField = function (field) { - var index = $scope.cipher.fields.indexOf(field); - if (index > -1) { - $scope.cipher.fields.splice(index, 1); - } - }; - - $scope.clipboardSuccess = function (e) { - e.clearSelection(); - selectPassword(e); - }; - - $scope.clipboardError = function (e, password) { - if (password) { - selectPassword(e); - } - alert('Your web browser does not support easy clipboard copying. Copy it manually instead.'); - }; - - function selectPassword(e) { - var target = $(e.trigger).parent().prev(); - if (target.attr('type') === 'text') { - target.select(); - } - } - - $scope.delete = function () { - if (!confirm('Are you sure you want to delete this item (' + $scope.cipher.name + ')?')) { - return; - } - - apiService.ciphers.delAdmin({ id: $scope.cipher.id }, function () { - $analytics.eventTrack('Deleted Organization Cipher From Edit'); - $uibModalInstance.close({ - action: 'delete', - data: $scope.cipher.id - }); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - - $scope.showUpgrade = function () { - $uibModal.open({ - animation: true, - templateUrl: 'app/views/paidOrgRequired.html', - controller: 'paidOrgRequiredController', - resolve: { - orgId: function () { return orgId; } - } - }); - }; - - function setUriMatchValues() { - if ($scope.cipher.login && $scope.cipher.login.uris) { - for (var i = 0; i < $scope.cipher.login.uris.length; i++) { - $scope.cipher.login.uris[i].matchValue = - $scope.cipher.login.uris[i].match || $scope.cipher.login.uris[i].match === 0 ? - $scope.cipher.login.uris[i].match.toString() : ''; - } - } - } - }); diff --git a/src/app/organization/views/organizationBilling.html b/src/app/organization/views/organizationBilling.html deleted file mode 100644 index b80b8456..00000000 --- a/src/app/organization/views/organizationBilling.html +++ /dev/null @@ -1,230 +0,0 @@ -
-

- Billing - manage your billing & licensing -

-
-
-
-

Canceled

- The subscription to this organization has been canceled. -
-
-

Pending Cancellation

-

- The subscription to this organization has been marked for cancellation at the end of the - current billing period. -

- -
-
-
-

Plan

-
-
-
-
-
-
Name
-
{{plan.name || '-'}}
-
Expiration
-
- Loading... -
-
- {{expiration | date: 'medium'}} -
-
- Never expires -
-
-
-
Name
-
{{plan.name || '-'}}
-
Total Seats
-
{{plan.seats || '-'}}
-
-
-
-
-
Status
-
- {{(subscription && subscription.status) || '-'}} - - marked for cancellation -
-
Next Charge
-
{{nextInvoice ? ((nextInvoice.date | date: 'mediumDate') + ', ' + (nextInvoice.amount | currency:'$')) : '-'}}
-
-
-
-
-
- Details -
- Loading... -
-
- - - - - - - -
- {{item.name}} {{item.qty > 1 ? '×' + item.qty : ''}} - @ {{item.amount | currency:'$'}} /{{item.interval}} - {{(item.qty * item.amount) | currency:'$'}} /{{item.interval}}
-
-
-
-
-
- - - - -
-
- - - Manage Billing - -
-
-
-
-

User Seats

-
-
-
- Loading... -
-
- Your plan currently has a total of {{plan.seats}} seats. -
-
-
- - -
-
-
-
-

Storage

-
-
-

- Your plan has a total of {{storage.maxGb}} GB of encrypted file storage. - You are currently using {{storage.currentName}}. -

-
-
- {{storage.percentage}}% -
-
-
-
- - -
-
-
-
-

Payment Method

-
-
-
- Loading... -
-
- No payment method on file. -
-
-
-

You must verify your bank account

-

- We have made two micro-deposits to your bank account (it may take 1-2 business days to show up). - Enter these amounts to verify the bank account. Failure to verify the bank account will result in a - missed payment and your organization being disabled. -

- -
- - {{paymentSource.description}} -
-
-
- -
-
-
-
-

Charges

-
-
-
- Loading... -
-
- No charges. -
-
- - - - - - - - - - -
- - - - - {{charge.date | date: 'mediumDate'}} - - {{charge.paymentSource}} - - {{charge.status}} - - {{charge.amount | currency:'$'}} -
-
-
-
- Note: Any charges will appear on your statement as BITWARDEN. -
-
-
diff --git a/src/app/organization/views/organizationBillingAdjustSeats.html b/src/app/organization/views/organizationBillingAdjustSeats.html deleted file mode 100644 index 7352e417..00000000 --- a/src/app/organization/views/organizationBillingAdjustSeats.html +++ /dev/null @@ -1,46 +0,0 @@ -
- -

- - {{add ? 'Add Seats' : 'Remove Seats'}} -

-
-
-
-
-

Note About Charges

-

- Adding seats to your plan will result in adjustments to your billing totals and immediately charge your - payment method on file. The first charge will be prorated for the remainder of the current billing cycle. -

-
-
-

Note About Charges

-

- Removing seats will result in adjustments to your billing totals that will be prorated as credits - to your next billing charge. -

-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
-
-
- - -
-
-
-
-
- - -
-
diff --git a/src/app/organization/views/organizationBillingChangePlan.html b/src/app/organization/views/organizationBillingChangePlan.html deleted file mode 100644 index c6e18b5f..00000000 --- a/src/app/organization/views/organizationBillingChangePlan.html +++ /dev/null @@ -1,14 +0,0 @@ -
- -

Change Plan

-
-
-
- You can contact us - if you would like to change your plan. Please ensure that you have an active payment - method on file. -
-
- -
-
diff --git a/src/app/organization/views/organizationBillingVerifyBank.html b/src/app/organization/views/organizationBillingVerifyBank.html deleted file mode 100644 index 6a17d33a..00000000 --- a/src/app/organization/views/organizationBillingVerifyBank.html +++ /dev/null @@ -1,43 +0,0 @@ -
- -

- - Verify Bank Account -

-
-
-
-

- Enter the two micro-deposit amounts from your bank account. Both amounts will be less than $1.00 each. - For example, if we deposited $0.32 and $0.45 you would enter the values "32" and "45". -

-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- -
- $ 0. - -
-
-
- -
- $ 0. - -
-
-
-
- - -
-
diff --git a/src/app/organization/views/organizationCollections.html b/src/app/organization/views/organizationCollections.html deleted file mode 100644 index 971c5f96..00000000 --- a/src/app/organization/views/organizationCollections.html +++ /dev/null @@ -1,70 +0,0 @@ -
-

- Collections - control what you share -

-
-
-
-
-   - -
- -
-
-
-
- Loading... -
-
- No collections to list. -
-
-

There are no collections yet for your organization.

- -
-
- - - - - - - -
-
- - -
- 		- - {{collection.name}} - -
-
-
-
-
diff --git a/src/app/organization/views/organizationCollectionsAdd.html b/src/app/organization/views/organizationCollectionsAdd.html deleted file mode 100644 index f54dc063..00000000 --- a/src/app/organization/views/organizationCollectionsAdd.html +++ /dev/null @@ -1,83 +0,0 @@ -
- -

Add New Collection

-
-
-
-
-

Note

-

- After creating the collection, you can associate a user to it by selecting a specific user on the "People" page. -

-

- You can associate new logins to the collection from your organization's "Vault" or by sharing an existing - login from "My vault". -

-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-

Group Access

-
- Loading groups... -
-
-

No groups for your organization.

-
-
- - - - - - - - - - - - - - - -
- - NameRead Only
- - - {{group.name}} - - - -
-
-
-
-
- - -
-
diff --git a/src/app/organization/views/organizationCollectionsEdit.html b/src/app/organization/views/organizationCollectionsEdit.html deleted file mode 100644 index 5b8a5a4e..00000000 --- a/src/app/organization/views/organizationCollectionsEdit.html +++ /dev/null @@ -1,84 +0,0 @@ -
- -

Edit Collection

-
-
-
-
-

Note

-

- Select "Users" from the listing options to manage existing users for this collection. Associate new users by - editing the user's access on the "People" page. -

-

- You can associate new logins to the collection from your organization's "Vault" or by sharing an existing - login from "My vault". -

-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-

Group Access

-
- Loading groups... -
-
-

No groups for your organization.

-
-
- - - - - - - - - - - - - - - -
- - NameRead Only
- - - {{group.name}} - - - -
-
-
-
-
- - -
-
diff --git a/src/app/organization/views/organizationCollectionsUsers.html b/src/app/organization/views/organizationCollectionsUsers.html deleted file mode 100644 index 65ead9ae..00000000 --- a/src/app/organization/views/organizationCollectionsUsers.html +++ /dev/null @@ -1,64 +0,0 @@ -
- -

User Access {{collection.name}}

-
-
-
- Loading... -
-
-

- No users for this collection. You can associate a new user to this collection by - selecting a specific user on the "People" page. -

-
-
- - - - - - - - - - - -
-
- - -
- 		- - - {{user.email}} -
{{user.name}}
- 		- - - - {{user.type | enumName: 'OrgUserType'}} - - - {{user.status | enumName: 'OrgUserStatus'}} - -
-
-
-
- -
diff --git a/src/app/organization/views/organizationDashboard.html b/src/app/organization/views/organizationDashboard.html deleted file mode 100644 index 82bc953b..00000000 --- a/src/app/organization/views/organizationDashboard.html +++ /dev/null @@ -1,34 +0,0 @@ -
-

- Dashboard - {{orgProfile.name}} -

-
-
-
-

Organization Disabled

-

This organization is currently disabled. Users will not see your shared logins or collections.

-

Contact us if you would like to reinstate this organization.

-

Update your license to reinstate this organization.

- - Billing & Licensing - - - Contact Us - -
-
-
-

Let's Get Started!

-
-
-

Get started by inviting users and creating your collections.

- - Invite Users - - - Manage Collections - -
-
-
diff --git a/src/app/organization/views/organizationDelete.html b/src/app/organization/views/organizationDelete.html deleted file mode 100644 index 5669adde..00000000 --- a/src/app/organization/views/organizationDelete.html +++ /dev/null @@ -1,34 +0,0 @@ -
- -

Delete Organization

-
-
-
-

- Continue below to delete this organization and all associated data. This data includes any collections and - their associated logins. Individual user accounts will remain, though they will not be associated to this - organization anymore. -

-
-

Warning

- Deleting this organization is permanent. It cannot be undone. -
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-
- - -
-
diff --git a/src/app/organization/views/organizationEvents.html b/src/app/organization/views/organizationEvents.html deleted file mode 100644 index 0fe14988..00000000 --- a/src/app/organization/views/organizationEvents.html +++ /dev/null @@ -1,67 +0,0 @@ -
-

- Events - audit your organization -

-
-
-
-
-   - -
- -
-
-
-
- Loading... -
-
-

There are no events to list.

-
-
- - - - - - - - - - - - - - - - - -
TimestampAppUserEvent
- {{event.date | date:'medium'}} - - - - {{event.userName}} - -
-
-
-
-
- - -
-
-
diff --git a/src/app/organization/views/organizationGroups.html b/src/app/organization/views/organizationGroups.html deleted file mode 100644 index ca26a998..00000000 --- a/src/app/organization/views/organizationGroups.html +++ /dev/null @@ -1,70 +0,0 @@ -
-

- Groups - organize your users -

-
-
-
-
-   - -
- -
-
-
-
- Loading... -
-
- No groups to list. -
-
-

There are no groups yet for your organization.

- -
-
- - - - - - - -
-
- - -
- 		- - {{group.name}} - -
-
-
-
-
diff --git a/src/app/organization/views/organizationGroupsAdd.html b/src/app/organization/views/organizationGroupsAdd.html deleted file mode 100644 index ed2d5002..00000000 --- a/src/app/organization/views/organizationGroupsAdd.html +++ /dev/null @@ -1,95 +0,0 @@ -
- -

Add New Group

-
-
-
-
-

Note

-

- After creating the group, you can associate a user to it by selecting the "Groups" option for a specific user - on the "People" page. -

-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
- - -
-

Access

-
- -
-
- -
-
-
- Loading collections... -
-
-

No collections for your organization.

-
-
- - - - - - - - - - - - - - - -
- - NameRead Only
- - - {{collection.name}} - - -
-
-
-
-
- - -
-
diff --git a/src/app/organization/views/organizationGroupsEdit.html b/src/app/organization/views/organizationGroupsEdit.html deleted file mode 100644 index 615fdf0f..00000000 --- a/src/app/organization/views/organizationGroupsEdit.html +++ /dev/null @@ -1,95 +0,0 @@ -
- -

Edit Group

-
-
-
-
-

Note

-

- Select "Users" from the listing options to manage existing users for this group. Associate new users by - selecting "Groups" the "People" page for a specific user. -

-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
- - -
-

Access

-
- -
-
- -
-
-
- Loading collections... -
-
-

No collections for your organization.

-
-
- - - - - - - - - - - - - - - -
- - NameRead Only
- - - {{collection.name}} - - -
-
-
-
-
- - -
-
diff --git a/src/app/organization/views/organizationGroupsUsers.html b/src/app/organization/views/organizationGroupsUsers.html deleted file mode 100644 index 219916fc..00000000 --- a/src/app/organization/views/organizationGroupsUsers.html +++ /dev/null @@ -1,55 +0,0 @@ -
- -

User Access {{group.name}}

-
-
-
- Loading... -
-
-

- No users for this group. You can associate a new user to this group by - selecting a specific user's "Groups" on the "People" page. -

-
-
- - - - - - - - - - -
-
- - -
- 		- - - {{user.email}} -
{{user.name}}
- 		- {{user.type | enumName: 'OrgUserType'}} - - - {{user.status | enumName: 'OrgUserStatus'}} - -
-
-
-
- -
diff --git a/src/app/organization/views/organizationPeople.html b/src/app/organization/views/organizationPeople.html deleted file mode 100644 index 4049a179..00000000 --- a/src/app/organization/views/organizationPeople.html +++ /dev/null @@ -1,96 +0,0 @@ -
-

- People - users for your organization -

-
-
-
-
-   - -
- -
-
-
-
- Loading... -
-
- - - - - - - - - - -
-
- - -
- 		- - - {{user.email}} - -
{{user.name}}
- 		- {{user.type | enumName: 'OrgUserType'}} - - - {{user.status | enumName: 'OrgUserStatus'}} - -
-
-
-
-
diff --git a/src/app/organization/views/organizationPeopleEdit.html b/src/app/organization/views/organizationPeopleEdit.html deleted file mode 100644 index 48f61d20..00000000 --- a/src/app/organization/views/organizationPeopleEdit.html +++ /dev/null @@ -1,101 +0,0 @@ -
- -

Edit User {{email}}

-
-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-

User Type

-
-
- -
-
- -
-
- -
-
-

Access

-
- -
-
- -
-
-
- Loading collections... -
-
-

No collections for your organization.

-
-
- - - - - - - - - - - - - - - -
- - NameRead Only
- - - {{collection.name}} - - -
-
-
-
-
- - -
-
diff --git a/src/app/organization/views/organizationPeopleEvents.html b/src/app/organization/views/organizationPeopleEvents.html deleted file mode 100644 index 2dcf5215..00000000 --- a/src/app/organization/views/organizationPeopleEvents.html +++ /dev/null @@ -1,56 +0,0 @@ -
- -

User Event Logs {{email}}

-
-
- -
- Loading... -
-
-

There are no events to list.

-
-
- - - - - - - - - - - - - - - -
TimestampAppEvent
- {{event.date | date:'medium'}} - - - -
-
-
-
- - -
-
-
- -
diff --git a/src/app/organization/views/organizationPeopleGroups.html b/src/app/organization/views/organizationPeopleGroups.html deleted file mode 100644 index ba482a19..00000000 --- a/src/app/organization/views/organizationPeopleGroups.html +++ /dev/null @@ -1,55 +0,0 @@ -
- -

Edit User Groups {{orgUser.email}}

-
-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- Loading... -
-
-

No groups for your organization.

-
-

Edit the groups that this user belongs to.

-
- - - - - - - - - - - - - -
- - Name
- - - {{group.name}} -
-
-
-
- - -
-
diff --git a/src/app/organization/views/organizationPeopleInvite.html b/src/app/organization/views/organizationPeopleInvite.html deleted file mode 100644 index 5541d8d6..00000000 --- a/src/app/organization/views/organizationPeopleInvite.html +++ /dev/null @@ -1,110 +0,0 @@ -
- -

Invite User

-
-
-
-

- Invite a new user to your organization by entering their Bitwarden account email address below. If they do not have - a Bitwarden account already, they will be prompted to create a new account. -

-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -

You can invite up to 20 users at a time by comma separating a list of email addresses.

-
-

User Type

-
-
- -
-
- -
-
- -
-
-

Access

-
- -
-
- -
-
-
- Loading collections... -
-
-

No collections for your organization.

-
-
- - - - - - - - - - - - - - - -
- - NameRead Only
- - - {{collection.name}} - - -
-
-
-
-
- - -
-
diff --git a/src/app/organization/views/organizationSettings.html b/src/app/organization/views/organizationSettings.html deleted file mode 100644 index 55cf2379..00000000 --- a/src/app/organization/views/organizationSettings.html +++ /dev/null @@ -1,124 +0,0 @@ -
-

- Settings - manage your organization -

-
-
-
-
-

General

-
-
-
-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
- - -
-
- - -
-
-
- Tax Information -
{{model.businessAddress1}}
-
{{model.businessAddress2}}
-
{{model.businessAddress3}}
-
{{model.businessCountry}}
-
{{model.businessTaxNumber}}
-

- Please contact support - to provide (or update) tax information for your invoices. -

-
-
-
- -
-
-
-
- -
-
-
-
-
-

Two-step Login Providers

-
-
-
- - - - - - - - -
- - {{::provider.name}} - - - {{::provider.name}} -
{{::provider.description}}
- 		- - {{provider.enabled ? 'Enabled' : 'Disabled'}} - -
-
-
-
-
-
-

Import/Export

-
-
-

- Quickly import logins, collections, and other data. You can also export all of your organization's - vault data in .csv format. -

-
-
- - -
-
-
-
-

Danger Zone

-
-
- Careful, these actions are not reversible! -
-
- -
-
-
diff --git a/src/app/organization/views/organizationVault.html b/src/app/organization/views/organizationVault.html deleted file mode 100644 index b41ab1d8..00000000 --- a/src/app/organization/views/organizationVault.html +++ /dev/null @@ -1,142 +0,0 @@ -
-

- Org Vault - - , - - -

-
-
-

Loading...

-
-
-

- - {{selectedCollection ? selectedCollection.name : selectedTitle}} - -

-
-
-
No items to list.
-
- - - - - - - - -
-
- - -
- 		- - - - {{cipher.name}} - -
{{cipher.subTitle}}
-
-
-
-
-
- diff --git a/src/app/organization/views/organizationVaultCipherCollections.html b/src/app/organization/views/organizationVaultCipherCollections.html deleted file mode 100644 index 19d9a56b..00000000 --- a/src/app/organization/views/organizationVaultCipherCollections.html +++ /dev/null @@ -1,52 +0,0 @@ -
- -

Collections {{cipher.name}}

-
-
-
-

Edit the collections that this item is being shared with.

-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
-

There are no collections yet for your organization.

-
-
- - - - - - - - - - - - - -
- - Name
- - - {{collection.name}} -
-
-
-
- - -
-
\ No newline at end of file diff --git a/src/app/organization/views/organizationVaultCipherEvents.html b/src/app/organization/views/organizationVaultCipherEvents.html deleted file mode 100644 index 8a7e9307..00000000 --- a/src/app/organization/views/organizationVaultCipherEvents.html +++ /dev/null @@ -1,60 +0,0 @@ -
- -

Event Logs {{cipher.name}}

-
-
- -
- Loading... -
-
-

There are no events to list.

-
-
- - - - - - - - - - - - - - - - - -
TimestampAppUserEvent
- {{event.date | date:'medium'}} - - - - {{event.userName}} - - {{event.message}} -
-
-
- - -
-
-
- -
diff --git a/src/app/reports/reportsBreachController.js b/src/app/reports/reportsBreachController.js deleted file mode 100644 index ddcb86c0..00000000 --- a/src/app/reports/reportsBreachController.js +++ /dev/null @@ -1,38 +0,0 @@ -angular - .module('bit.tools') - - .controller('reportsBreachController', function ($scope, apiService, toastr, authService) { - $scope.loading = true; - $scope.error = false; - $scope.breachAccounts = []; - $scope.email = null; - - $scope.$on('$viewContentLoaded', function () { - authService.getUserProfile().then(function (userProfile) { - $scope.email = userProfile.email; - return apiService.hibp.get({ email: $scope.email }).$promise; - }).then(function (response) { - var breachAccounts = []; - for (var i = 0; i < response.length; i++) { - var breach = { - id: response[i].Name, - title: response[i].Title, - domain: response[i].Domain, - date: new Date(response[i].BreachDate), - reportedDate: new Date(response[i].AddedDate), - modifiedDate: new Date(response[i].ModifiedDate), - count: response[i].PwnCount, - description: response[i].Description, - classes: response[i].DataClasses, - image: 'https://haveibeenpwned.com/Content/Images/PwnedLogos/' + response[i].Name + '.' + response[i].LogoType - }; - breachAccounts.push(breach); - } - $scope.breachAccounts = breachAccounts; - $scope.loading = false; - }, function (response) { - $scope.error = response.status !== 404; - $scope.loading = false; - }); - }); - }); diff --git a/src/app/reports/reportsModule.js b/src/app/reports/reportsModule.js deleted file mode 100644 index 1ccbf4d5..00000000 --- a/src/app/reports/reportsModule.js +++ /dev/null @@ -1,2 +0,0 @@ -angular - .module('bit.reports', ['toastr', 'ngSanitize']); diff --git a/src/app/reports/views/reportsBreach.html b/src/app/reports/views/reportsBreach.html deleted file mode 100644 index f4dc4732..00000000 --- a/src/app/reports/views/reportsBreach.html +++ /dev/null @@ -1,74 +0,0 @@ -
-

- Data Breach Report - have you been pwned? -

-
-
-
-

Loading...

-
-
-

An error occurred trying to load the report. Try again...

-
-
-

Oh No, Data Breaches Found!

-

- Your email ({{email}}) was found in {{breachAccounts.length}} - different data - - online. -

-

- A "breach" is an incident where a site's data has been illegally accessed by hackers and then released publicly. - Review the types of data that were compromised (email addresses, passwords, credit cards etc.) and take appropriate - action, such as changing passwords. -

- Check another email -
-
-

Good News, Nothing Found!

-

Your email ({{email}}) was not found in any known data breaches.

- Check another email -
-
-
-

{{breach.title}}

-
-
-
-
- {{breach.id}} logo -
-
-
-
-

-
Compromised Data
-
    -
  • {{class}}
    • -
-
-
-
-
-
{{breach.domain}}
-
Users
-
{{breach.count | number: 0}}
-
Occurred
-
{{breach.date | date: format: mediumDate}}
-
Reported
-
{{breach.reportedDate | date: format: mediumDate}}
-
Updated
-
{{breach.modifiedDate | date: format: mediumDate}}
-
-
-
-
-
-
-
- This data is brought to you as a service from - Have I been pwned?. - Please check out their wonderful services and subscribe to receive notifications about future data breaches. -
diff --git a/src/app/services/apiService.js b/src/app/services/apiService.js deleted file mode 100644 index 99a12238..00000000 --- a/src/app/services/apiService.js +++ /dev/null @@ -1,222 +0,0 @@ -angular - .module('bit.services') - - .factory('apiService', function ($resource, tokenService, appSettings, $httpParamSerializer, utilsService) { - var _service = {}, - _apiUri = appSettings.apiUri, - _identityUri = appSettings.identityUri; - - _service.folders = $resource(_apiUri + '/folders/:id', {}, { - get: { method: 'GET', params: { id: '@id' } }, - list: { method: 'GET', params: {} }, - post: { method: 'POST', params: {} }, - put: { method: 'POST', params: { id: '@id' } }, - del: { url: _apiUri + '/folders/:id/delete', method: 'POST', params: { id: '@id' } } - }); - - _service.ciphers = $resource(_apiUri + '/ciphers/:id', {}, { - get: { method: 'GET', params: { id: '@id' } }, - getAdmin: { url: _apiUri + '/ciphers/:id/admin', method: 'GET', params: { id: '@id' } }, - getDetails: { url: _apiUri + '/ciphers/:id/details', method: 'GET', params: { id: '@id' } }, - list: { method: 'GET', params: {} }, - listOrganizationDetails: { url: _apiUri + '/ciphers/organization-details', method: 'GET', params: {} }, - post: { method: 'POST', params: {} }, - postAdmin: { url: _apiUri + '/ciphers/admin', method: 'POST', params: {} }, - put: { method: 'POST', params: { id: '@id' } }, - putAdmin: { url: _apiUri + '/ciphers/:id/admin', method: 'POST', params: { id: '@id' } }, - 'import': { url: _apiUri + '/ciphers/import', method: 'POST', params: {} }, - importOrg: { url: _apiUri + '/ciphers/import-organization?organizationId=:orgId', method: 'POST', params: { orgId: '@orgId' } }, - putPartial: { url: _apiUri + '/ciphers/:id/partial', method: 'POST', params: { id: '@id' } }, - putShare: { url: _apiUri + '/ciphers/:id/share', method: 'POST', params: { id: '@id' } }, - putCollections: { url: _apiUri + '/ciphers/:id/collections', method: 'POST', params: { id: '@id' } }, - putCollectionsAdmin: { url: _apiUri + '/ciphers/:id/collections-admin', method: 'POST', params: { id: '@id' } }, - del: { url: _apiUri + '/ciphers/:id/delete', method: 'POST', params: { id: '@id' } }, - delAdmin: { url: _apiUri + '/ciphers/:id/delete-admin', method: 'POST', params: { id: '@id' } }, - delMany: { url: _apiUri + '/ciphers/delete', method: 'POST' }, - moveMany: { url: _apiUri + '/ciphers/move', method: 'POST' }, - purge: { url: _apiUri + '/ciphers/purge', method: 'POST' }, - postAttachment: { - url: _apiUri + '/ciphers/:id/attachment', - method: 'POST', - headers: { 'Content-Type': undefined }, - params: { id: '@id' } - }, - postAttachmentAdmin: { - url: _apiUri + '/ciphers/:id/attachment-admin', - method: 'POST', - headers: { 'Content-Type': undefined }, - params: { id: '@id' } - }, - postShareAttachment: { - url: _apiUri + '/ciphers/:id/attachment/:attachmentId/share?organizationId=:orgId', - method: 'POST', - headers: { 'Content-Type': undefined }, - params: { id: '@id', attachmentId: '@attachmentId', orgId: '@orgId' } - }, - delAttachment: { url: _apiUri + '/ciphers/:id/attachment/:attachmentId/delete', method: 'POST', params: { id: '@id', attachmentId: '@attachmentId' } }, - delAttachmentAdmin: { url: _apiUri + '/ciphers/:id/attachment/:attachmentId/delete-admin', method: 'POST', params: { id: '@id', attachmentId: '@attachmentId' } } - }); - - _service.organizations = $resource(_apiUri + '/organizations/:id', {}, { - get: { method: 'GET', params: { id: '@id' } }, - getBilling: { url: _apiUri + '/organizations/:id/billing', method: 'GET', params: { id: '@id' } }, - getLicense: { url: _apiUri + '/organizations/:id/license', method: 'GET', params: { id: '@id' } }, - list: { method: 'GET', params: {} }, - post: { method: 'POST', params: {} }, - put: { method: 'POST', params: { id: '@id' } }, - putPayment: { url: _apiUri + '/organizations/:id/payment', method: 'POST', params: { id: '@id' } }, - putSeat: { url: _apiUri + '/organizations/:id/seat', method: 'POST', params: { id: '@id' } }, - putStorage: { url: _apiUri + '/organizations/:id/storage', method: 'POST', params: { id: '@id' } }, - putUpgrade: { url: _apiUri + '/organizations/:id/upgrade', method: 'POST', params: { id: '@id' } }, - putCancel: { url: _apiUri + '/organizations/:id/cancel', method: 'POST', params: { id: '@id' } }, - putReinstate: { url: _apiUri + '/organizations/:id/reinstate', method: 'POST', params: { id: '@id' } }, - postLeave: { url: _apiUri + '/organizations/:id/leave', method: 'POST', params: { id: '@id' } }, - postVerifyBank: { url: _apiUri + '/organizations/:id/verify-bank', method: 'POST', params: { id: '@id' } }, - del: { url: _apiUri + '/organizations/:id/delete', method: 'POST', params: { id: '@id' } }, - postLicense: { - url: _apiUri + '/organizations/license', - method: 'POST', - headers: { 'Content-Type': undefined } - }, - putLicense: { - url: _apiUri + '/organizations/:id/license', - method: 'POST', - headers: { 'Content-Type': undefined } - } - }); - - _service.organizationUsers = $resource(_apiUri + '/organizations/:orgId/users/:id', {}, { - get: { method: 'GET', params: { id: '@id', orgId: '@orgId' } }, - list: { method: 'GET', params: { orgId: '@orgId' } }, - listGroups: { url: _apiUri + '/organizations/:orgId/users/:id/groups', method: 'GET', params: { id: '@id', orgId: '@orgId' }, isArray: true }, - invite: { url: _apiUri + '/organizations/:orgId/users/invite', method: 'POST', params: { orgId: '@orgId' } }, - reinvite: { url: _apiUri + '/organizations/:orgId/users/:id/reinvite', method: 'POST', params: { id: '@id', orgId: '@orgId' } }, - accept: { url: _apiUri + '/organizations/:orgId/users/:id/accept', method: 'POST', params: { id: '@id', orgId: '@orgId' } }, - confirm: { url: _apiUri + '/organizations/:orgId/users/:id/confirm', method: 'POST', params: { id: '@id', orgId: '@orgId' } }, - put: { method: 'POST', params: { id: '@id', orgId: '@orgId' } }, - putGroups: { url: _apiUri + '/organizations/:orgId/users/:id/groups', method: 'POST', params: { id: '@id', orgId: '@orgId' } }, - del: { url: _apiUri + '/organizations/:orgId/users/:id/delete', method: 'POST', params: { id: '@id', orgId: '@orgId' } } - }); - - _service.collections = $resource(_apiUri + '/organizations/:orgId/collections/:id', {}, { - get: { method: 'GET', params: { id: '@id', orgId: '@orgId' } }, - getDetails: { url: _apiUri + '/organizations/:orgId/collections/:id/details', method: 'GET', params: { id: '@id', orgId: '@orgId' } }, - listMe: { url: _apiUri + '/collections?writeOnly=:writeOnly', method: 'GET', params: { writeOnly: '@writeOnly' } }, - listOrganization: { method: 'GET', params: { orgId: '@orgId' } }, - listUsers: { url: _apiUri + '/organizations/:orgId/collections/:id/users', method: 'GET', params: { id: '@id', orgId: '@orgId' } }, - post: { method: 'POST', params: { orgId: '@orgId' } }, - put: { method: 'POST', params: { id: '@id', orgId: '@orgId' } }, - del: { url: _apiUri + '/organizations/:orgId/collections/:id/delete', method: 'POST', params: { id: '@id', orgId: '@orgId' } }, - delUser: { url: _apiUri + '/organizations/:orgId/collections/:id/delete-user/:orgUserId', method: 'POST', params: { id: '@id', orgId: '@orgId', orgUserId: '@orgUserId' } } - }); - - _service.groups = $resource(_apiUri + '/organizations/:orgId/groups/:id', {}, { - get: { method: 'GET', params: { id: '@id', orgId: '@orgId' } }, - getDetails: { url: _apiUri + '/organizations/:orgId/groups/:id/details', method: 'GET', params: { id: '@id', orgId: '@orgId' } }, - listOrganization: { method: 'GET', params: { orgId: '@orgId' } }, - listUsers: { url: _apiUri + '/organizations/:orgId/groups/:id/users', method: 'GET', params: { id: '@id', orgId: '@orgId' } }, - post: { method: 'POST', params: { orgId: '@orgId' } }, - put: { method: 'POST', params: { id: '@id', orgId: '@orgId' } }, - del: { url: _apiUri + '/organizations/:orgId/groups/:id/delete', method: 'POST', params: { id: '@id', orgId: '@orgId' } }, - delUser: { url: _apiUri + '/organizations/:orgId/groups/:id/delete-user/:orgUserId', method: 'POST', params: { id: '@id', orgId: '@orgId', orgUserId: '@orgUserId' } } - }); - - _service.accounts = $resource(_apiUri + '/accounts', {}, { - register: { url: _apiUri + '/accounts/register', method: 'POST', params: {} }, - emailToken: { url: _apiUri + '/accounts/email-token', method: 'POST', params: {} }, - email: { url: _apiUri + '/accounts/email', method: 'POST', params: {} }, - verifyEmailToken: { url: _apiUri + '/accounts/verify-email-token', method: 'POST', params: {} }, - verifyEmail: { url: _apiUri + '/accounts/verify-email', method: 'POST', params: {} }, - postDeleteRecoverToken: { url: _apiUri + '/accounts/delete-recover-token', method: 'POST', params: {} }, - postDeleteRecover: { url: _apiUri + '/accounts/delete-recover', method: 'POST', params: {} }, - putPassword: { url: _apiUri + '/accounts/password', method: 'POST', params: {} }, - getProfile: { url: _apiUri + '/accounts/profile', method: 'GET', params: {} }, - putProfile: { url: _apiUri + '/accounts/profile', method: 'POST', params: {} }, - getDomains: { url: _apiUri + '/accounts/domains', method: 'GET', params: {} }, - putDomains: { url: _apiUri + '/accounts/domains', method: 'POST', params: {} }, - postPasswordHint: { url: _apiUri + '/accounts/password-hint', method: 'POST', params: {} }, - putSecurityStamp: { url: _apiUri + '/accounts/security-stamp', method: 'POST', params: {} }, - putKeys: { url: _apiUri + '/accounts/keys', method: 'POST', params: {} }, - putKey: { url: _apiUri + '/accounts/key', method: 'POST', params: {} }, - 'import': { url: _apiUri + '/accounts/import', method: 'POST', params: {} }, - postDelete: { url: _apiUri + '/accounts/delete', method: 'POST', params: {} }, - putStorage: { url: _apiUri + '/accounts/storage', method: 'POST', params: {} }, - putPayment: { url: _apiUri + '/accounts/payment', method: 'POST', params: {} }, - putCancelPremium: { url: _apiUri + '/accounts/cancel-premium', method: 'POST', params: {} }, - putReinstatePremium: { url: _apiUri + '/accounts/reinstate-premium', method: 'POST', params: {} }, - getBilling: { url: _apiUri + '/accounts/billing', method: 'GET', params: {} }, - postPremium: { - url: _apiUri + '/accounts/premium', - method: 'POST', - headers: { 'Content-Type': undefined } - }, - putLicense: { - url: _apiUri + '/accounts/license', - method: 'POST', - headers: { 'Content-Type': undefined } - } - }); - - _service.twoFactor = $resource(_apiUri + '/two-factor', {}, { - list: { method: 'GET', params: {} }, - listOrganization: { url: _apiUri + '/organizations/:orgId/two-factor', method: 'GET', params: { orgId: '@orgId' } }, - getEmail: { url: _apiUri + '/two-factor/get-email', method: 'POST', params: {} }, - getU2f: { url: _apiUri + '/two-factor/get-u2f', method: 'POST', params: {} }, - getDuo: { url: _apiUri + '/two-factor/get-duo', method: 'POST', params: {} }, - getOrganizationDuo: { url: _apiUri + '/organizations/:orgId/two-factor/get-duo', method: 'POST', params: { orgId: '@orgId' } }, - getAuthenticator: { url: _apiUri + '/two-factor/get-authenticator', method: 'POST', params: {} }, - getYubi: { url: _apiUri + '/two-factor/get-yubikey', method: 'POST', params: {} }, - sendEmail: { url: _apiUri + '/two-factor/send-email', method: 'POST', params: {} }, - sendEmailLogin: { url: _apiUri + '/two-factor/send-email-login', method: 'POST', params: {} }, - putEmail: { url: _apiUri + '/two-factor/email', method: 'POST', params: {} }, - putU2f: { url: _apiUri + '/two-factor/u2f', method: 'POST', params: {} }, - putAuthenticator: { url: _apiUri + '/two-factor/authenticator', method: 'POST', params: {} }, - putDuo: { url: _apiUri + '/two-factor/duo', method: 'POST', params: {} }, - putOrganizationDuo: { url: _apiUri + '/organizations/:orgId/two-factor/duo', method: 'POST', params: { orgId: '@orgId' } }, - putYubi: { url: _apiUri + '/two-factor/yubikey', method: 'POST', params: {} }, - disable: { url: _apiUri + '/two-factor/disable', method: 'POST', params: {} }, - disableOrganization: { url: _apiUri + '/organizations/:orgId/two-factor/disable', method: 'POST', params: { orgId: '@orgId' } }, - recover: { url: _apiUri + '/two-factor/recover', method: 'POST', params: {} }, - getRecover: { url: _apiUri + '/two-factor/get-recover', method: 'POST', params: {} } - }); - - _service.settings = $resource(_apiUri + '/settings', {}, { - getDomains: { url: _apiUri + '/settings/domains', method: 'GET', params: {} }, - putDomains: { url: _apiUri + '/settings/domains', method: 'POST', params: {} }, - }); - - _service.users = $resource(_apiUri + '/users/:id', {}, { - getPublicKey: { url: _apiUri + '/users/:id/public-key', method: 'GET', params: { id: '@id' } } - }); - - _service.events = $resource(_apiUri + '/events', {}, { - list: { method: 'GET', params: {} }, - listOrganization: { url: _apiUri + '/organizations/:orgId/events', method: 'GET', params: { id: '@orgId' } }, - listCipher: { url: _apiUri + '/ciphers/:id/events', method: 'GET', params: { id: '@id' } }, - listOrganizationUser: { url: _apiUri + '/organizations/:orgId/users/:id/events', method: 'GET', params: { orgId: '@orgId', id: '@id' } } - }); - - _service.identity = $resource(_identityUri + '/connect', {}, { - token: { - url: _identityUri + '/connect/token', - method: 'POST', - headers: { - 'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8', - 'Device-Type': utilsService.getDeviceType() - }, - transformRequest: transformUrlEncoded, - skipAuthorization: true, - params: {} - } - }); - - _service.hibp = $resource('https://haveibeenpwned.com/api/v2/breachedaccount/:email', {}, { - get: { method: 'GET', params: { email: '@email' }, isArray: true }, - }); - - function transformUrlEncoded(data) { - return $httpParamSerializer(data); - } - - return _service; - }); diff --git a/src/app/services/authService.js b/src/app/services/authService.js deleted file mode 100644 index c69ec0ce..00000000 --- a/src/app/services/authService.js +++ /dev/null @@ -1,259 +0,0 @@ -angular - .module('bit.services') - - .factory('authService', function (cryptoService, apiService, tokenService, $q, jwtHelper, $rootScope, constants) { - var _service = {}, - _userProfile = null; - - _service.logIn = function (email, masterPassword, token, provider, remember) { - email = email.toLowerCase(); - - var deferred = $q.defer(); - - var makeResult; - cryptoService.makeKeyAndHash(email, masterPassword).then(function (result) { - makeResult = result; - - var request = { - username: email, - password: result.hash, - grant_type: 'password', - scope: 'api offline_access', - client_id: 'web' - }; - - // TODO: device information one day? - - if (token && typeof (provider) !== 'undefined' && provider !== null) { - remember = remember || remember !== false; - - request.twoFactorToken = token; - request.twoFactorProvider = provider; - request.twoFactorRemember = remember ? '1' : '0'; - } - else if (tokenService.getTwoFactorToken(email)) { - request.twoFactorToken = tokenService.getTwoFactorToken(email); - request.twoFactorProvider = constants.twoFactorProvider.remember; - request.twoFactorRemember = '0'; - } - - return apiService.identity.token(request).$promise; - }).then(function (response) { - if (!response || !response.access_token) { - return; - } - - tokenService.setToken(response.access_token); - tokenService.setRefreshToken(response.refresh_token); - cryptoService.setKey(makeResult.key); - - if (response.TwoFactorToken) { - tokenService.setTwoFactorToken(response.TwoFactorToken, email); - } - - if (response.Key) { - cryptoService.setEncKey(response.Key, makeResult.key); - } - - if (response.PrivateKey) { - cryptoService.setPrivateKey(response.PrivateKey); - return true; - } - else { - return cryptoService.makeKeyPair(); - } - }).then(function (keyResults) { - if (keyResults === true) { - return; - } - - cryptoService.setPrivateKey(keyResults.privateKeyEnc); - return apiService.accounts.putKeys({ - publicKey: keyResults.publicKey, - encryptedPrivateKey: keyResults.privateKeyEnc - }).$promise; - }).then(function () { - return _service.setUserProfile(); - }).then(function () { - deferred.resolve(); - }, function (error) { - _service.logOut(); - - if (error.status === 400 && error.data.TwoFactorProviders2 && - Object.keys(error.data.TwoFactorProviders2).length) { - tokenService.clearTwoFactorToken(email); - deferred.resolve(error.data.TwoFactorProviders2); - } - else { - deferred.reject(error); - } - }); - - return deferred.promise; - }; - - _service.logOut = function () { - tokenService.clearTokens(); - cryptoService.clearKeys(); - $rootScope.vaultCiphers = $rootScope.vaultFolders = $rootScope.vaultCollections = null; - _userProfile = null; - }; - - _service.getUserProfile = function () { - if (!_userProfile) { - return _service.setUserProfile(); - } - - var deferred = $q.defer(); - deferred.resolve(_userProfile); - return deferred.promise; - }; - - var _setDeferred = null; - _service.setUserProfile = function () { - if (_setDeferred && _setDeferred.promise.$$state.status === 0) { - return _setDeferred.promise; - } - - _setDeferred = $q.defer(); - - var token = tokenService.getToken(); - if (!token) { - _setDeferred.reject(); - return _setDeferred.promise; - } - - apiService.accounts.getProfile({}, function (profile) { - _userProfile = { - id: profile.Id, - email: profile.Email, - emailVerified: profile.EmailVerified, - premium: profile.Premium, - extended: { - name: profile.Name, - twoFactorEnabled: profile.TwoFactorEnabled, - culture: profile.Culture - } - }; - - if (profile.Organizations) { - var orgs = {}; - for (var i = 0; i < profile.Organizations.length; i++) { - orgs[profile.Organizations[i].Id] = { - id: profile.Organizations[i].Id, - name: profile.Organizations[i].Name, - key: profile.Organizations[i].Key, - status: profile.Organizations[i].Status, - type: profile.Organizations[i].Type, - enabled: profile.Organizations[i].Enabled, - maxCollections: profile.Organizations[i].MaxCollections, - maxStorageGb: profile.Organizations[i].MaxStorageGb, - seats: profile.Organizations[i].Seats, - useGroups: profile.Organizations[i].UseGroups, - useDirectory: profile.Organizations[i].UseDirectory, - useEvents: profile.Organizations[i].UseEvents, - use2fa: profile.Organizations[i].Use2fa, - useTotp: profile.Organizations[i].UseTotp - }; - } - - _userProfile.organizations = orgs; - cryptoService.setOrgKeys(orgs); - _setDeferred.resolve(_userProfile); - } - }, function (error) { - _setDeferred.reject(error); - }); - - return _setDeferred.promise; - }; - - _service.addProfileOrganizationOwner = function (org, keyCt) { - return _service.getUserProfile().then(function (profile) { - if (profile) { - if (!profile.organizations) { - profile.organizations = {}; - } - - var o = { - id: org.Id, - name: org.Name, - key: keyCt, - status: 2, // 2 = Confirmed - type: 0, // 0 = Owner - enabled: true, - maxCollections: org.MaxCollections, - maxStorageGb: org.MaxStorageGb, - seats: org.Seats, - useGroups: org.UseGroups, - useDirectory: org.UseDirectory, - useEvents: org.UseEvents, - use2fa: org.Use2fa, - useTotp: org.UseTotp - }; - profile.organizations[o.id] = o; - - _userProfile = profile; - cryptoService.addOrgKey(o.id, o.key); - } - }); - }; - - _service.removeProfileOrganization = function (orgId) { - return _service.getUserProfile().then(function (profile) { - if (profile) { - if (profile.organizations && profile.organizations.hasOwnProperty(orgId)) { - delete profile.organizations[orgId]; - _userProfile = profile; - } - - cryptoService.clearOrgKey(orgId); - } - }); - }; - - _service.updateProfileOrganization = function (org) { - return _service.getUserProfile().then(function (profile) { - if (profile) { - if (profile.organizations && org.Id in profile.organizations) { - profile.organizations[org.Id].name = org.Name; - _userProfile = profile; - } - } - }); - }; - - _service.updateProfilePremium = function (isPremium) { - return _service.getUserProfile().then(function (profile) { - if (profile) { - profile.premium = isPremium; - _userProfile = profile; - } - }); - }; - - _service.isAuthenticated = function () { - return tokenService.getToken() !== null; - }; - - _service.refreshAccessToken = function () { - var refreshToken = tokenService.getRefreshToken(); - if (!refreshToken) { - return $q(function (resolve, reject) { - resolve(null); - }); - } - - return apiService.identity.token({ - grant_type: 'refresh_token', - client_id: 'web', - refresh_token: refreshToken - }).$promise.then(function (response) { - tokenService.setToken(response.access_token); - tokenService.setRefreshToken(response.refresh_token); - return response.access_token; - }, function (response) { }); - }; - - return _service; - }); diff --git a/src/app/services/cipherService.js b/src/app/services/cipherService.js deleted file mode 100644 index 97da93c2..00000000 --- a/src/app/services/cipherService.js +++ /dev/null @@ -1,570 +0,0 @@ -angular - .module('bit.services') - - .factory('cipherService', function (cryptoService, apiService, $q, $window, constants, appSettings, $localStorage) { - var _service = { - disableWebsiteIcons: $localStorage.disableWebsiteIcons - }; - - _service.decryptCiphers = function (encryptedCiphers) { - if (!encryptedCiphers) throw "encryptedCiphers is undefined or null"; - - var unencryptedCiphers = []; - for (var i = 0; i < encryptedCiphers.length; i++) { - unencryptedCiphers.push(_service.decryptCipher(encryptedCiphers[i])); - } - - return unencryptedCiphers; - }; - - _service.decryptCipher = function (encryptedCipher) { - if (!encryptedCipher) throw "encryptedCipher is undefined or null"; - - var key = null; - if (encryptedCipher.OrganizationId) { - key = cryptoService.getOrgKey(encryptedCipher.OrganizationId); - } - - var cipher = { - id: encryptedCipher.Id, - organizationId: encryptedCipher.OrganizationId, - collectionIds: encryptedCipher.CollectionIds || [], - 'type': encryptedCipher.Type, - name: cryptoService.decrypt(encryptedCipher.Name, key), - notes: _service.decryptProperty(encryptedCipher.Notes, key, true, false), - fields: _service.decryptFields(key, encryptedCipher.Fields), - folderId: encryptedCipher.FolderId, - favorite: encryptedCipher.Favorite, - edit: encryptedCipher.Edit, - organizationUseTotp: encryptedCipher.OrganizationUseTotp, - attachments: null, - icon: null - }; - - var i; - switch (cipher.type) { - case constants.cipherType.login: - cipher.login = { - username: _service.decryptProperty(encryptedCipher.Login.Username, key, true, false), - password: _service.decryptProperty(encryptedCipher.Login.Password, key, true, false), - totp: _service.decryptProperty(encryptedCipher.Login.Totp, key, true, false), - uris: null - }; - if (encryptedCipher.Login.Uris) { - cipher.login.uris = []; - for (i = 0; i < encryptedCipher.Login.Uris.length; i++) { - cipher.login.uris.push({ - uri: _service.decryptProperty(encryptedCipher.Login.Uris[i].Uri, key, true, false), - match: encryptedCipher.Login.Uris[i].Match - }); - } - } - cipher.icon = 'fa-globe'; - break; - case constants.cipherType.secureNote: - cipher.secureNote = { - type: encryptedCipher.SecureNote.Type - }; - cipher.icon = 'fa-sticky-note-o'; - break; - case constants.cipherType.card: - cipher.card = { - cardholderName: _service.decryptProperty(encryptedCipher.Card.CardholderName, key, true, false), - number: _service.decryptProperty(encryptedCipher.Card.Number, key, true, false), - brand: _service.decryptProperty(encryptedCipher.Card.Brand, key, true, false), - expMonth: _service.decryptProperty(encryptedCipher.Card.ExpMonth, key, true, false), - expYear: _service.decryptProperty(encryptedCipher.Card.ExpYear, key, true, false), - code: _service.decryptProperty(encryptedCipher.Card.Code, key, true, false) - }; - cipher.icon = 'fa-credit-card'; - break; - case constants.cipherType.identity: - cipher.identity = { - title: _service.decryptProperty(encryptedCipher.Identity.Title, key, true, false), - firstName: _service.decryptProperty(encryptedCipher.Identity.FirstName, key, true, false), - middleName: _service.decryptProperty(encryptedCipher.Identity.MiddleName, key, true, false), - lastName: _service.decryptProperty(encryptedCipher.Identity.LastName, key, true, false), - address1: _service.decryptProperty(encryptedCipher.Identity.Address1, key, true, false), - address2: _service.decryptProperty(encryptedCipher.Identity.Address2, key, true, false), - address3: _service.decryptProperty(encryptedCipher.Identity.Address3, key, true, false), - city: _service.decryptProperty(encryptedCipher.Identity.City, key, true, false), - state: _service.decryptProperty(encryptedCipher.Identity.State, key, true, false), - postalCode: _service.decryptProperty(encryptedCipher.Identity.PostalCode, key, true, false), - country: _service.decryptProperty(encryptedCipher.Identity.Country, key, true, false), - company: _service.decryptProperty(encryptedCipher.Identity.Company, key, true, false), - email: _service.decryptProperty(encryptedCipher.Identity.Email, key, true, false), - phone: _service.decryptProperty(encryptedCipher.Identity.Phone, key, true, false), - ssn: _service.decryptProperty(encryptedCipher.Identity.SSN, key, true, false), - username: _service.decryptProperty(encryptedCipher.Identity.Username, key, true, false), - passportNumber: _service.decryptProperty(encryptedCipher.Identity.PassportNumber, key, true, false), - licenseNumber: _service.decryptProperty(encryptedCipher.Identity.LicenseNumber, key, true, false) - }; - cipher.icon = 'fa-id-card-o'; - break; - default: - break; - } - - if (!encryptedCipher.Attachments) { - return cipher; - } - - cipher.attachments = []; - for (i = 0; i < encryptedCipher.Attachments.length; i++) { - cipher.attachments.push(_service.decryptAttachment(key, encryptedCipher.Attachments[i])); - } - - return cipher; - }; - - _service.decryptCipherPreview = function (encryptedCipher) { - if (!encryptedCipher) throw "encryptedCipher is undefined or null"; - - var key = null; - if (encryptedCipher.OrganizationId) { - key = cryptoService.getOrgKey(encryptedCipher.OrganizationId); - } - - var cipher = { - id: encryptedCipher.Id, - organizationId: encryptedCipher.OrganizationId, - collectionIds: encryptedCipher.CollectionIds || [], - 'type': encryptedCipher.Type, - name: _service.decryptProperty(encryptedCipher.Name, key, false, true), - folderId: encryptedCipher.FolderId, - favorite: encryptedCipher.Favorite, - edit: encryptedCipher.Edit, - organizationUseTotp: encryptedCipher.OrganizationUseTotp, - hasAttachments: !!encryptedCipher.Attachments && encryptedCipher.Attachments.length > 0, - meta: {}, - icon: null - }; - - switch (cipher.type) { - case constants.cipherType.login: - cipher.subTitle = _service.decryptProperty(encryptedCipher.Login.Username, key, true, true); - cipher.meta.password = _service.decryptProperty(encryptedCipher.Login.Password, key, true, true); - cipher.meta.uri = null; - if (encryptedCipher.Login.Uris && encryptedCipher.Login.Uris.length) { - cipher.meta.uri = _service.decryptProperty(encryptedCipher.Login.Uris[0].Uri, key, true, true); - } - setLoginIcon(cipher, cipher.meta.uri, true); - break; - case constants.cipherType.secureNote: - cipher.subTitle = null; - cipher.icon = 'fa-sticky-note-o'; - break; - case constants.cipherType.card: - cipher.subTitle = ''; - cipher.meta.number = _service.decryptProperty(encryptedCipher.Card.Number, key, true, true); - var brand = _service.decryptProperty(encryptedCipher.Card.Brand, key, true, true); - if (brand) { - cipher.subTitle = brand; - } - if (cipher.meta.number && cipher.meta.number.length >= 4) { - if (cipher.subTitle !== '') { - cipher.subTitle += ', '; - } - cipher.subTitle += ('*' + cipher.meta.number.substr(cipher.meta.number.length - 4)); - } - cipher.icon = 'fa-credit-card'; - break; - case constants.cipherType.identity: - var firstName = _service.decryptProperty(encryptedCipher.Identity.FirstName, key, true, true); - var lastName = _service.decryptProperty(encryptedCipher.Identity.LastName, key, true, true); - cipher.subTitle = ''; - if (firstName) { - cipher.subTitle = firstName; - } - if (lastName) { - if (cipher.subTitle !== '') { - cipher.subTitle += ' '; - } - cipher.subTitle += lastName; - } - cipher.icon = 'fa-id-card-o'; - break; - default: - break; - } - - if (cipher.subTitle === '') { - cipher.subTitle = null; - } - - return cipher; - }; - - function setLoginIcon(cipher, uri, setImage) { - if (!_service.disableWebsiteIcons && uri) { - var hostnameUri = uri, - isWebsite = false; - - if (hostnameUri.indexOf('androidapp://') === 0) { - cipher.icon = 'fa-android'; - } - else if (hostnameUri.indexOf('iosapp://') === 0) { - cipher.icon = 'fa-apple'; - } - else if (hostnameUri.indexOf('://') === -1 && hostnameUri.indexOf('.') > -1) { - hostnameUri = "http://" + hostnameUri; - isWebsite = true; - } - else { - isWebsite = hostnameUri.indexOf('http') === 0 && hostnameUri.indexOf('.') > -1; - } - - if (setImage && isWebsite) { - try { - var url = new URL(hostnameUri); - cipher.meta.image = appSettings.iconsUri + '/' + url.hostname + '/icon.png'; - } - catch (e) { } - } - } - - if (!cipher.icon) { - cipher.icon = 'fa-globe'; - } - } - - _service.decryptAttachment = function (key, encryptedAttachment) { - if (!encryptedAttachment) throw "encryptedAttachment is undefined or null"; - - return { - id: encryptedAttachment.Id, - url: encryptedAttachment.Url, - fileName: cryptoService.decrypt(encryptedAttachment.FileName, key), - size: encryptedAttachment.SizeName - }; - }; - - _service.downloadAndDecryptAttachment = function (key, decryptedAttachment, openDownload) { - var deferred = $q.defer(); - var req = new XMLHttpRequest(); - req.open('GET', decryptedAttachment.url, true); - req.responseType = 'arraybuffer'; - req.onload = function (evt) { - if (!req.response) { - deferred.reject('No response'); - // error - return; - } - - cryptoService.decryptFromBytes(req.response, key).then(function (decBuf) { - if (openDownload) { - var blob = new Blob([decBuf]); - - // IE hack. ref http://msdn.microsoft.com/en-us/library/ie/hh779016.aspx - if ($window.navigator.msSaveOrOpenBlob) { - $window.navigator.msSaveBlob(blob, decryptedAttachment.fileName); - } - else { - var a = $window.document.createElement('a'); - a.href = $window.URL.createObjectURL(blob); - a.download = decryptedAttachment.fileName; - $window.document.body.appendChild(a); - a.click(); - $window.document.body.removeChild(a); - } - } - - deferred.resolve(new Uint8Array(decBuf)); - }); - }; - req.send(null); - return deferred.promise; - }; - - _service.decryptFields = function (key, encryptedFields) { - var unencryptedFields = []; - - if (encryptedFields) { - for (var i = 0; i < encryptedFields.length; i++) { - unencryptedFields.push(_service.decryptField(key, encryptedFields[i])); - } - } - - return unencryptedFields; - }; - - _service.decryptField = function (key, encryptedField) { - if (!encryptedField) throw "encryptedField is undefined or null"; - - return { - type: encryptedField.Type.toString(), - name: encryptedField.Name && encryptedField.Name !== '' ? cryptoService.decrypt(encryptedField.Name, key) : null, - value: encryptedField.Value && encryptedField.Value !== '' ? cryptoService.decrypt(encryptedField.Value, key) : null - }; - }; - - _service.decryptFolders = function (encryptedFolders) { - if (!encryptedFolders) throw "encryptedFolders is undefined or null"; - - var unencryptedFolders = []; - for (var i = 0; i < encryptedFolders.length; i++) { - unencryptedFolders.push(_service.decryptFolder(encryptedFolders[i])); - } - - return unencryptedFolders; - }; - - _service.decryptFolder = function (encryptedFolder) { - if (!encryptedFolder) throw "encryptedFolder is undefined or null"; - - return { - id: encryptedFolder.Id, - name: cryptoService.decrypt(encryptedFolder.Name) - }; - }; - - _service.decryptFolderPreview = function (encryptedFolder) { - if (!encryptedFolder) throw "encryptedFolder is undefined or null"; - - return { - id: encryptedFolder.Id, - name: _service.decryptProperty(encryptedFolder.Name, null, false, true) - }; - }; - - _service.decryptCollections = function (encryptedCollections, orgId, catchError) { - if (!encryptedCollections) throw "encryptedCollections is undefined or null"; - - var unencryptedCollections = []; - for (var i = 0; i < encryptedCollections.length; i++) { - unencryptedCollections.push(_service.decryptCollection(encryptedCollections[i], orgId, catchError)); - } - - return unencryptedCollections; - }; - - _service.decryptCollection = function (encryptedCollection, orgId, catchError) { - if (!encryptedCollection) throw "encryptedCollection is undefined or null"; - - catchError = catchError === true ? true : false; - orgId = orgId || encryptedCollection.OrganizationId; - var key = cryptoService.getOrgKey(orgId); - - return { - id: encryptedCollection.Id, - name: catchError ? _service.decryptProperty(encryptedCollection.Name, key, false, true) : - cryptoService.decrypt(encryptedCollection.Name, key) - }; - }; - - _service.decryptProperty = function (property, key, checkEmpty, showError) { - if (checkEmpty && (!property || property === '')) { - return null; - } - - try { - property = cryptoService.decrypt(property, key); - } - catch (err) { - property = null; - } - - return property || (showError ? '[error: cannot decrypt]' : null); - }; - - _service.encryptCiphers = function (unencryptedCiphers, key) { - if (!unencryptedCiphers) throw "unencryptedCiphers is undefined or null"; - - var encryptedCiphers = []; - for (var i = 0; i < unencryptedCiphers.length; i++) { - encryptedCiphers.push(_service.encryptCipher(unencryptedCiphers[i], null, key)); - } - - return encryptedCiphers; - }; - - _service.encryptCipher = function (unencryptedCipher, type, key, attachments) { - if (!unencryptedCipher) throw "unencryptedCipher is undefined or null"; - - if (unencryptedCipher.organizationId) { - key = key || cryptoService.getOrgKey(unencryptedCipher.organizationId); - } - - var cipher = { - id: unencryptedCipher.id, - 'type': type || unencryptedCipher.type, - organizationId: unencryptedCipher.organizationId || null, - folderId: unencryptedCipher.folderId === '' ? null : unencryptedCipher.folderId, - favorite: unencryptedCipher.favorite !== null ? unencryptedCipher.favorite : false, - name: cryptoService.encrypt(unencryptedCipher.name, key), - notes: encryptProperty(unencryptedCipher.notes, key), - fields: _service.encryptFields(unencryptedCipher.fields, key) - }; - - var i; - switch (cipher.type) { - case constants.cipherType.login: - var loginData = unencryptedCipher.login; - cipher.login = { - username: encryptProperty(loginData.username, key), - password: encryptProperty(loginData.password, key), - totp: encryptProperty(loginData.totp, key) - }; - if (loginData.uris && loginData.uris.length) { - cipher.login.uris = []; - for (i = 0; i < loginData.uris.length; i++) { - cipher.login.uris.push({ - uri: encryptProperty(loginData.uris[i].uri, key), - match: loginData.uris[i].match - }); - } - } - break; - case constants.cipherType.secureNote: - cipher.secureNote = { - type: unencryptedCipher.secureNote.type - }; - break; - case constants.cipherType.card: - var cardData = unencryptedCipher.card; - cipher.card = { - cardholderName: encryptProperty(cardData.cardholderName, key), - brand: encryptProperty(cardData.brand, key), - number: encryptProperty(cardData.number, key), - expMonth: encryptProperty(cardData.expMonth, key), - expYear: encryptProperty(cardData.expYear, key), - code: encryptProperty(cardData.code, key) - }; - break; - case constants.cipherType.identity: - var identityData = unencryptedCipher.identity; - cipher.identity = { - title: encryptProperty(identityData.title, key), - firstName: encryptProperty(identityData.firstName, key), - middleName: encryptProperty(identityData.middleName, key), - lastName: encryptProperty(identityData.lastName, key), - address1: encryptProperty(identityData.address1, key), - address2: encryptProperty(identityData.address2, key), - address3: encryptProperty(identityData.address3, key), - city: encryptProperty(identityData.city, key), - state: encryptProperty(identityData.state, key), - postalCode: encryptProperty(identityData.postalCode, key), - country: encryptProperty(identityData.country, key), - company: encryptProperty(identityData.company, key), - email: encryptProperty(identityData.email, key), - phone: encryptProperty(identityData.phone, key), - ssn: encryptProperty(identityData.ssn, key), - username: encryptProperty(identityData.username, key), - passportNumber: encryptProperty(identityData.passportNumber, key), - licenseNumber: encryptProperty(identityData.licenseNumber, key) - }; - break; - default: - break; - } - - if (unencryptedCipher.attachments && attachments) { - cipher.attachments = {}; - for (i = 0; i < unencryptedCipher.attachments.length; i++) { - cipher.attachments[unencryptedCipher.attachments[i].id] = - cryptoService.encrypt(unencryptedCipher.attachments[i].fileName, key); - } - } - - return cipher; - }; - - _service.encryptAttachmentFile = function (key, unencryptedFile) { - var deferred = $q.defer(); - - if (unencryptedFile.size > 104857600) { // 100 MB - deferred.reject('Maximum file size is 100 MB.'); - return; - } - - var reader = new FileReader(); - reader.readAsArrayBuffer(unencryptedFile); - reader.onload = function (evt) { - cryptoService.encryptToBytes(evt.target.result, key).then(function (encData) { - deferred.resolve({ - fileName: cryptoService.encrypt(unencryptedFile.name, key), - data: new Uint8Array(encData), - size: unencryptedFile.size - }); - }); - }; - reader.onerror = function (evt) { - deferred.reject('Error reading file.'); - }; - - return deferred.promise; - }; - - _service.encryptFields = function (unencryptedFields, key) { - if (!unencryptedFields || !unencryptedFields.length) { - return null; - } - - var encFields = []; - for (var i = 0; i < unencryptedFields.length; i++) { - if (!unencryptedFields[i]) { - continue; - } - - encFields.push(_service.encryptField(unencryptedFields[i], key)); - } - - return encFields; - }; - - _service.encryptField = function (unencryptedField, key) { - if (!unencryptedField) throw "unencryptedField is undefined or null"; - - return { - type: parseInt(unencryptedField.type), - name: unencryptedField.name ? cryptoService.encrypt(unencryptedField.name, key) : null, - value: unencryptedField.value ? cryptoService.encrypt(unencryptedField.value.toString(), key) : null - }; - }; - - _service.encryptFolders = function (unencryptedFolders, key) { - if (!unencryptedFolders) throw "unencryptedFolders is undefined or null"; - - var encryptedFolders = []; - for (var i = 0; i < unencryptedFolders.length; i++) { - encryptedFolders.push(_service.encryptFolder(unencryptedFolders[i], key)); - } - - return encryptedFolders; - }; - - _service.encryptFolder = function (unencryptedFolder, key) { - if (!unencryptedFolder) throw "unencryptedFolder is undefined or null"; - - return { - id: unencryptedFolder.id, - name: cryptoService.encrypt(unencryptedFolder.name, key) - }; - }; - - _service.encryptCollections = function (unencryptedCollections, orgId) { - if (!unencryptedCollections) throw "unencryptedCollections is undefined or null"; - - var encryptedCollections = []; - for (var i = 0; i < unencryptedCollections.length; i++) { - encryptedCollections.push(_service.encryptCollection(unencryptedCollections[i], orgId)); - } - - return encryptedCollections; - }; - - _service.encryptCollection = function (unencryptedCollection, orgId) { - if (!unencryptedCollection) throw "unencryptedCollection is undefined or null"; - - return { - id: unencryptedCollection.id, - name: cryptoService.encrypt(unencryptedCollection.name, cryptoService.getOrgKey(orgId)) - }; - }; - - function encryptProperty(property, key) { - return !property || property === '' ? null : cryptoService.encrypt(property, key); - } - - return _service; - }); diff --git a/src/app/services/cryptoService.js b/src/app/services/cryptoService.js deleted file mode 100644 index 852394d8..00000000 --- a/src/app/services/cryptoService.js +++ /dev/null @@ -1,954 +0,0 @@ -angular - .module('bit.services') - - .factory('cryptoService', function ($sessionStorage, constants, $q, $window) { - var _service = {}, - _key, - _encKey, - _legacyEtmKey, - _orgKeys, - _privateKey, - _publicKey, - _crypto = typeof $window.crypto != 'undefined' ? $window.crypto : null, - _subtle = (!!_crypto && typeof $window.crypto.subtle != 'undefined') ? $window.crypto.subtle : null; - - _service.setKey = function (key) { - _key = key; - $sessionStorage.key = _key.keyB64; - }; - - _service.setEncKey = function (encKey, key, alreadyDecrypted) { - if (alreadyDecrypted) { - _encKey = encKey; - $sessionStorage.encKey = _encKey.keyB64; - return; - } - - try { - var encKeyBytes = _service.decrypt(encKey, key, 'raw'); - $sessionStorage.encKey = forge.util.encode64(encKeyBytes); - _encKey = new SymmetricCryptoKey(encKeyBytes); - } - catch (e) { - console.log('Cannot set enc key. Decryption failed.'); - } - }; - - _service.setPrivateKey = function (privateKeyCt, key) { - try { - var privateKeyBytes = _service.decrypt(privateKeyCt, key, 'raw'); - $sessionStorage.privateKey = forge.util.encode64(privateKeyBytes); - _privateKey = forge.pki.privateKeyFromAsn1(forge.asn1.fromDer(privateKeyBytes)); - } - catch (e) { - console.log('Cannot set private key. Decryption failed.'); - } - }; - - _service.setOrgKeys = function (orgKeysCt, privateKey) { - if (!orgKeysCt || Object.keys(orgKeysCt).length === 0) { - return; - } - - _service.clearOrgKeys(); - var orgKeysb64 = {}, - _orgKeys = {}, - setKey = false; - - for (var orgId in orgKeysCt) { - if (orgKeysCt.hasOwnProperty(orgId)) { - try { - var decBytes = _service.rsaDecrypt(orgKeysCt[orgId].key, privateKey); - var decKey = new SymmetricCryptoKey(decBytes); - _orgKeys[orgId] = decKey; - orgKeysb64[orgId] = decKey.keyB64; - setKey = true; - } - catch (e) { - console.log('Cannot set org key for ' + orgId + '. Decryption failed.'); - } - } - } - - if (setKey) { - $sessionStorage.orgKeys = orgKeysb64; - } - else { - _orgKeys = null; - } - }; - - _service.addOrgKey = function (orgId, encOrgKey, privateKey) { - _orgKeys = _service.getOrgKeys(); - if (!_orgKeys) { - _orgKeys = {}; - } - - var orgKeysb64 = $sessionStorage.orgKeys; - if (!orgKeysb64) { - orgKeysb64 = {}; - } - - try { - var decBytes = _service.rsaDecrypt(encOrgKey, privateKey); - var decKey = new SymmetricCryptoKey(decBytes); - _orgKeys[orgId] = decKey; - orgKeysb64[orgId] = decKey.keyB64; - } - catch (e) { - _orgKeys = null; - console.log('Cannot set org key. Decryption failed.'); - } - - $sessionStorage.orgKeys = orgKeysb64; - }; - - _service.getKey = function () { - if (!_key && $sessionStorage.key) { - _key = new SymmetricCryptoKey($sessionStorage.key, true); - } - - if (!_key) { - throw 'key unavailable'; - } - - return _key; - }; - - _service.getEncKey = function () { - if (!_encKey && $sessionStorage.encKey) { - _encKey = new SymmetricCryptoKey($sessionStorage.encKey, true); - } - - return _encKey; - }; - - _service.getPrivateKey = function (outputEncoding) { - outputEncoding = outputEncoding || 'native'; - - if (_privateKey) { - if (outputEncoding === 'raw') { - var privateKeyAsn1 = forge.pki.privateKeyToAsn1(_privateKey); - var privateKeyPkcs8 = forge.pki.wrapRsaPrivateKey(privateKeyAsn1); - return forge.asn1.toDer(privateKeyPkcs8).getBytes(); - } - - return _privateKey; - } - - if ($sessionStorage.privateKey) { - var privateKeyBytes = forge.util.decode64($sessionStorage.privateKey); - _privateKey = forge.pki.privateKeyFromAsn1(forge.asn1.fromDer(privateKeyBytes)); - - if (outputEncoding === 'raw') { - return privateKeyBytes; - } - } - - return _privateKey; - }; - - _service.getPublicKey = function () { - if (_publicKey) { - return _publicKey; - } - - var privateKey = _service.getPrivateKey(); - if (!privateKey) { - return null; - } - - _publicKey = forge.pki.setRsaPublicKey(privateKey.n, privateKey.e); - return _publicKey; - }; - - _service.getOrgKeys = function () { - if (_orgKeys) { - return _orgKeys; - } - - if ($sessionStorage.orgKeys) { - var orgKeys = {}, - setKey = false; - - for (var orgId in $sessionStorage.orgKeys) { - if ($sessionStorage.orgKeys.hasOwnProperty(orgId)) { - orgKeys[orgId] = new SymmetricCryptoKey($sessionStorage.orgKeys[orgId], true); - setKey = true; - } - } - - if (setKey) { - _orgKeys = orgKeys; - } - } - - return _orgKeys; - }; - - _service.getOrgKey = function (orgId) { - var orgKeys = _service.getOrgKeys(); - if (!orgKeys || !(orgId in orgKeys)) { - return null; - } - - return orgKeys[orgId]; - }; - - _service.clearKey = function () { - _key = null; - _legacyEtmKey = null; - delete $sessionStorage.key; - }; - - _service.clearEncKey = function () { - _encKey = null; - delete $sessionStorage.encKey; - }; - - _service.clearKeyPair = function () { - _privateKey = null; - _publicKey = null; - delete $sessionStorage.privateKey; - }; - - _service.clearOrgKeys = function () { - _orgKeys = null; - delete $sessionStorage.orgKeys; - }; - - _service.clearOrgKey = function (orgId) { - if (_orgKeys.hasOwnProperty(orgId)) { - delete _orgKeys[orgId]; - } - - if ($sessionStorage.orgKeys.hasOwnProperty(orgId)) { - delete $sessionStorage.orgKeys[orgId]; - } - }; - - _service.clearKeys = function () { - _service.clearKey(); - _service.clearEncKey(); - _service.clearKeyPair(); - _service.clearOrgKeys(); - }; - - _service.makeKey = function (password, salt) { - if (_subtle != null && !$window.cryptoShimmed && $window.navigator.userAgent.indexOf('Edge') === -1) { - return pbkdf2WC(password, salt, 5000, 256).then(function (keyBuf) { - return new SymmetricCryptoKey(bufToB64(keyBuf), true); - }); - } - else { - var deferred = $q.defer(); - var keyBytes = forge.pbkdf2(forge.util.encodeUtf8(password), forge.util.encodeUtf8(salt), - 5000, 256 / 8, 'sha256'); - deferred.resolve(new SymmetricCryptoKey(keyBytes)); - return deferred.promise; - } - }; - - _service.makeEncKey = function (key) { - var encKey = forge.random.getBytesSync(512 / 8); - var encKeyEnc = _service.encrypt(encKey, key, 'raw'); - return { - encKey: new SymmetricCryptoKey(encKey), - encKeyEnc: encKeyEnc - }; - }; - - _service.makeKeyPair = function (key) { - var deferred = $q.defer(); - - forge.pki.rsa.generateKeyPair({ - bits: 2048, - workers: 2, - workerScript: '/lib/forge/prime.worker.min.js' - }, function (error, keypair) { - if (error) { - deferred.reject(error); - return; - } - - var privateKeyAsn1 = forge.pki.privateKeyToAsn1(keypair.privateKey); - var privateKeyPkcs8 = forge.pki.wrapRsaPrivateKey(privateKeyAsn1); - var privateKeyBytes = forge.asn1.toDer(privateKeyPkcs8).getBytes(); - var privateKeyEncCt = _service.encrypt(privateKeyBytes, key, 'raw'); - - var publicKeyAsn1 = forge.pki.publicKeyToAsn1(keypair.publicKey); - var publicKeyBytes = forge.asn1.toDer(publicKeyAsn1).getBytes(); - - deferred.resolve({ - publicKey: forge.util.encode64(publicKeyBytes), - privateKeyEnc: privateKeyEncCt - }); - }); - - return deferred.promise; - }; - - _service.makeShareKey = function () { - var key = forge.random.getBytesSync(512 / 8); - return { - key: new SymmetricCryptoKey(key), - ct: _service.rsaEncryptMe(key) - }; - }; - - _service.hashPassword = function (password, key) { - if (!key) { - key = _service.getKey(); - } - - if (!password || !key) { - throw 'Invalid parameters.'; - } - - if (_subtle != null && !$window.cryptoShimmed && $window.navigator.userAgent.indexOf('Edge') === -1) { - var keyBuf = key.getBuffers(); - return pbkdf2WC(new Uint8Array(keyBuf.key), password, 1, 256).then(function (hashBuf) { - return bufToB64(hashBuf); - }); - } - else { - var deferred = $q.defer(); - var hashBits = forge.pbkdf2(key.key, forge.util.encodeUtf8(password), 1, 256 / 8, 'sha256'); - deferred.resolve(forge.util.encode64(hashBits)); - return deferred.promise; - } - }; - - function pbkdf2WC(password, salt, iterations, size) { - password = typeof (password) === 'string' ? utf8ToArray(password) : password; - salt = typeof (salt) === 'string' ? utf8ToArray(salt) : salt; - - return _subtle.importKey('raw', password.buffer, { name: 'PBKDF2' }, false, ['deriveKey', 'deriveBits']) - .then(function (importedKey) { - return _subtle.deriveKey( - { name: 'PBKDF2', salt: salt.buffer, iterations: iterations, hash: { name: 'SHA-256' } }, - importedKey, { name: 'AES-CBC', length: size }, true, ['encrypt', 'decrypt']); - }).then(function (derivedKey) { - return _subtle.exportKey('raw', derivedKey); - }); - } - - _service.makeKeyAndHash = function (email, password) { - email = email.toLowerCase(); - var key; - return _service.makeKey(password, email).then(function (theKey) { - key = theKey; - return _service.hashPassword(password, theKey); - }).then(function (theHash) { - return { - key: key, - hash: theHash - }; - }); - }; - - _service.encrypt = function (plainValue, key, plainValueEncoding) { - var encValue = aesEncrypt(plainValue, key, plainValueEncoding); - - var iv = forge.util.encode64(encValue.iv); - var ct = forge.util.encode64(encValue.ct); - var cipherString = iv + '|' + ct; - - if (encValue.mac) { - var mac = forge.util.encode64(encValue.mac); - cipherString = cipherString + '|' + mac; - } - - return encValue.key.encType + '.' + cipherString; - }; - - _service.encryptToBytes = function (plainValue, key) { - return aesEncryptWC(plainValue, key).then(function (encValue) { - var macLen = 0; - if (encValue.mac) { - macLen = encValue.mac.length; - } - - var encBytes = new Uint8Array(1 + encValue.iv.length + macLen + encValue.ct.length); - - encBytes.set([encValue.key.encType]); - encBytes.set(encValue.iv, 1); - if (encValue.mac) { - encBytes.set(encValue.mac, 1 + encValue.iv.length); - } - encBytes.set(encValue.ct, 1 + encValue.iv.length + macLen); - - return encBytes.buffer; - }); - }; - - function aesEncrypt(plainValue, key, plainValueEncoding) { - key = key || _service.getEncKey() || _service.getKey(); - - if (!key) { - throw 'Encryption key unavailable.'; - } - - plainValueEncoding = plainValueEncoding || 'utf8'; - var buffer = forge.util.createBuffer(plainValue, plainValueEncoding); - var ivBytes = forge.random.getBytesSync(16); - var cipher = forge.cipher.createCipher('AES-CBC', key.encKey); - cipher.start({ iv: ivBytes }); - cipher.update(buffer); - cipher.finish(); - - var ctBytes = cipher.output.getBytes(); - - var macBytes = null; - if (key.macKey) { - macBytes = computeMac(ivBytes + ctBytes, key.macKey, false); - } - - return { - iv: ivBytes, - ct: ctBytes, - mac: macBytes, - key: key, - plainValueEncoding: plainValueEncoding - }; - } - - function aesEncryptWC(plainValue, key) { - key = key || _service.getEncKey() || _service.getKey(); - - if (!key) { - throw 'Encryption key unavailable.'; - } - - var obj = { - iv: new Uint8Array(16), - ct: null, - mac: null, - key: key - }; - - var keyBuf = key.getBuffers(); - _crypto.getRandomValues(obj.iv); - - return _subtle.importKey('raw', keyBuf.encKey, { name: 'AES-CBC' }, false, ['encrypt']) - .then(function (encKey) { - return _subtle.encrypt({ name: 'AES-CBC', iv: obj.iv }, encKey, plainValue); - }).then(function (encValue) { - obj.ct = new Uint8Array(encValue); - if (!keyBuf.macKey) { - return null; - } - - var data = new Uint8Array(obj.iv.length + obj.ct.length); - data.set(obj.iv, 0); - data.set(obj.ct, obj.iv.length); - return computeMacWC(data.buffer, keyBuf.macKey); - }).then(function (mac) { - if (mac) { - obj.mac = new Uint8Array(mac); - } - return obj; - }); - } - - _service.rsaEncrypt = function (plainValue, publicKey, key) { - publicKey = publicKey || _service.getPublicKey(); - if (!publicKey) { - throw 'Public key unavailable.'; - } - - if (typeof publicKey === 'string') { - var publicKeyBytes = forge.util.decode64(publicKey); - publicKey = forge.pki.publicKeyFromAsn1(forge.asn1.fromDer(publicKeyBytes)); - } - - var encryptedBytes = publicKey.encrypt(plainValue, 'RSA-OAEP', { - md: forge.md.sha1.create() - }); - var cipherString = forge.util.encode64(encryptedBytes); - - if (key && key.macKey) { - var mac = computeMac(encryptedBytes, key.macKey, true); - return constants.encType.Rsa2048_OaepSha1_HmacSha256_B64 + '.' + cipherString + '|' + mac; - } - else { - return constants.encType.Rsa2048_OaepSha1_B64 + '.' + cipherString; - } - }; - - _service.rsaEncryptMe = function (plainValue) { - return _service.rsaEncrypt(plainValue, _service.getPublicKey(), _service.getEncKey()); - }; - - _service.decrypt = function (encValue, key, outputEncoding) { - try { - key = key || _service.getEncKey() || _service.getKey(); - - var headerPieces = encValue.split('.'), - encType, - encPieces; - - if (headerPieces.length === 2) { - try { - encType = parseInt(headerPieces[0]); - encPieces = headerPieces[1].split('|'); - } - catch (e) { - console.error('Cannot parse headerPieces.'); - return null; - } - } - else { - encPieces = encValue.split('|'); - encType = encPieces.length === 3 ? constants.encType.AesCbc128_HmacSha256_B64 : - constants.encType.AesCbc256_B64; - } - - if (encType === constants.encType.AesCbc128_HmacSha256_B64 && key.encType === constants.encType.AesCbc256_B64) { - // Old encrypt-then-mac scheme, swap out the key - _legacyEtmKey = _legacyEtmKey || - new SymmetricCryptoKey(key.key, false, constants.encType.AesCbc128_HmacSha256_B64); - key = _legacyEtmKey; - } - - if (encType !== key.encType) { - throw 'encType unavailable.'; - } - - switch (encType) { - case constants.encType.AesCbc128_HmacSha256_B64: - case constants.encType.AesCbc256_HmacSha256_B64: - if (encPieces.length !== 3) { - console.error('Enc type (' + encType + ') not valid.'); - return null; - } - break; - case constants.encType.AesCbc256_B64: - if (encPieces.length !== 2) { - console.error('Enc type (' + encType + ') not valid.'); - return null; - } - break; - default: - console.error('Enc type (' + encType + ') not supported.'); - return null; - } - - var ivBytes = forge.util.decode64(encPieces[0]); - var ctBytes = forge.util.decode64(encPieces[1]); - - if (key.macKey && encPieces.length > 2) { - var macBytes = forge.util.decode64(encPieces[2]); - var computedMacBytes = computeMac(ivBytes + ctBytes, key.macKey, false); - if (!macsEqual(macBytes, computedMacBytes)) { - console.error('MAC failed.'); - return null; - } - } - - var ctBuffer = forge.util.createBuffer(ctBytes); - var decipher = forge.cipher.createDecipher('AES-CBC', key.encKey); - decipher.start({ iv: ivBytes }); - decipher.update(ctBuffer); - decipher.finish(); - - outputEncoding = outputEncoding || 'utf8'; - if (outputEncoding === 'utf8') { - return decipher.output.toString('utf8'); - } - else { - return decipher.output.getBytes(); - } - } - catch (e) { - console.error('Caught unhandled error in decrypt: ' + e); - throw e; - } - }; - - _service.decryptFromBytes = function (encBuf, key) { - try { - if (!encBuf) { - throw 'no encBuf.'; - } - - var encBytes = new Uint8Array(encBuf), - encType = encBytes[0], - ctBytes = null, - ivBytes = null, - macBytes = null; - - switch (encType) { - case constants.encType.AesCbc128_HmacSha256_B64: - case constants.encType.AesCbc256_HmacSha256_B64: - if (encBytes.length <= 49) { // 1 + 16 + 32 + ctLength - console.error('Enc type (' + encType + ') not valid.'); - return null; - } - - ivBytes = slice(encBytes, 1, 17); - macBytes = slice(encBytes, 17, 49); - ctBytes = slice(encBytes, 49); - break; - case constants.encType.AesCbc256_B64: - if (encBytes.length <= 17) { // 1 + 16 + ctLength - console.error('Enc type (' + encType + ') not valid.'); - return null; - } - - ivBytes = slice(encBytes, 1, 17); - ctBytes = slice(encBytes, 17); - break; - default: - console.error('Enc type (' + encType + ') not supported.'); - return null; - } - - return aesDecryptWC( - encType, - ctBytes.buffer, - ivBytes.buffer, - macBytes ? macBytes.buffer : null, - key); - } - catch (e) { - console.error('Caught unhandled error in decryptFromBytes: ' + e); - throw e; - } - }; - - function aesDecryptWC(encType, ctBuf, ivBuf, macBuf, key) { - key = key || _service.getEncKey() || _service.getKey(); - if (!key) { - throw 'Encryption key unavailable.'; - } - - if (key.macKey && !macBuf) { - throw 'macBuf required for this type of key.'; - } - - if (encType !== key.encType) { - throw 'encType unavailable.'; - } - - var keyBuf = key.getBuffers(), - encKey = null; - - return _subtle.importKey('raw', keyBuf.encKey, { name: 'AES-CBC' }, false, ['decrypt']) - .then(function (theEncKey) { - encKey = theEncKey; - - if (!key.macKey || !macBuf) { - return null; - } - - var data = new Uint8Array(ivBuf.byteLength + ctBuf.byteLength); - data.set(new Uint8Array(ivBuf), 0); - data.set(new Uint8Array(ctBuf), ivBuf.byteLength); - return computeMacWC(data.buffer, keyBuf.macKey); - }).then(function (computedMacBuf) { - if (computedMacBuf === null) { - return null; - } - return macsEqualWC(macBuf, computedMacBuf); - }).then(function (macsMatch) { - if (macsMatch === false) { - console.error('MAC failed.'); - return null; - } - return _subtle.decrypt({ name: 'AES-CBC', iv: ivBuf }, encKey, ctBuf); - }); - } - - _service.rsaDecrypt = function (encValue, privateKey, key) { - privateKey = privateKey || _service.getPrivateKey(); - key = key || _service.getEncKey(); - - if (!privateKey) { - throw 'Private key unavailable.'; - } - - var headerPieces = encValue.split('.'), - encType, - encPieces; - - if (headerPieces.length === 1) { - encType = constants.encType.Rsa2048_OaepSha256_B64; - encPieces = [headerPieces[0]]; - } - else if (headerPieces.length === 2) { - try { - encType = parseInt(headerPieces[0]); - encPieces = headerPieces[1].split('|'); - } - catch (e) { - return null; - } - } - - switch (encType) { - case constants.encType.Rsa2048_OaepSha256_B64: - case constants.encType.Rsa2048_OaepSha1_B64: - if (encPieces.length !== 1) { - return null; - } - break; - case constants.encType.Rsa2048_OaepSha256_HmacSha256_B64: - case constants.encType.Rsa2048_OaepSha1_HmacSha256_B64: - if (encPieces.length !== 2) { - return null; - } - break; - default: - return null; - } - - var ctBytes = forge.util.decode64(encPieces[0]); - - if (key && key.macKey && encPieces.length > 1) { - var macBytes = forge.util.decode64(encPieces[1]); - var computedMacBytes = computeMac(ctBytes, key.macKey, false); - if (!macsEqual(macBytes, computedMacBytes)) { - console.error('MAC failed.'); - return null; - } - } - - var md; - if (encType === constants.encType.Rsa2048_OaepSha256_B64 || - encType === constants.encType.Rsa2048_OaepSha256_HmacSha256_B64) { - md = forge.md.sha256.create(); - } - else if (encType === constants.encType.Rsa2048_OaepSha1_B64 || - encType === constants.encType.Rsa2048_OaepSha1_HmacSha256_B64) { - md = forge.md.sha1.create(); - } - else { - throw 'encType unavailable.'; - } - - var decBytes = privateKey.decrypt(ctBytes, 'RSA-OAEP', { - md: md - }); - - return decBytes; - }; - - function computeMac(dataBytes, macKey, b64Output) { - var hmac = forge.hmac.create(); - hmac.start('sha256', macKey); - hmac.update(dataBytes); - var mac = hmac.digest(); - return b64Output ? forge.util.encode64(mac.getBytes()) : mac.getBytes(); - } - - function computeMacWC(dataBuf, macKeyBuf) { - return _subtle.importKey('raw', macKeyBuf, { name: 'HMAC', hash: { name: 'SHA-256' } }, false, ['sign']) - .then(function (key) { - return _subtle.sign({ name: 'HMAC', hash: { name: 'SHA-256' } }, key, dataBuf); - }); - } - - // Safely compare two MACs in a way that protects against timing attacks (Double HMAC Verification). - // ref: https://www.nccgroup.trust/us/about-us/newsroom-and-events/blog/2011/february/double-hmac-verification/ - // ref: https://paragonie.com/blog/2015/11/preventing-timing-attacks-on-string-comparison-with-double-hmac-strategy - function macsEqual(mac1, mac2) { - var hmac = forge.hmac.create(); - - hmac.start('sha256', getRandomBytes(32)); - hmac.update(mac1); - mac1 = hmac.digest().getBytes(); - - hmac.start(null, null); - hmac.update(mac2); - mac2 = hmac.digest().getBytes(); - - return mac1 === mac2; - } - - function macsEqualWC(mac1Buf, mac2Buf) { - var mac1, - macKey; - - var compareKey = new Uint8Array(32); - _crypto.getRandomValues(compareKey); - - return window.crypto.subtle.importKey('raw', compareKey.buffer, { name: 'HMAC', hash: { name: 'SHA-256' } }, false, ['sign']) - .then(function (key) { - macKey = key; - return window.crypto.subtle.sign({ name: 'HMAC', hash: { name: 'SHA-256' } }, macKey, mac1Buf); - }).then(function (mac) { - mac1 = mac; - return window.crypto.subtle.sign({ name: 'HMAC', hash: { name: 'SHA-256' } }, macKey, mac2Buf); - }).then(function (mac2) { - if (mac1.byteLength !== mac2.byteLength) { - return false; - } - - var arr1 = new Uint8Array(mac1); - var arr2 = new Uint8Array(mac2); - - for (var i = 0; i < arr2.length; i++) { - if (arr1[i] !== arr2[i]) { - return false; - } - } - - return true; - }); - } - - function SymmetricCryptoKey(keyBytes, b64KeyBytes, encType) { - if (b64KeyBytes) { - keyBytes = forge.util.decode64(keyBytes); - } - - if (!keyBytes) { - throw 'Must provide keyBytes'; - } - - var buffer = forge.util.createBuffer(keyBytes); - if (!buffer || buffer.length() === 0) { - throw 'Couldn\'t make buffer'; - } - var bufferLength = buffer.length(); - - if (encType === null || encType === undefined) { - if (bufferLength === 32) { - encType = constants.encType.AesCbc256_B64; - } - else if (bufferLength === 64) { - encType = constants.encType.AesCbc256_HmacSha256_B64; - } - else { - throw 'Unable to determine encType.'; - } - } - - this.key = keyBytes; - this.keyB64 = forge.util.encode64(keyBytes); - this.encType = encType; - - if (encType === constants.encType.AesCbc256_B64 && bufferLength === 32) { - this.encKey = keyBytes; - this.macKey = null; - } - else if (encType === constants.encType.AesCbc128_HmacSha256_B64 && bufferLength === 32) { - this.encKey = buffer.getBytes(16); // first half - this.macKey = buffer.getBytes(16); // second half - } - else if (encType === constants.encType.AesCbc256_HmacSha256_B64 && bufferLength === 64) { - this.encKey = buffer.getBytes(32); // first half - this.macKey = buffer.getBytes(32); // second half - } - else { - throw 'Unsupported encType/key length.'; - } - } - - SymmetricCryptoKey.prototype.getBuffers = function () { - if (this.keyBuf) { - return this.keyBuf; - } - - var key = b64ToArray(this.keyB64); - - var keys = { - key: key.buffer - }; - - if (this.macKey) { - keys.encKey = slice(key, 0, key.length / 2).buffer; - keys.macKey = slice(key, key.length / 2).buffer; - } - else { - keys.encKey = key.buffer; - keys.macKey = null; - } - - this.keyBuf = keys; - return this.keyBuf; - }; - - function b64ToArray(b64Str) { - var binaryString = $window.atob(b64Str); - var arr = new Uint8Array(binaryString.length); - for (var i = 0; i < binaryString.length; i++) { - arr[i] = binaryString.charCodeAt(i); - } - return arr; - } - - function bufToB64(buf) { - var binary = ''; - var bytes = new Uint8Array(buf); - for (var i = 0; i < bytes.byteLength; i++) { - binary += String.fromCharCode(bytes[i]); - } - return $window.btoa(binary); - } - - function utf8ToArray(str) { - var utf8Str = unescape(encodeURIComponent(str)); - var arr = new Uint8Array(utf8Str.length); - for (var i = 0; i < utf8Str.length; i++) { - arr[i] = utf8Str.charCodeAt(i); - } - return arr; - } - - function slice(arr, begin, end) { - if (arr.slice) { - return arr.slice(begin, end); - } - - // shim for IE - // ref: https://stackoverflow.com/a/21440217 - - arr = arr.buffer; - if (begin === void 0) { - begin = 0; - } - - if (end === void 0) { - end = arr.byteLength; - } - - begin = Math.floor(begin); - end = Math.floor(end); - - if (begin < 0) { - begin += arr.byteLength; - } - - if (end < 0) { - end += arr.byteLength; - } - - begin = Math.min(Math.max(0, begin), arr.byteLength); - end = Math.min(Math.max(0, end), arr.byteLength); - - if (end - begin <= 0) { - return new ArrayBuffer(0); - } - - var result = new ArrayBuffer(end - begin); - var resultBytes = new Uint8Array(result); - var sourceBytes = new Uint8Array(arr, begin, end - begin); - - resultBytes.set(sourceBytes); - return new Uint8Array(result); - } - - function getRandomBytes(byteLength) { - var bytes = new Uint32Array(byteLength / 4); - _crypto.getRandomValues(bytes); - var buffer = forge.util.createBuffer(); - for (var i = 0; i < bytes.length; i++) { - buffer.putInt32(bytes[i]); - } - return buffer.getBytes(); - } - - return _service; - }); \ No newline at end of file diff --git a/src/app/services/eventService.js b/src/app/services/eventService.js deleted file mode 100644 index ce804680..00000000 --- a/src/app/services/eventService.js +++ /dev/null @@ -1,269 +0,0 @@ -angular - .module('bit.services') - - .factory('eventService', function (constants, $filter) { - var _service = {}; - - _service.getDefaultDateFilters = function () { - var d = new Date(); - var filterEnd = new Date(d.getFullYear(), d.getMonth(), d.getDate(), 23, 59); - d.setDate(d.getDate() - 30); - var filterStart = new Date(d.getFullYear(), d.getMonth(), d.getDate(), 0, 0); - - return { - start: filterStart, - end: filterEnd - }; - }; - - _service.formatDateFilters = function (filterStart, filterEnd) { - var result = { - start: null, - end: null, - error: null - }; - - try { - var format = 'yyyy-MM-ddTHH:mm'; - result.start = $filter('date')(filterStart, format + 'Z', 'UTC'); - result.end = $filter('date')(filterEnd, format + ':59.999Z', 'UTC'); - } catch (e) { } - - if (!result.start || !result.end || result.end < result.start) { - result.error = 'Invalid date range.'; - } - - return result; - }; - - _service.getEventInfo = function (ev, options) { - options = options || { - cipherInfo: true - }; - - var appInfo = getAppInfo(ev); - - return { - message: getEventMessage(ev, options), - appIcon: appInfo.icon, - appName: appInfo.name - }; - }; - - function getEventMessage(ev, options) { - var msg = ''; - switch (ev.Type) { - // User - case constants.eventType.User_LoggedIn: - msg = 'Logged in.'; - break; - case constants.eventType.User_ChangedPassword: - msg = 'Changed account password.'; - break; - case constants.eventType.User_Enabled2fa: - msg = 'Enabled two-step login.'; - break; - case constants.eventType.User_Disabled2fa: - msg = 'Disabled two-step login.'; - break; - case constants.eventType.User_Recovered2fa: - msg = 'Recovered account from two-step login.'; - break; - case constants.eventType.User_FailedLogIn: - msg = 'Login attempt failed with incorrect password.'; - break; - case constants.eventType.User_FailedLogIn2fa: - msg = 'Login attempt failed with incorrect two-step login.'; - break; - // Cipher - case constants.eventType.Cipher_Created: - msg = options.cipherInfo ? 'Created item ' + formatCipherId(ev) + '.' : 'Created.'; - break; - case constants.eventType.Cipher_Updated: - msg = options.cipherInfo ? 'Edited item ' + formatCipherId(ev) + '.' : 'Edited.'; - break; - case constants.eventType.Cipher_Deleted: - msg = options.cipherInfo ? 'Deleted item ' + formatCipherId(ev) + '.' : 'Deleted'; - break; - case constants.eventType.Cipher_AttachmentCreated: - msg = options.cipherInfo ? 'Created attachment for item ' + formatCipherId(ev) + '.' : - 'Created attachment.'; - break; - case constants.eventType.Cipher_AttachmentDeleted: - msg = options.cipherInfo ? 'Deleted attachment for item ' + formatCipherId(ev) + '.' : - 'Deleted attachment.'; - break; - case constants.eventType.Cipher_Shared: - msg = options.cipherInfo ? 'Shared item ' + formatCipherId(ev) + '.' : 'Shared.'; - break; - case constants.eventType.Cipher_UpdatedCollections: - msg = options.cipherInfo ? 'Update collections for item ' + formatCipherId(ev) + '.' : - 'Updated collections.'; - break; - // Collection - case constants.eventType.Collection_Created: - msg = 'Created collection ' + formatCollectionId(ev) + '.'; - break; - case constants.eventType.Collection_Updated: - msg = 'Edited collection ' + formatCollectionId(ev) + '.'; - break; - case constants.eventType.Collection_Deleted: - msg = 'Deleted collection ' + formatCollectionId(ev) + '.'; - break; - // Group - case constants.eventType.Group_Created: - msg = 'Created group ' + formatGroupId(ev) + '.'; - break; - case constants.eventType.Group_Updated: - msg = 'Edited group ' + formatGroupId(ev) + '.'; - break; - case constants.eventType.Group_Deleted: - msg = 'Deleted group ' + formatGroupId(ev) + '.'; - break; - // Org user - case constants.eventType.OrganizationUser_Invited: - msg = 'Invited user ' + formatOrgUserId(ev) + '.'; - break; - case constants.eventType.OrganizationUser_Confirmed: - msg = 'Confirmed user ' + formatOrgUserId(ev) + '.'; - break; - case constants.eventType.OrganizationUser_Updated: - msg = 'Edited user ' + formatOrgUserId(ev) + '.'; - break; - case constants.eventType.OrganizationUser_Removed: - msg = 'Removed user ' + formatOrgUserId(ev) + '.'; - break; - case constants.eventType.OrganizationUser_UpdatedGroups: - msg = 'Edited groups for user ' + formatOrgUserId(ev) + '.'; - break; - // Org - case constants.eventType.Organization_Updated: - msg = 'Edited organization settings.'; - break; - default: - break; - } - - return msg === '' ? null : msg; - } - - function getAppInfo(ev) { - var appInfo = { - icon: 'fa-globe', - name: 'Unknown' - }; - - switch (ev.DeviceType) { - case constants.deviceType.android: - appInfo.icon = 'fa-android'; - appInfo.name = 'Mobile App - Android'; - break; - case constants.deviceType.ios: - appInfo.icon = 'fa-apple'; - appInfo.name = 'Mobile App - iOS'; - break; - case constants.deviceType.uwp: - appInfo.icon = 'fa-windows'; - appInfo.name = 'Mobile App - Windows'; - break; - case constants.deviceType.chromeExt: - appInfo.icon = 'fa-chrome'; - appInfo.name = 'Extension - Chrome'; - break; - case constants.deviceType.firefoxExt: - appInfo.icon = 'fa-firefox'; - appInfo.name = 'Extension - Firefox'; - break; - case constants.deviceType.operaExt: - appInfo.icon = 'fa-opera'; - appInfo.name = 'Extension - Opera'; - break; - case constants.deviceType.edgeExt: - appInfo.icon = 'fa-edge'; - appInfo.name = 'Extension - Edge'; - break; - case constants.deviceType.vivaldiExt: - appInfo.icon = 'fa-puzzle-piece'; - appInfo.name = 'Extension - Vivaldi'; - break; - case constants.deviceType.windowsDesktop: - appInfo.icon = 'fa-windows'; - appInfo.name = 'Desktop - Windows'; - break; - case constants.deviceType.macOsDesktop: - appInfo.icon = 'fa-apple'; - appInfo.name = 'Desktop - macOS'; - break; - case constants.deviceType.linuxDesktop: - appInfo.icon = 'fa-linux'; - appInfo.name = 'Desktop - Linux'; - break; - case constants.deviceType.chrome: - appInfo.icon = 'fa-globe'; - appInfo.name = 'Web Vault - Chrome'; - break; - case constants.deviceType.firefox: - appInfo.icon = 'fa-globe'; - appInfo.name = 'Web Vault - Firefox'; - break; - case constants.deviceType.opera: - appInfo.icon = 'fa-globe'; - appInfo.name = 'Web Vault - Opera'; - break; - case constants.deviceType.safari: - appInfo.icon = 'fa-globe'; - appInfo.name = 'Web Vault - Safari'; - break; - case constants.deviceType.vivaldi: - appInfo.icon = 'fa-globe'; - appInfo.name = 'Web Vault - Vivaldi'; - break; - case constants.deviceType.edge: - appInfo.icon = 'fa-globe'; - appInfo.name = 'Web Vault - Edge'; - break; - case constants.deviceType.ie: - appInfo.icon = 'fa-globe'; - appInfo.name = 'Web Vault - IE'; - break; - case constants.deviceType.unknown: - appInfo.icon = 'fa-globe'; - appInfo.name = 'Web Vault - Unknown'; - break; - default: - break; - } - - return appInfo; - } - - function formatCipherId(ev) { - var shortId = ev.CipherId.substring(0, 8); - if (!ev.OrganizationId) { - return '' + shortId + ''; - } - - return '' + - '' + shortId + ''; - } - - function formatGroupId(ev) { - var shortId = ev.GroupId.substring(0, 8); - return '' + - '' + shortId + ''; - } - - function formatCollectionId(ev) { - var shortId = ev.CollectionId.substring(0, 8); - return '' + - '' + shortId + ''; - } - - function formatOrgUserId(ev) { - var shortId = ev.OrganizationUserId.substring(0, 8); - return '' + - '' + shortId + ''; - } - - return _service; - }); diff --git a/src/app/services/importService.js b/src/app/services/importService.js deleted file mode 100644 index d82f9ac4..00000000 --- a/src/app/services/importService.js +++ /dev/null @@ -1,3184 +0,0 @@ -angular - .module('bit.services') - - .factory('importService', function (constants) { - var _service = {}; - - _service.import = function (source, file, success, error) { - if (!file) { - error(); - return; - } - - switch (source) { - case 'bitwardencsv': - importBitwardenCsv(file, success, error); - break; - case 'lastpass': - importLastPass(file, success, error, false); - break; - case 'safeincloudxml': - importSafeInCloudXml(file, success, error); - break; - case 'keepass2xml': - importKeePass2Xml(file, success, error); - break; - case 'keepassxcsv': - importKeePassXCsv(file, success, error); - break; - case 'padlockcsv': - importPadlockCsv(file, success, error); - break; - case '1password1pif': - import1Password1Pif(file, success, error); - break; - case '1password6wincsv': - import1Password6WinCsv(file, success, error); - break; - case 'chromecsv': - case 'vivaldicsv': - case 'operacsv': - importChromeCsv(file, success, error); - break; - case 'firefoxpasswordexportercsv': - importFirefoxPasswordExporterCsv(file, success, error); - break; - case 'upmcsv': - importUpmCsv(file, success, error); - break; - case 'keepercsv': - importKeeperCsv(file, success, error); - break; - case 'passworddragonxml': - importPasswordDragonXml(file, success, error); - break; - case 'enpasscsv': - importEnpassCsv(file, success, error); - break; - case 'pwsafexml': - importPasswordSafeXml(file, success, error); - break; - case 'dashlanecsv': - importDashlaneCsv(file, success, error); - break; - case 'stickypasswordxml': - importStickyPasswordXml(file, success, error); - break; - case 'msecurecsv': - importmSecureCsv(file, success, error); - break; - case 'truekeycsv': - importTrueKeyCsv(file, success, error); - break; - case 'clipperzhtml': - importClipperzHtml(file, success, error); - break; - case 'avirajson': - importAviraJson(file, success, error); - break; - case 'roboformhtml': - importRoboFormHtml(file, success, error); - break; - case 'saferpasscsv': - importSaferPassCsv(file, success, error); - break; - case 'ascendocsv': - importAscendoCsv(file, success, error); - break; - case 'passwordbossjson': - importPasswordBossJson(file, success, error); - break; - case 'zohovaultcsv': - importZohoVaultCsv(file, success, error); - break; - case 'splashidcsv': - importSplashIdCsv(file, success, error); - break; - case 'meldiumcsv': - importMeldiumCsv(file, success, error); - break; - case 'passkeepcsv': - importPassKeepCsv(file, success, error); - break; - case 'gnomejson': - importGnomeJson(file, success, error); - break; - default: - error(); - break; - } - }; - - _service.importOrg = function (source, file, success, error) { - if (!file) { - error(); - return; - } - - switch (source) { - case 'bitwardencsv': - importBitwardenOrgCsv(file, success, error); - break; - case 'lastpass': - importLastPass(file, success, error, true); - break; - default: - error(); - break; - } - }; - - // helpers - - var _passwordFieldNames = [ - 'password', 'pass word', 'passphrase', 'pass phrase', - 'pass', 'code', 'code word', 'codeword', - 'secret', 'secret word', 'personpwd', - 'key', 'keyword', 'key word', 'keyphrase', 'key phrase', - 'form_pw', 'wppassword', 'pin', 'pwd', 'pw', 'pword', 'passwd', - 'p', 'serial', 'serial#', 'license key', 'reg #', - - // Non-English names - 'passwort' - ]; - - var _usernameFieldNames = [ - 'user', 'name', 'user name', 'username', 'login name', - 'email', 'e-mail', 'id', 'userid', 'user id', - 'login', 'form_loginname', 'wpname', 'mail', - 'loginid', 'login id', 'log', 'personlogin', - 'first name', 'last name', 'card#', 'account #', - 'member', 'member #', - - // Non-English names - 'nom', 'benutzername' - ]; - - var _notesFieldNames = [ - "note", "notes", "comment", "comments", "memo", - "description", "free form", "freeform", - "free text", "freetext", "free", - - // Non-English names - "kommentar" - ]; - - var _uriFieldNames = [ - 'url', 'hyper link', 'hyperlink', 'link', - 'host', 'hostname', 'host name', 'server', 'address', - 'hyper ref', 'href', 'web', 'website', 'web site', 'site', - 'web-site', 'uri', - - // Non-English names - 'ort', 'adresse' - ]; - - function loginNameFromUrl(url) { - var a = document.createElement('a'); - a.href = url; - return a.hostname.startsWith('www.') ? a.hostname.replace('www.', '') : a.hostname; - } - - function isField(fieldText, refFieldValues) { - if (!fieldText || fieldText === '') { - return false; - } - - fieldText = fieldText.trim().toLowerCase(); - - for (var i = 0; i < refFieldValues.length; i++) { - if (fieldText === refFieldValues[i]) { - return true; - } - } - - return false; - } - - function fixUri(uri) { - uri = uri.toLowerCase().trim(); - if (uri.indexOf('://') === -1 && uri.indexOf('.') >= 0) { - uri = 'http://' + uri; - } - - if (uri.length > 1000) { - return uri.substring(0, 1000); - } - - return uri; - } - - function makeUriArray(uri) { - if (!uri) { - return null; - } - - if (typeof uri === 'string') { - return [{ - uri: fixUri(uri), - match: null - }]; - } - - if (uri.length) { - var returnArr = []; - for (var i = 0; i < uri.length; i++) { - returnArr.push({ - uri: fixUri(uri[i]), - match: null - }); - } - return returnArr; - } - - return null; - } - - function parseSingleRowCsv(rowData) { - if (!rowData || rowData === '') { - return null; - } - var parsedRow = Papa.parse(rowData); - if (parsedRow && parsedRow.data && parsedRow.data.length && parsedRow.data[0].length) { - return parsedRow.data[0]; - } - return null; - } - - function parseCsvErrors(results) { - if (results.errors && results.errors.length) { - for (var i = 0; i < results.errors.length; i++) { - console.warn('Error parsing row ' + results.errors[i].row + ': ' + results.errors[i].message); - } - } - } - - function getFileContents(file, contentsCallback, errorCallback) { - if (typeof file === 'string') { - contentsCallback(file); - } - else { - var reader = new FileReader(); - reader.readAsText(file, 'utf-8'); - reader.onload = function (evt) { - contentsCallback(evt.target.result); - }; - reader.onerror = function (evt) { - errorCallback(); - }; - } - } - - function getXmlFileContents(file, xmlCallback, errorCallback) { - getFileContents(file, function (fileContents) { - xmlCallback($.parseXML(fileContents)); - }, errorCallback); - } - - // ref https://stackoverflow.com/a/5911300 - function getCardType(number) { - if (!number) { - return null; - } - - // Visa - var re = new RegExp('^4'); - if (number.match(re) != null) { - return 'Visa'; - } - - // Mastercard - // Updated for Mastercard 2017 BINs expansion - if (/^(5[1-5][0-9]{14}|2(22[1-9][0-9]{12}|2[3-9][0-9]{13}|[3-6][0-9]{14}|7[0-1][0-9]{13}|720[0-9]{12}))$/.test(number)) { - return 'Mastercard'; - } - - // AMEX - re = new RegExp('^3[47]'); - if (number.match(re) != null) { - return 'Amex'; - } - - // Discover - re = new RegExp('^(6011|622(12[6-9]|1[3-9][0-9]|[2-8][0-9]{2}|9[0-1][0-9]|92[0-5]|64[4-9])|65)'); - if (number.match(re) != null) { - return 'Discover'; - } - - // Diners - re = new RegExp('^36'); - if (number.match(re) != null) { - return 'Diners Club'; - } - - // Diners - Carte Blanche - re = new RegExp('^30[0-5]'); - if (number.match(re) != null) { - return 'Diners Club'; - } - - // JCB - re = new RegExp('^35(2[89]|[3-8][0-9])'); - if (number.match(re) != null) { - return 'JCB'; - } - - // Visa Electron - re = new RegExp('^(4026|417500|4508|4844|491(3|7))'); - if (number.match(re) != null) { - return 'Visa'; - } - - return null; - } - - // importers - - function importBitwardenCsv(file, success, error) { - Papa.parse(file, { - header: true, - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - var folders = [], - ciphers = [], - folderRelationships = [], - i = 0; - - angular.forEach(results.data, function (value, key) { - var folderIndex = folders.length, - cipherIndex = ciphers.length, - hasFolder = value.folder && value.folder !== '', - addFolder = hasFolder; - - if (hasFolder) { - for (i = 0; i < folders.length; i++) { - if (folders[i].name === value.folder) { - addFolder = false; - folderIndex = i; - break; - } - } - } - - var cipher = { - favorite: value.favorite && value.favorite !== '' && value.favorite !== '0' ? true : false, - notes: value.notes && value.notes !== '' ? value.notes : null, - name: value.name && value.name !== '' ? value.name : '--', - type: constants.cipherType.login - }; - - if (value.fields && value.fields !== '') { - var fields = value.fields.split(/(?:\r\n|\r|\n)/); - for (i = 0; i < fields.length; i++) { - if (!fields[i] || fields[i] === '') { - continue; - } - - var delimPosition = fields[i].lastIndexOf(': '); - if (delimPosition === -1) { - continue; - } - - if (!cipher.fields) { - cipher.fields = []; - } - - var field = { - name: fields[i].substr(0, delimPosition), - value: null, - type: constants.fieldType.text - }; - - if (fields[i].length > (delimPosition + 2)) { - field.value = fields[i].substr(delimPosition + 2); - } - - cipher.fields.push(field); - } - } - - var valueType = value.type ? value.type.toLowerCase() : null; - switch (valueType) { - case 'login': - case null: - case undefined: - cipher.type = constants.cipherType.login; - - var totp = value.login_totp || value.totp; - var uris = parseSingleRowCsv(value.login_uri || value.uri); - var username = value.login_username || value.username; - var password = value.login_password || value.password; - cipher.login = { - totp: totp && totp !== '' ? totp : null, - uris: makeUriArray(uris), - username: username && username !== '' ? username : null, - password: password && password !== '' ? password : null - }; - break; - case 'note': - cipher.type = constants.cipherType.secureNote; - cipher.secureNote = { - type: 0 // generic note - }; - break; - default: - break; - } - - ciphers.push(cipher); - - if (addFolder) { - folders.push({ - name: value.folder - }); - } - - if (hasFolder) { - var relationship = { - key: cipherIndex, - value: folderIndex - }; - folderRelationships.push(relationship); - } - }); - - success(folders, ciphers, folderRelationships); - } - }); - } - - function importBitwardenOrgCsv(file, success, error) { - Papa.parse(file, { - header: true, - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - var collections = [], - ciphers = [], - collectionRelationships = [], - i; - - angular.forEach(results.data, function (value, key) { - var cipherIndex = ciphers.length; - - if (value.collections && value.collections !== '') { - var cipherCollections = value.collections.split(','); - - for (i = 0; i < cipherCollections.length; i++) { - var addCollection = true; - var collectionIndex = collections.length; - - for (var j = 0; j < collections.length; j++) { - if (collections[j].name === cipherCollections[i]) { - addCollection = false; - collectionIndex = j; - break; - } - } - - if (addCollection) { - collections.push({ - name: cipherCollections[i] - }); - } - - collectionRelationships.push({ - key: cipherIndex, - value: collectionIndex - }); - } - } - - var cipher = { - favorite: false, - notes: value.notes && value.notes !== '' ? value.notes : null, - name: value.name && value.name !== '' ? value.name : '--', - type: constants.cipherType.login - }; - - if (value.fields && value.fields !== '') { - var fields = value.fields.split(/(?:\r\n|\r|\n)/); - for (i = 0; i < fields.length; i++) { - if (!fields[i] || fields[i] === '') { - continue; - } - - var delimPosition = fields[i].lastIndexOf(': '); - if (delimPosition === -1) { - continue; - } - - if (!cipher.fields) { - cipher.fields = []; - } - - var field = { - name: fields[i].substr(0, delimPosition), - value: null, - type: constants.fieldType.text - }; - - if (fields[i].length > (delimPosition + 2)) { - field.value = fields[i].substr(delimPosition + 2); - } - - cipher.fields.push(field); - } - } - - var valueType = value.type ? value.type.toLowerCase() : null; - switch (valueType) { - case 'login': - case null: - case undefined: - cipher.type = constants.cipherType.login; - - var totp = value.login_totp || value.totp; - var uris = parseSingleRowCsv(value.login_uri || value.uri); - var username = value.login_username || value.username; - var password = value.login_password || value.password; - cipher.login = { - totp: totp && totp !== '' ? totp : null, - uris: makeUriArray(uris), - username: username && username !== '' ? username : null, - password: password && password !== '' ? password : null - }; - break; - case 'note': - cipher.type = constants.cipherType.secureNote; - cipher.secureNote = { - type: 0 // generic note - }; - break; - default: - break; - } - - ciphers.push(cipher); - }); - - success(collections, ciphers, collectionRelationships); - } - }); - } - - function importLastPass(file, success, error, org) { - if (typeof file !== 'string' && file.type && file.type === 'text/html') { - var reader = new FileReader(); - reader.readAsText(file, 'utf-8'); - reader.onload = function (evt) { - var doc = $(evt.target.result); - var pre = doc.find('pre'); - var csv, results; - - if (pre.length === 1) { - csv = pre.text().trim(); - results = Papa.parse(csv, { - header: true, - encoding: 'UTF-8' - }); - parseData(results.data); - } - else { - var foundPre = false; - for (var i = 0; i < doc.length; i++) { - if (doc[i].tagName.toLowerCase() === 'pre') { - foundPre = true; - csv = doc[i].outerText.trim(); - results = Papa.parse(csv, { - header: true, - encoding: 'UTF-8' - }); - parseData(results.data); - break; - } - } - - if (!foundPre) { - error(); - } - } - }; - - reader.onerror = function (evt) { - error(); - }; - } - else { - Papa.parse(file, { - header: true, - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - parseData(results.data); - }, - beforeFirstChunk: function (chunk) { - return chunk.replace(/^\s+/, ''); - } - }); - } - - function parseSecureNoteMapping(extraParts, map, skip) { - var obj = { - dataObj: {}, - notes: null - }; - for (var i = 0; i < extraParts.length; i++) { - var fieldParts = extraParts[i].split(':'); - if (fieldParts.length < 1 || fieldParts[0] === 'NoteType' || skip.indexOf(fieldParts[0]) > -1 || - !fieldParts[1] || fieldParts[1] === '') { - continue; - } - - if (fieldParts[0] === 'Notes') { - if (obj.notes) { - obj.notes += ('\n' + fieldParts[1]); - } - else { - obj.notes = fieldParts[1]; - } - } - else if (map.hasOwnProperty(fieldParts[0])) { - obj.dataObj[map[fieldParts[0]]] = fieldParts[1]; - } - else { - if (obj.notes) { - obj.notes += '\n'; - } - else { - obj.notes = ''; - } - - obj.notes += (fieldParts[0] + ': ' + fieldParts[1]); - } - } - - return obj; - } - - function parseCard(value) { - var cardData = { - cardholderName: value.ccname && value.ccname !== '' ? value.ccname : null, - number: value.ccnum && value.ccnum !== '' ? value.ccnum : null, - brand: value.ccnum && value.ccnum !== '' ? getCardType(value.ccnum) : null, - code: value.cccsc && value.cccsc !== '' ? value.cccsc : null - }; - - if (value.ccexp && value.ccexp !== '' && value.ccexp.indexOf('-') > -1) { - var ccexpParts = value.ccexp.split('-'); - if (ccexpParts.length > 1) { - cardData.expYear = ccexpParts[0]; - cardData.expMonth = ccexpParts[1]; - if (cardData.expMonth.length === 2 && cardData.expMonth[0] === '0') { - cardData.expMonth = cardData.expMonth[1]; - } - } - } - - return cardData; - } - - function parseData(data) { - var folders = [], - ciphers = [], - cipherRelationships = [], - i = 0; - - angular.forEach(data, function (value, key) { - var folderIndex = folders.length, - cipherIndex = ciphers.length, - hasFolder = value.grouping && value.grouping !== '' && value.grouping !== '(none)', - addFolder = hasFolder; - - if (hasFolder) { - for (i = 0; i < folders.length; i++) { - if (folders[i].name === value.grouping) { - addFolder = false; - folderIndex = i; - break; - } - } - } - - var cipher; - if (value.hasOwnProperty('profilename') && value.hasOwnProperty('profilelanguage')) { - // form fill - cipher = { - favorite: false, - name: value.profilename && value.profilename !== '' ? value.profilename : '--', - type: constants.cipherType.card - }; - - if (value.title !== '' || value.firstname !== '' || value.lastname !== '' || - value.address1 !== '' || value.phone !== '' || value.username !== '' || - value.email !== '') { - cipher.type = constants.cipherType.identity; - } - } - else { - // site or secure note - cipher = { - favorite: org ? false : value.fav === '1', - name: value.name && value.name !== '' ? value.name : '--', - type: value.url === 'http://sn' ? constants.cipherType.secureNote : constants.cipherType.login - }; - } - - if (cipher.type === constants.cipherType.login) { - cipher.login = { - uris: makeUriArray(value.url), - username: value.username && value.username !== '' ? value.username : null, - password: value.password && value.password !== '' ? value.password : null - }; - - cipher.notes = value.extra && value.extra !== '' ? value.extra : null; - } - else if (cipher.type === constants.cipherType.secureNote) { - var extraParts = value.extra.split(/(?:\r\n|\r|\n)/), - processedNote = false; - if (extraParts.length) { - var typeParts = extraParts[0].split(':'); - if (typeParts.length > 1 && typeParts[0] === 'NoteType' && - (typeParts[1] === 'Credit Card' || typeParts[1] === 'Address')) { - var mappedData = null; - if (typeParts[1] === 'Credit Card') { - mappedData = parseSecureNoteMapping(extraParts, { - 'Number': 'number', - 'Name on Card': 'cardholderName', - 'Security Code': 'code' - }, []); - cipher.type = constants.cipherType.card; - cipher.card = mappedData.dataObj; - } - else if (typeParts[1] === 'Address') { - mappedData = parseSecureNoteMapping(extraParts, { - 'Title': 'title', - 'First Name': 'firstName', - 'Last Name': 'lastName', - 'Middle Name': 'middleName', - 'Company': 'company', - 'Address 1': 'address1', - 'Address 2': 'address2', - 'Address 3': 'address3', - 'City / Town': 'city', - 'State': 'state', - 'Zip / Postal Code': 'postalCode', - 'Country': 'country', - 'Email Address': 'email', - 'Username': 'username' - }, []); - cipher.type = constants.cipherType.identity; - cipher.identity = mappedData.dataObj; - } - - processedNote = true; - cipher.notes = mappedData.notes; - } - } - - if (!processedNote) { - cipher.secureNote = { - type: 0 - }; - cipher.notes = value.extra && value.extra !== '' ? value.extra : null; - } - } - else if (cipher.type === constants.cipherType.card) { - cipher.card = parseCard(value); - cipher.notes = value.notes && value.notes !== '' ? value.notes : null; - } - else if (cipher.type === constants.cipherType.identity) { - cipher.identity = { - title: value.title && value.title !== '' ? value.title : null, - firstName: value.firstname && value.firstname !== '' ? value.firstname : null, - middleName: value.middlename && value.middlename !== '' ? value.middlename : null, - lastName: value.lastname && value.lastname !== '' ? value.lastname : null, - username: value.username && value.username !== '' ? value.username : null, - company: value.company && value.company !== '' ? value.company : null, - ssn: value.ssn && value.ssn !== '' ? value.ssn : null, - address1: value.address1 && value.address1 !== '' ? value.address1 : null, - address2: value.address2 && value.address2 !== '' ? value.address2 : null, - address3: value.address3 && value.address3 !== '' ? value.address3 : null, - city: value.city && value.city !== '' ? value.city : null, - state: value.state && value.state !== '' ? value.state : null, - postalCode: value.zip && value.zip !== '' ? value.zip : null, - country: value.country && value.country !== '' ? value.country : null, - email: value.email && value.email !== '' ? value.email : null, - phone: value.phone && value.phone !== '' ? value.phone : null - }; - - cipher.notes = value.notes && value.notes !== '' ? value.notes : null; - - if (cipher.identity.title) { - cipher.identity.title = cipher.identity.title.charAt(0).toUpperCase() + - cipher.identity.title.slice(1); - } - - if (value.ccnum && value.ccnum !== '') { - // there is a card on this identity too - var cardCipher = JSON.parse(JSON.stringify(cipher)); // cloned - cardCipher.identity = null; - cardCipher.type = constants.cipherType.card; - cardCipher.card = parseCard(value); - ciphers.push(cardCipher); - } - } - - ciphers.push(cipher); - - if (addFolder) { - folders.push({ - name: value.grouping - }); - } - - if (hasFolder) { - var relationship = { - key: cipherIndex, - value: folderIndex - }; - cipherRelationships.push(relationship); - } - }); - - success(folders, ciphers, cipherRelationships); - } - } - - function importSafeInCloudXml(file, success, error) { - var folders = [], - ciphers = [], - cipherRelationships = [], - foldersIndex = [], - i = 0, - j = 0; - - getXmlFileContents(file, parse, error); - - function parse(xmlDoc) { - var xml = $(xmlDoc); - - var db = xml.find('database'); - if (db.length) { - var labels = db.find('> label'); - if (labels.length) { - for (i = 0; i < labels.length; i++) { - var label = $(labels[i]); - foldersIndex[label.attr('id')] = folders.length; - folders.push({ - name: label.attr('name') - }); - } - } - - var cards = db.find('> card'); - if (cards.length) { - for (i = 0; i < cards.length; i++) { - var card = $(cards[i]); - if (card.attr('template') === 'true') { - continue; - } - - var cipher = { - favorite: false, - notes: '', - name: card.attr('title'), - fields: null - }; - - if (!cipher.name || cipher.name === '') { - cipher.name = '--'; - } - - if (card.attr('type') === 'note') { - cipher.type = constants.cipherType.secureNote; - cipher.secureNote = { - type: 0 // generic note - }; - } - else { - cipher.type = constants.cipherType.login; - cipher.login = {}; - - var fields = card.find('> field'); - for (j = 0; j < fields.length; j++) { - var field = $(fields[j]); - - var text = field.text(); - var type = field.attr('type'); - var name = field.attr('name'); - - if (text && text !== '') { - if (type === 'login') { - cipher.login.username = text; - } - else if (type === 'password') { - cipher.login.password = text; - } - else if (type === 'notes') { - cipher.notes += (text + '\n'); - } - else if (type === 'weblogin' || type === 'website') { - cipher.login.uris = makeUriArray(text); - } - else if (text.length > 200) { - cipher.notes += (name + ': ' + text + '\n'); - } - else { - if (!cipher.fields) { - cipher.fields = []; - } - cipher.fields.push({ - name: name, - value: text, - type: constants.fieldType.text - }); - } - } - } - } - - var notes = card.find('> notes'); - for (j = 0; j < notes.length; j++) { - cipher.notes += ($(notes[j]).text() + '\n'); - } - - if (cipher.notes === '') { - cipher.notes = null; - } - - ciphers.push(cipher); - - labels = card.find('> label_id'); - if (labels.length) { - var labelId = $(labels[0]).text(); - var folderIndex = foldersIndex[labelId]; - if (labelId !== null && labelId !== '' && folderIndex !== null) { - cipherRelationships.push({ - key: ciphers.length - 1, - value: folderIndex - }); - } - } - } - } - - success(folders, ciphers, cipherRelationships); - } - else { - error(); - } - } - } - - function importPadlockCsv(file, success, error) { - Papa.parse(file, { - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - var folders = [], - ciphers = [], - folderRelationships = []; - - var customFieldHeaders = []; - - // CSV index ref: 0 = name, 1 = category, 2 = username, 3 = password, 4+ = custom fields - - var i = 0, - j = 0; - - for (i = 0; i < results.data.length; i++) { - var value = results.data[i]; - if (i === 0) { - // header row - for (j = 4; j < value.length; j++) { - customFieldHeaders.push(value[j]); - } - - continue; - } - - var folderIndex = folders.length, - cipherIndex = ciphers.length, - hasFolder = value[1] && value[1] !== '', - addFolder = hasFolder; - - if (hasFolder) { - for (j = 0; j < folders.length; j++) { - if (folders[j].name === value[1]) { - addFolder = false; - folderIndex = j; - break; - } - } - } - - var cipher = { - favorite: false, - type: constants.cipherType.login, - notes: null, - name: value[0] && value[0] !== '' ? value[0] : '--', - login: { - uris: null, - username: value[2] && value[2] !== '' ? value[2] : null, - password: value[3] && value[3] !== '' ? value[3] : null - }, - fields: null - }; - - if (customFieldHeaders.length) { - for (j = 4; j < value.length; j++) { - var cf = value[j]; - if (!cf || cf === '') { - continue; - } - - var cfHeader = customFieldHeaders[j - 4]; - if (cfHeader.toLowerCase() === 'url' || cfHeader.toLowerCase() === 'uri') { - cipher.login.uris = makeUriArray(cf); - } - else { - if (!cipher.fields) { - cipher.fields = []; - } - - cipher.fields.push({ - name: cfHeader, - value: cf, - type: constants.fieldType.text - }); - } - } - } - - ciphers.push(cipher); - - if (addFolder) { - folders.push({ - name: value[1] - }); - } - - if (hasFolder) { - folderRelationships.push({ - key: cipherIndex, - value: folderIndex - }); - } - } - - success(folders, ciphers, folderRelationships); - } - }); - } - - function importKeePass2Xml(file, success, error) { - var folders = [], - ciphers = [], - folderRelationships = []; - - getXmlFileContents(file, parse, error); - - function parse(xmlDoc) { - var xml = $(xmlDoc); - - var root = xml.find('Root'); - if (root.length) { - var group = root.find('> Group'); - if (group.length) { - traverse($(group[0]), true, ''); - success(folders, ciphers, folderRelationships); - } - } - else { - error(); - } - } - - function traverse(node, isRootNode, groupNamePrefix) { - var nodeEntries = []; - var folderIndex = folders.length; - var groupName = groupNamePrefix; - - if (!isRootNode) { - if (groupName !== '') { - groupName += ' > '; - } - groupName += node.find('> Name').text(); - folders.push({ - name: groupName - }); - } - - var entries = node.find('> Entry'); - if (entries.length) { - for (var i = 0; i < entries.length; i++) { - var entry = $(entries[i]); - var cipherIndex = ciphers.length; - var cipher = { - favorite: false, - notes: null, - name: null, - type: constants.cipherType.login, - login: { - uris: null, - username: null, - password: null - }, - fields: null - }; - - var entryStrings = entry.find('> String'); - for (var j = 0; j < entryStrings.length; j++) { - var entryString = $(entryStrings[j]); - - var key = entryString.find('> Key').text(); - var value = entryString.find('> Value').text(); - if (value === '') { - continue; - } - - switch (key) { - case 'URL': - cipher.login.uris = makeUriArray(value); - break; - case 'UserName': - cipher.login.username = value; - break; - case 'Password': - cipher.login.password = value; - break; - case 'Title': - cipher.name = value; - break; - case 'Notes': - cipher.notes = cipher.notes === null ? value + '\n' : cipher.notes + value + '\n'; - break; - default: - if (value.length > 200 || value.indexOf('\n') > -1) { - if (!cipher.notes) { - cipher.notes = ''; - } - - cipher.notes += (key + ': ' + value + '\n'); - } - else { - if (!cipher.fields) { - cipher.fields = []; - } - - // other custom fields - cipher.fields.push({ - name: key, - value: value, - type: constants.fieldType.text - }); - } - break; - } - } - - if (cipher.name === null) { - cipher.name = '--'; - } - - ciphers.push(cipher); - - if (!isRootNode) { - folderRelationships.push({ - key: cipherIndex, - value: folderIndex - }); - } - } - } - - var groups = node.find('> Group'); - if (groups.length) { - for (var k = 0; k < groups.length; k++) { - traverse($(groups[k]), false, groupName); - } - } - } - } - - function importKeePassXCsv(file, success, error) { - Papa.parse(file, { - header: true, - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - var folders = [], - ciphers = [], - folderRelationships = []; - - angular.forEach(results.data, function (value, key) { - value.Group = value.Group.startsWith('Root/') ? - value.Group.replace('Root/', '') : value.Group; - - var groupName = value.Group && value.Group !== '' ? - value.Group.split('/').join(' > ') : null; - - var folderIndex = folders.length, - cipherIndex = ciphers.length, - hasFolder = groupName !== null, - addFolder = hasFolder, - i = 0; - - if (hasFolder) { - for (i = 0; i < folders.length; i++) { - if (folders[i].name === groupName) { - addFolder = false; - folderIndex = i; - break; - } - } - } - - var cipher = { - type: constants.cipherType.login, - favorite: false, - notes: value.Notes && value.Notes !== '' ? value.Notes : null, - name: value.Title && value.Title !== '' ? value.Title : '--', - login: { - uris: makeUriArray(value.URL), - username: value.Username && value.Username !== '' ? value.Username : null, - password: value.Password && value.Password !== '' ? value.Password : null - } - }; - - if (value.Title) { - ciphers.push(cipher); - } - - if (addFolder) { - folders.push({ - name: groupName - }); - } - - if (hasFolder) { - var relationship = { - key: cipherIndex, - value: folderIndex - }; - folderRelationships.push(relationship); - } - }); - - success(folders, ciphers, folderRelationships); - } - }); - } - - function import1Password1Pif(file, success, error) { - var folders = [], - ciphers = [], - i = 0; - - function parseFields(fields, cipher, designationKey, valueKey, nameKey) { - for (var j = 0; j < fields.length; j++) { - var field = fields[j]; - if (!field[valueKey] || field[valueKey] === '') { - continue; - } - - var fieldValue = field[valueKey].toString(); - - if (cipher.type == constants.cipherType.login && !cipher.login.username && - field[designationKey] && field[designationKey] === 'username') { - cipher.login.username = fieldValue; - } - else if (cipher.type == constants.cipherType.login && !cipher.login.password && - field[designationKey] && field[designationKey] === 'password') { - cipher.login.password = fieldValue; - } - else if (cipher.type == constants.cipherType.login && !cipher.login.totp && - field[designationKey] && field[designationKey].startsWith("TOTP_")) { - cipher.login.totp = fieldValue; - } - else if (fieldValue) { - var fieldName = (field[nameKey] || 'no_name'); - if (fieldValue.indexOf('\\n') > -1 || fieldValue.length > 200) { - if (cipher.notes === null) { - cipher.notes = ''; - } - else { - cipher.notes += '\n'; - } - - cipher.notes += (fieldName + ': ' + - fieldValue.split('\\r\\n').join('\n').split('\\n').join('\n')); - } - else { - if (!cipher.fields) { - cipher.fields = []; - } - - cipher.fields.push({ - name: fieldName, - value: fieldValue, - type: constants.fieldType.text - }); - } - } - } - } - - getFileContents(file, parse, error); - - function parse(fileContent) { - var fileLines = fileContent.split(/(?:\r\n|\r|\n)/); - - for (i = 0; i < fileLines.length; i++) { - var line = fileLines[i]; - if (!line.length || line[0] !== '{') { - continue; - } - - var item = JSON.parse(line); - var cipher = { - type: constants.cipherType.login, - favorite: item.openContents && item.openContents.faveIndex ? true : false, - notes: null, - name: item.title && item.title !== '' ? item.title : '--', - fields: null - }; - - if (item.typeName === 'securenotes.SecureNote') { - cipher.type = constants.cipherType.secureNote; - cipher.secureNote = { - type: 0 // generic note - }; - } - else { - cipher.type = constants.cipherType.login; - cipher.login = { - uris: makeUriArray(item.location), - username: null, - password: null, - totp: null - }; - } - - if (item.secureContents) { - if (item.secureContents.notesPlain && item.secureContents.notesPlain !== '') { - cipher.notes = item.secureContents.notesPlain - .split('\\r\\n').join('\n').split('\\n').join('\n'); - } - - if (item.secureContents.fields) { - parseFields(item.secureContents.fields, cipher, 'designation', 'value', 'name'); - } - - if (item.secureContents.sections) { - for (var j = 0; j < item.secureContents.sections.length; j++) { - if (item.secureContents.sections[j].fields) { - parseFields(item.secureContents.sections[j].fields, cipher, 'n', 'v', 't'); - } - } - } - } - - ciphers.push(cipher); - } - - success(folders, ciphers, []); - } - } - - function import1Password6WinCsv(file, success, error) { - var folders = [], - ciphers = []; - - Papa.parse(file, { - encoding: 'UTF-8', - header: true, - complete: function (results) { - parseCsvErrors(results); - - for (var i = 0; i < results.data.length; i++) { - var value = results.data[i]; - if (!value.title) { - continue; - } - - var cipher = { - type: constants.cipherType.login, - favorite: false, - notes: value.notesPlain && value.notesPlain !== '' ? value.notesPlain : '', - name: value.title && value.title !== '' ? value.title : '--', - login: { - uris: null, - username: null, - password: null - } - }; - - for (var property in value) { - if (value.hasOwnProperty(property)) { - if (value[property] === null || value[property] === '') { - continue; - } - - if (!cipher.login.password && property === 'password') { - cipher.login.password = value[property]; - } - else if (!cipher.login.username && property === 'username') { - cipher.login.username = value[property]; - } - else if (!cipher.login.uris && property === 'urls') { - var urls = value[property].split(/(?:\r\n|\r|\n)/); - cipher.login.uris = makeUriArray(urls); - } - else if (property !== 'ainfo' && property !== 'autosubmit' && property !== 'notesPlain' && - property !== 'ps' && property !== 'scope' && property !== 'tags' && property !== 'title' && - property !== 'uuid' && !property.startsWith('section:')) { - - if (cipher.notes !== '') { - cipher.notes += '\n'; - } - - cipher.notes += (property + ': ' + value[property]); - } - } - } - - if (cipher.notes === '') { - cipher.notes = null; - } - - ciphers.push(cipher); - } - - success(folders, ciphers, []); - } - }); - } - - function importChromeCsv(file, success, error) { - Papa.parse(file, { - header: true, - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - var folders = [], - ciphers = []; - - angular.forEach(results.data, function (value, key) { - ciphers.push({ - type: constants.cipherType.login, - favorite: false, - notes: null, - name: value.name && value.name !== '' ? value.name : '--', - login: { - uris: makeUriArray(value.url), - username: value.username && value.username !== '' ? value.username : null, - password: value.password && value.password !== '' ? value.password : null - } - }); - }); - - success(folders, ciphers, []); - } - }); - } - - function importFirefoxPasswordExporterCsv(file, success, error) { - Papa.parse(file, { - header: true, - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - var folders = [], - ciphers = []; - - angular.forEach(results.data, function (value, key) { - - ciphers.push({ - type: constants.cipherType.login, - favorite: false, - notes: null, - name: value.hostname && value.hostname !== '' ? loginNameFromUrl(value.hostname) : '--', - login: { - uris: makeUriArray(value.hostname), - username: value.username && value.username !== '' ? value.username : null, - password: value.password && value.password !== '' ? value.password : null - } - }); - }); - - success(folders, ciphers, []); - } - }); - } - - function importUpmCsv(file, success, error) { - Papa.parse(file, { - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - var folders = [], - ciphers = []; - - angular.forEach(results.data, function (value, key) { - if (value.length === 5) { - ciphers.push({ - type: constants.cipherType.login, - favorite: false, - notes: value[4] && value[4] !== '' ? value[4] : null, - name: value[0] && value[0] !== '' ? value[0] : '--', - login: { - uris: makeUriArray(value[3]), - username: value[1] && value[1] !== '' ? value[1] : null, - password: value[2] && value[2] !== '' ? value[2] : null - } - }); - } - }); - - success(folders, ciphers, []); - } - }); - } - - function importKeeperCsv(file, success, error) { - Papa.parse(file, { - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - var folders = [], - ciphers = [], - folderRelationships = []; - - angular.forEach(results.data, function (value, key) { - if (value.length >= 6) { - var folderIndex = folders.length, - cipherIndex = ciphers.length, - hasFolder = value[0] && value[0] !== '', - addFolder = hasFolder, - i = 0; - - if (hasFolder) { - for (i = 0; i < folders.length; i++) { - if (folders[i].name === value[0]) { - addFolder = false; - folderIndex = i; - break; - } - } - } - - var cipher = { - type: constants.cipherType.login, - favorite: false, - notes: value[5] && value[5] !== '' ? value[5] : null, - name: value[1] && value[1] !== '' ? value[1] : '--', - login: { - uris: makeUriArray(value[4]), - username: value[2] && value[2] !== '' ? value[2] : null, - password: value[3] && value[3] !== '' ? value[3] : null - }, - fields: null - }; - - if (value.length > 6) { - // we have some custom fields. - for (i = 6; i < value.length; i = i + 2) { - if (value[i + 1] && value[i + 1].length > 200) { - if (!cipher.notes) { - cipher.notes = ''; - } - - cipher.notes += (value[i] + ': ' + value[i + 1] + '\n'); - } - else { - if (!cipher.fields) { - cipher.fields = []; - } - - cipher.fields.push({ - name: value[i], - value: value[i + 1], - type: constants.fieldType.text - }); - } - } - } - - ciphers.push(cipher); - - if (addFolder) { - folders.push({ - name: value[0] - }); - } - - if (hasFolder) { - var relationship = { - key: cipherIndex, - value: folderIndex - }; - folderRelationships.push(relationship); - } - } - }); - - success(folders, ciphers, folderRelationships); - } - }); - } - - function importPasswordDragonXml(file, success, error) { - var folders = [], - ciphers = [], - folderRelationships = [], - foldersIndex = [], - j = 0; - - getXmlFileContents(file, parseXml, error); - - function parseXml(xmlDoc) { - var xml = $(xmlDoc); - - var pwManager = xml.find('PasswordManager'); - if (pwManager.length) { - var records = pwManager.find('> record'); - if (records.length) { - for (var i = 0; i < records.length; i++) { - var record = $(records[i]); - - var accountNameNode = record.find('> Account-Name'), - accountName = accountNameNode.length ? $(accountNameNode) : null, - userIdNode = record.find('> User-Id'), - userId = userIdNode.length ? $(userIdNode) : null, - passwordNode = record.find('> Password'), - password = passwordNode.length ? $(passwordNode) : null, - urlNode = record.find('> URL'), - url = urlNode.length ? $(urlNode) : null, - notesNode = record.find('> Notes'), - notes = notesNode.length ? $(notesNode) : null, - categoryNode = record.find('> Category'), - category = categoryNode.length ? $(categoryNode) : null, - categoryText = category ? category.text() : null; - - var folderIndex = folders.length, - cipherIndex = ciphers.length, - hasFolder = categoryText && categoryText !== '' && categoryText !== 'Unfiled', - addFolder = hasFolder; - - if (hasFolder) { - for (j = 0; j < folders.length; j++) { - if (folders[j].name === categoryText) { - addFolder = false; - folderIndex = j; - break; - } - } - } - - var cipher = { - type: constants.cipherType.login, - favorite: false, - notes: notes && notes.text() !== '' ? notes.text() : null, - name: accountName && accountName.text() !== '' ? accountName.text() : '--', - login: { - uris: url ? makeUriArray(url.text()) : null, - username: userId && userId.text() !== '' ? userId.text() : null, - password: password && password.text() !== '' ? password.text() : null - }, - fields: null - }; - - var attributesSelector = ''; - for (j = 1; j <= 10; j++) { - attributesSelector += '> Attribute-' + j; - if (j < 10) { - attributesSelector += ', '; - } - } - - var attributes = record.find(attributesSelector); - if (attributes.length) { - // we have some attributes. add them as fields - for (j = 0; j < attributes.length; j++) { - var attr = $(attributes[j]), - attrName = attr.prop('tagName'), - attrValue = attr.text(); - - if (!attrValue || attrValue === '' || attrValue === 'null') { - continue; - } - - if (attrValue.length > 200) { - if (!cipher.notes) { - cipher.notes = ''; - } - - cipher.notes += (attrName + ': ' + attrValue + '\n'); - } - else { - if (!cipher.fields) { - cipher.fields = []; - } - - cipher.fields.push({ - name: attrName, - value: attrValue, - type: constants.fieldType.text - }); - } - } - } - - ciphers.push(cipher); - - if (addFolder) { - folders.push({ - name: categoryText - }); - } - - if (hasFolder) { - var relationship = { - key: cipherIndex, - value: folderIndex - }; - folderRelationships.push(relationship); - } - } - } - - success(folders, ciphers, folderRelationships); - } - else { - error(); - } - } - } - - function importEnpassCsv(file, success, error) { - Papa.parse(file, { - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - var folders = [], - ciphers = []; - - for (var j = 0; j < results.data.length; j++) { - var row = results.data[j]; - if (row.length < 2) { - continue; - } - if (j === 0 && row[0] === 'Title') { - continue; - } - - var note = row[row.length - 1]; - var cipher = { - type: constants.cipherType.login, - name: row[0], - favorite: false, - notes: note && note !== '' ? note : null, - fields: null, - login: { - uris: null, - password: null, - username: null, - totp: null - } - }; - - if (row.length > 2 && (row.length % 2) === 0) { - for (var i = 0; i < row.length - 2; i += 2) { - var value = row[i + 2]; - if (!value || value === '') { - continue; - } - - var field = row[i + 1]; - var fieldLower = field.toLowerCase(); - - if (fieldLower === 'url' && !cipher.login.uris) { - cipher.login.uris = makeUriArray(value); - } - else if ((fieldLower === 'username' || fieldLower === 'email') && !cipher.login.username) { - cipher.login.username = value; - } - else if (fieldLower === 'password' && !cipher.login.password) { - cipher.login.password = value; - } - else if (fieldLower === 'totp' && !cipher.login.totp) { - cipher.login.totp = value; - } - else if (value.length > 200) { - if (!cipher.notes) { - cipher.notes = ''; - } - - cipher.notes += (field + ': ' + value + '\n'); - } - else { - // other fields - if (!cipher.fields) { - cipher.fields = []; - } - - cipher.fields.push({ - name: field, - value: value, - type: constants.fieldType.text - }); - } - } - } - - ciphers.push(cipher); - } - - success(folders, ciphers, []); - } - }); - } - - function importPasswordSafeXml(file, success, error) { - var folders = [], - ciphers = [], - folderRelationships = [], - foldersIndex = [], - j = 0; - - getXmlFileContents(file, parseXml, error); - - function parseXml(xmlDoc) { - var xml = $(xmlDoc); - - var pwsafe = xml.find('passwordsafe'); - if (pwsafe.length) { - var notesDelimiter = pwsafe.attr('delimiter'); - - var entries = pwsafe.find('> entry'); - if (entries.length) { - for (var i = 0; i < entries.length; i++) { - var entry = $(entries[i]); - - var titleNode = entry.find('> title'), - title = titleNode.length ? $(titleNode) : null, - usernameNode = entry.find('> username'), - username = usernameNode.length ? $(usernameNode) : null, - emailNode = entry.find('> email'), - email = emailNode.length ? $(emailNode) : null, - emailText = email ? email.text() : null, - passwordNode = entry.find('> password'), - password = passwordNode.length ? $(passwordNode) : null, - urlNode = entry.find('> url'), - url = urlNode.length ? $(urlNode) : null, - notesNode = entry.find('> notes'), - notes = notesNode.length ? $(notesNode) : null, - notesText = notes ? notes.text().split(notesDelimiter).join('\n') : null, - groupNode = entry.find('> group'), - group = groupNode.length ? $(groupNode) : null, - groupText = group ? group.text().split('.').join(' > ') : null; - - var folderIndex = folders.length, - cipherIndex = ciphers.length, - hasFolder = groupText && groupText !== '', - addFolder = hasFolder; - - if (hasFolder) { - for (j = 0; j < folders.length; j++) { - if (folders[j].name === groupText) { - addFolder = false; - folderIndex = j; - break; - } - } - } - - var cipher = { - type: constants.cipherType.login, - favorite: false, - notes: notes && notesText !== '' ? notesText : null, - name: title && title.text() !== '' ? title.text() : '--', - login: { - uris: url ? makeUriArray(url.text()) : null, - username: username && username.text() !== '' ? username.text() : null, - password: password && password.text() !== '' ? password.text() : null - } - }; - - if (!cipher.login.username && emailText && emailText !== '') { - cipher.login.username = emailText; - } - else if (emailText && emailText !== '') { - cipher.notes = cipher.notes === null ? 'Email: ' + emailText - : cipher.notes + '\n' + 'Email: ' + emailText; - } - - ciphers.push(cipher); - - if (addFolder) { - folders.push({ - name: groupText - }); - } - - if (hasFolder) { - var relationship = { - key: cipherIndex, - value: folderIndex - }; - folderRelationships.push(relationship); - } - } - } - - success(folders, ciphers, folderRelationships); - } - else { - error(); - } - } - } - - function importDashlaneCsv(file, success, error) { - Papa.parse(file, { - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - var folders = [], - ciphers = []; - - for (var j = 0; j < results.data.length; j++) { - var skip = false; - var row = results.data[j]; - if (!row.length || row.length === 1) { - continue; - } - - var cipher = { - type: constants.cipherType.login, - name: row[0] && row[0] !== '' ? row[0] : '--', - favorite: false, - notes: null, - login: { - uris: null, - password: null, - username: null - } - }; - - if (row.length === 2) { - cipher.login.uris = makeUriArray(row[1]); - } - else if (row.length === 3) { - cipher.login.uris = makeUriArray(row[1]); - cipher.login.username = row[2]; - } - else if (row.length === 4) { - if (row[2] === '' && row[3] === '') { - cipher.login.username = row[1]; - cipher.notes = row[2] + '\n' + row[3]; - } - else { - cipher.login.username = row[2]; - cipher.notes = row[1] + '\n' + row[3]; - } - } - else if (row.length === 5) { - cipher.login.uris = makeUriArray(row[1]); - cipher.login.username = row[2]; - cipher.login.password = row[3]; - cipher.notes = row[4]; - } - else if (row.length === 6) { - if (row[2] === '') { - cipher.login.username = row[3]; - cipher.login.password = row[4]; - cipher.notes = row[5]; - } - else { - cipher.login.username = row[2]; - cipher.login.password = row[3]; - cipher.notes = row[4] + '\n' + row[5]; - } - - cipher.login.uris = makeUriArray(row[1]); - } - else if (row.length === 7) { - if (row[2] === '') { - cipher.login.username = row[3]; - cipher.notes = row[4] + '\n' + row[6]; - } - else { - cipher.login.username = row[2]; - cipher.notes = row[3] + '\n' + row[4] + '\n' + row[6]; - } - - cipher.login.uris = makeUriArray(row[1]); - cipher.login.password = row[5]; - } - else { - cipher.notes = ''; - for (var i = 1; i < row.length; i++) { - cipher.notes = cipher.notes + row[i] + '\n'; - if (row[i] === 'NO_TYPE') { - skip = true; - break; - } - } - } - - if (skip) { - continue; - } - - if (cipher.login.username === '') { - cipher.login.username = null; - } - if (cipher.login.password === '') { - cipher.login.password = null; - } - if (cipher.notes === '') { - cipher.notes = null; - } - - ciphers.push(cipher); - } - - success(folders, ciphers, []); - } - }); - } - - function importStickyPasswordXml(file, success, error) { - var folders = [], - ciphers = [], - folderRelationships = [], - foldersIndex = [], - j = 0; - - function buildGroupText(database, groupId, groupText) { - var group = database.find('> Groups > Group[ID="' + groupId + '"]'); - if (group.length) { - if (groupText && groupText !== '') { - groupText = ' > ' + groupText; - } - groupText = group.attr('Name') + groupText; - var parentGroupId = group.attr('ParentID'); - return buildGroupText(database, parentGroupId, groupText); - } - return groupText; - } - - getXmlFileContents(file, parseXml, error); - - function parseXml(xmlDoc) { - var xml = $(xmlDoc); - - var database = xml.find('root > Database'); - if (database.length) { - var loginNodes = database.find('> Logins > Login'); - if (loginNodes.length) { - for (var i = 0; i < loginNodes.length; i++) { - var loginNode = $(loginNodes[i]); - - var usernameText = loginNode.attr('Name'), - passwordText = loginNode.attr('Password'), - accountId = loginNode.attr('ID'), - titleText = null, - linkText = null, - notesText = null, - groupId = null, - groupText = null; - - if (accountId && accountId !== '') { - var accountLogin = - database.find('> Accounts > Account > LoginLinks > Login[SourceLoginID="' + accountId + '"]'); - if (accountLogin.length) { - var account = accountLogin.parent().parent(); - if (account.length) { - titleText = account.attr('Name'); - linkText = account.attr('Link'); - groupId = account.attr('ParentID'); - notesText = account.attr('Comments'); - if (notesText) { - notesText = notesText.split('/n').join('\n'); - } - } - } - } - - if (groupId && groupId !== '') { - groupText = buildGroupText(database, groupId, ''); - } - - var folderIndex = folders.length, - cipherIndex = ciphers.length, - hasFolder = groupText && groupText !== '', - addFolder = hasFolder; - - if (hasFolder) { - for (j = 0; j < folders.length; j++) { - if (folders[j].name === groupText) { - addFolder = false; - folderIndex = j; - break; - } - } - } - - var cipher = { - type: constants.cipherType.login, - favorite: false, - notes: notesText && notesText !== '' ? notesText : null, - name: titleText && titleText !== '' ? titleText : '--', - login: { - uris: makeUriArray(linkText), - username: usernameText && usernameText !== '' ? usernameText : null, - password: passwordText && passwordText !== '' ? passwordText : null - } - }; - - ciphers.push(cipher); - - if (addFolder) { - folders.push({ - name: groupText - }); - } - - if (hasFolder) { - var relationship = { - key: cipherIndex, - value: folderIndex - }; - folderRelationships.push(relationship); - } - } - } - - success(folders, ciphers, folderRelationships); - } - else { - error(); - } - } - } - - function importmSecureCsv(file, success, error) { - Papa.parse(file, { - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - var folders = [], - ciphers = [], - folderRelationships = []; - - angular.forEach(results.data, function (value, key) { - if (value.length >= 3) { - var folderIndex = folders.length, - cipherIndex = ciphers.length, - hasFolder = value[0] && value[0] !== '' && value[0] !== 'Unassigned', - addFolder = hasFolder, - i = 0; - - if (hasFolder) { - for (i = 0; i < folders.length; i++) { - if (folders[i].name === value[0]) { - addFolder = false; - folderIndex = i; - break; - } - } - } - - var cipher = { - type: constants.cipherType.login, - favorite: false, - notes: '', - name: value[2] && value[2] !== '' ? value[2] : null, - login: { - uris: null, - username: null, - password: null - } - }; - - if (value[1] === 'Web Logins') { - cipher.login.uris = makeUriArray(value[4]); - cipher.login.username = value[5] && value[5] !== '' ? value[5] : null; - cipher.login.password = value[6] && value[6] !== '' ? value[6] : null; - cipher.notes = value[3] && value[3] !== '' ? value[3].split('\\n').join('\n') : null; - } - else if (value.length > 3) { - for (var j = 3; j < value.length; j++) { - if (value[j] && value[j] !== '') { - if (cipher.notes !== '') { - cipher.notes = cipher.notes + '\n'; - } - - cipher.notes = cipher.notes + value[j]; - } - } - } - - if (value[1] && value[1] !== '' && value[1] !== 'Web Logins') { - cipher.name = value[1] + ': ' + cipher.name; - } - - if (cipher.notes === '') { - cipher.notes = null; - } - - ciphers.push(cipher); - - if (addFolder) { - folders.push({ - name: value[0] - }); - } - - if (hasFolder) { - var relationship = { - key: cipherIndex, - value: folderIndex - }; - folderRelationships.push(relationship); - } - } - }); - - success(folders, ciphers, folderRelationships); - } - }); - } - - function importTrueKeyCsv(file, success, error) { - var folders = [], - ciphers = [], - propsToIgnore = [ - 'kind', - 'autologin', - 'favorite', - 'hexcolor', - 'protectedwithpassword', - 'subdomainonly', - 'type', - 'tk_export_version', - 'note', - 'title', - 'document_content' - ]; - - Papa.parse(file, { - header: true, - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - angular.forEach(results.data, function (value, key) { - var cipher = { - type: constants.cipherType.login, - favorite: value.favorite && value.favorite.toLowerCase() === 'true' ? true : false, - notes: value.memo && value.memo !== '' ? value.memo : null, - name: value.name && value.name !== '' ? value.name : '--', - login: { - uris: makeUriArray(value.url), - username: value.login && value.login !== '' ? value.login : null, - password: value.password && value.password !== '' ? value.password : null - }, - fields: null - }; - - if (value.kind !== 'login') { - cipher.name = value.title && value.title !== '' ? value.title : '--'; - cipher.notes = value.note && value.note !== '' ? value.note : null; - - if (!cipher.notes) { - cipher.notes = value.document_content && value.document_content !== '' ? - value.document_content : null; - } - - for (var property in value) { - if (value.hasOwnProperty(property) && propsToIgnore.indexOf(property.toLowerCase()) < 0 && - value[property] && value[property] !== '') { - if (value[property].length > 200) { - if (!cipher.notes) { - cipher.notes = ''; - } - - cipher.notes += (property + ': ' + value[property] + '\n'); - } - else { - if (!cipher.fields) { - cipher.fields = []; - } - - // other custom fields - cipher.fields.push({ - name: property, - value: value[property], - type: constants.fieldType.text - }); - } - } - } - } - - ciphers.push(cipher); - }); - - success(folders, ciphers, []); - } - }); - } - - function importClipperzHtml(file, success, error) { - var folders = [], - ciphers = []; - - getFileContents(file, parse, error); - - function parse(fileContents) { - var doc = $(fileContents); - var textarea = doc.find('textarea'); - var json = textarea && textarea.length ? textarea.val() : null; - var entries = json ? JSON.parse(json) : null; - - if (entries && entries.length) { - for (var i = 0; i < entries.length; i++) { - var entry = entries[i]; - - var cipher = { - type: constants.cipherType.login, - favorite: false, - notes: '', - name: entry.label && entry.label !== '' ? entry.label.split(' ')[0] : '--', - login: { - uris: null, - username: null, - password: null - }, - fields: null - }; - - if (entry.data && entry.data.notes && entry.data.notes !== '') { - cipher.notes = entry.data.notes.split('\\n').join('\n'); - } - - if (entry.currentVersion && entry.currentVersion.fields) { - for (var property in entry.currentVersion.fields) { - if (entry.currentVersion.fields.hasOwnProperty(property)) { - var field = entry.currentVersion.fields[property]; - var actionType = field.actionType.toLowerCase(); - - switch (actionType) { - case 'password': - cipher.login.password = field.value; - break; - case 'email': - case 'username': - case 'user': - case 'name': - cipher.login.username = field.value; - break; - case 'url': - cipher.login.uris = makeUriArray(field.value); - break; - default: - if (!cipher.login.username && isField(field.label, _usernameFieldNames)) { - cipher.login.username = field.value; - } - else if (!cipher.login.password && isField(field.label, _passwordFieldNames)) { - cipher.login.password = field.value; - } - else if (field.value.length > 200) { - if (!cipher.notes) { - cipher.notes = ''; - } - - cipher.notes += (field.label + ': ' + field.value + '\n'); - } - else { - if (!cipher.fields) { - cipher.fields = []; - } - cipher.fields.push({ - name: field.label, - value: field.value, - type: constants.fieldType.text - }); - } - break; - } - } - } - } - - if (cipher.notes === '') { - cipher.notes = null; - } - - ciphers.push(cipher); - } - } - - success(folders, ciphers, []); - } - } - - function importAviraJson(file, success, error) { - var folders = [], - ciphers = [], - i = 0; - - getFileContents(file, parseJson, error); - - function parseJson(fileContent) { - var fileJson = JSON.parse(fileContent); - if (fileJson) { - if (fileJson.accounts) { - for (i = 0; i < fileJson.accounts.length; i++) { - var account = fileJson.accounts[i]; - var cipher = { - type: constants.cipherType.login, - favorite: account.is_favorite && account.is_favorite === true, - notes: null, - name: account.label && account.label !== '' ? account.label : account.domain, - login: { - uris: makeUriArray(account.domain), - username: account.username && account.username !== '' ? account.username : null, - password: account.password && account.password !== '' ? account.password : null - } - }; - - if (account.email && account.email !== '') { - if (!cipher.login.username || cipher.login.username === '') { - cipher.login.username = account.email; - } - else { - cipher.notes = account.email; - } - } - - if (!cipher.name || cipher.name === '') { - cipher.name = '--'; - } - - ciphers.push(cipher); - } - } - } - - success(folders, ciphers, []); - } - } - - function importRoboFormHtml(file, success, error) { - var folders = [], - ciphers = []; - - getFileContents(file, parse, error); - - function parse(fileContents) { - var doc = $(fileContents.split('­').join('').split('').join('')); - var outterTables = doc.find('table.nobr'); - if (outterTables.length) { - for (var i = 0; i < outterTables.length; i++) { - var outterTable = $(outterTables[i]); - var cipher = { - type: constants.cipherType.login, - favorite: false, - notes: '', - name: outterTable.find('span.caption').text(), - login: { - uris: null, - username: null, - password: null - }, - fields: null - }; - - var url = outterTable.find('.subcaption').text(); - if (url && url !== '') { - cipher.login.uris = makeUriArray(url); - } - - var fields = []; - /* jshint ignore:start */ - $.each(outterTable.find('table td:not(.subcaption)'), function (indexInArray, valueOfElement) { - $(valueOfElement).find('br').replaceWith('\n'); - var t = $(valueOfElement).text(); - if (t !== '') { - fields.push(t.split('\\n').join('\n')); - } - }); - /* jshint ignore:end */ - - if (fields.length && (fields.length % 2 === 0)) - for (var j = 0; j < fields.length; j += 2) { - var field = fields[j]; - var fieldValue = fields[j + 1]; - - if (!cipher.login.password && isField(field.replace(':', ''), _passwordFieldNames)) { - cipher.login.password = fieldValue; - } - else if (!cipher.login.username && isField(field.replace(':', ''), _usernameFieldNames)) { - cipher.login.username = fieldValue; - } - else if (fieldValue.length > 200) { - if (!cipher.notes) { - cipher.notes = ''; - } - - cipher.notes += (field + ': ' + fieldValue + '\n'); - } - else { - if (!cipher.fields) { - cipher.fields = []; - } - - cipher.fields.push({ - name: field, - value: fieldValue, - type: constants.fieldType.text - }); - } - } - - if (!cipher.notes || cipher.notes === '') { - cipher.notes = null; - } - - if (!cipher.name || cipher.name === '') { - cipher.name = '--'; - } - - ciphers.push(cipher); - } - } - - success(folders, ciphers, []); - } - } - - function importSaferPassCsv(file, success, error) { - var folders = [], - ciphers = []; - - Papa.parse(file, { - header: true, - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - angular.forEach(results.data, function (value, key) { - ciphers.push({ - type: constants.cipherType.login, - favorite: false, - notes: value.notes && value.notes !== '' ? value.notes : null, - name: value.url && value.url !== '' ? loginNameFromUrl(value.url) : '--', - login: { - uris: makeUriArray(value.url), - username: value.username && value.username !== '' ? value.username : null, - password: value.password && value.password !== '' ? value.password : null - } - }); - }); - - success(folders, ciphers, []); - } - }); - } - - function importAscendoCsv(file, success, error) { - Papa.parse(file, { - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - var folders = [], - ciphers = []; - - for (var j = 0; j < results.data.length; j++) { - var row = results.data[j]; - if (row.length < 2) { - continue; - } - - var note = row[row.length - 1]; - var cipher = { - type: constants.cipherType.login, - name: row[0], - favorite: false, - notes: note && note !== '' ? note : null, - login: { - uris: null, - password: null, - username: null - }, - fields: null - }; - - if (row.length > 2 && (row.length % 2) === 0) { - for (var i = 0; i < row.length - 2; i += 2) { - var value = row[i + 2]; - var field = row[i + 1]; - if (!field || field === '' || !value || value === '') { - continue; - } - - var fieldLower = field.toLowerCase(); - - if (!cipher.login.uris && isField(field, _uriFieldNames)) { - cipher.login.uris = makeUriArray(value); - } - else if (!cipher.login.username && isField(field, _usernameFieldNames)) { - cipher.login.username = value; - } - else if (!cipher.login.password && isField(field, _passwordFieldNames)) { - cipher.login.password = value; - } - else if (value.length > 200) { - if (!cipher.notes) { - cipher.notes = ''; - } - - cipher.notes += (field + ': ' + value + '\n'); - } - else { - if (!cipher.fields) { - cipher.fields = []; - } - - // other custom fields - cipher.fields.push({ - name: field, - value: value, - type: constants.fieldType.text - }); - } - } - } - - ciphers.push(cipher); - } - - success(folders, ciphers, []); - } - }); - } - - function importPasswordBossJson(file, success, error) { - var folders = [], - ciphers = [], - i = 0; - - getFileContents(file, parseJson, error); - - function parseJson(fileContent) { - var fileJson = JSON.parse(fileContent); - if (fileJson && fileJson.length) { - for (i = 0; i < fileJson.length; i++) { - var item = fileJson[i]; - - var cipher = { - type: constants.cipherType.login, - favorite: false, - notes: '', - name: item.name && item.name !== '' ? item.name : '--', - login: { - uris: makeUriArray(item.login_url), - username: null, - password: null - }, - fields: null - }; - - if (!item.identifiers) { - continue; - } - - if (item.identifiers.notes && item.identifiers.notes !== '') { - cipher.notes = item.identifiers.notes.split('\\r\\n').join('\n').split('\\n').join('\n'); - } - - for (var property in item.identifiers) { - if (item.identifiers.hasOwnProperty(property)) { - var value = item.identifiers[property]; - if (property === 'notes' || value === '' || value === null) { - continue; - } - - if (property === 'username') { - cipher.login.username = value; - } - else if (property === 'password') { - cipher.login.password = value; - } - else if (value.length > 200) { - if (!cipher.notes) { - cipher.notes = ''; - } - - cipher.notes += (property + ': ' + value + '\n'); - } - else { - if (!cipher.fields) { - cipher.fields = []; - } - - cipher.fields.push({ - name: property, - value: value, - type: constants.fieldType.text - }); - } - } - } - - if (cipher.notes === '') { - cipher.notes = null; - } - - ciphers.push(cipher); - } - } - - success(folders, ciphers, []); - } - } - - function importZohoVaultCsv(file, success, error) { - function parseData(data, cipher) { - if (!data || data === '') { - return; - } - - var dataLines = data.split(/(?:\r\n|\r|\n)/); - for (var i = 0; i < dataLines.length; i++) { - var line = dataLines[i]; - var delimPosition = line.indexOf(':'); - if (delimPosition < 0) { - continue; - } - - var field = line.substring(0, delimPosition); - var value = line.length > delimPosition ? line.substring(delimPosition + 1) : null; - if (!field || field === '' || !value || value === '' || field === 'SecretType') { - continue; - } - - var fieldLower = field.toLowerCase(); - if (fieldLower === 'user name') { - cipher.login.username = value; - } - else if (fieldLower === 'password') { - cipher.login.password = value; - } - else if (value.length > 200) { - if (!cipher.notes) { - cipher.notes = ''; - } - - cipher.notes += (field + ': ' + value + '\n'); - } - else { - if (!cipher.fields) { - cipher.fields = []; - } - - cipher.fields.push({ - name: field, - value: value, - type: constants.fieldType.text - }); - } - } - } - - Papa.parse(file, { - header: true, - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - var folders = [], - ciphers = [], - folderRelationships = []; - - angular.forEach(results.data, function (value, key) { - var chamber = value.ChamberName; - - var folderIndex = folders.length, - cipherIndex = ciphers.length, - hasFolder = chamber && chamber !== '', - addFolder = hasFolder, - i = 0; - - if (hasFolder) { - for (i = 0; i < folders.length; i++) { - if (folders[i].name === chamber) { - addFolder = false; - folderIndex = i; - break; - } - } - } - - var cipher = { - type: constants.cipherType.login, - favorite: value.Favorite && value.Favorite === '1' ? true : false, - notes: value.Notes && value.Notes !== '' ? value.Notes : '', - name: value['Secret Name'] && value['Secret Name'] !== '' ? value['Secret Name'] : '--', - login: { - uris: makeUriArray(value['Secret URL']), - username: null, - password: null - }, - fields: null - }; - - parseData(value.SecretData, cipher); - parseData(value.CustomData, cipher); - - if (cipher.notes === '') { - cipher.notes = null; - } - - if (value['Secret Name']) { - ciphers.push(cipher); - } - - if (addFolder) { - folders.push({ - name: chamber - }); - } - - if (hasFolder) { - var relationship = { - key: cipherIndex, - value: folderIndex - }; - folderRelationships.push(relationship); - } - }); - - success(folders, ciphers, folderRelationships); - } - }); - } - - function importSplashIdCsv(file, success, error) { - Papa.parse(file, { - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - var folders = [], - ciphers = [], - folderRelationships = []; - - function parseFieldsToNotes(startIndex, row, cipher) { - // last 3 rows do not get parsed - for (var k = startIndex; k < row.length - 3; k++) { - if (!row[k] || row[k] === '') { - continue; - } - - if (!cipher.notes) { - cipher.notes = ''; - } - else if (cipher.notes !== '') { - cipher.notes += '\n'; - } - - cipher.notes += row[k]; - } - } - - // skip 1st row since its not data - for (var i = 1; i < results.data.length; i++) { - if (results.data[i].length < 3) { - continue; - } - - var value = results.data[i], - category = value[results.data.length - 1], - notes = value[results.data.length - 2], - type = value[0]; - - var folderIndex = folders.length, - cipherIndex = ciphers.length, - hasFolder = category && category !== '' && category !== 'Unfiled', - addFolder = hasFolder, - j = 0; - - if (hasFolder) { - for (j = 0; j < folders.length; j++) { - if (folders[j].name === category) { - addFolder = false; - folderIndex = j; - break; - } - } - } - - var cipher = { - type: constants.cipherType.login, - favorite: false, - notes: notes, - name: value[1] && value[1] !== '' ? value[1] : '--', - fields: null, - login: { - uris: null, - username: null, - password: null - } - }; - - if (type === 'Web Logins' || type === 'Servers' || type === 'Email Accounts') { - cipher.login.uris = makeUriArray(value[4]); - cipher.login.username = value[2] && value[2] !== '' ? value[2] : null; - cipher.login.password = value[3] && value[3] !== '' ? value[3] : null; - parseFieldsToNotes(5, value, cipher); - } - else if (value.length > 2) { - parseFieldsToNotes(2, value, cipher); - } - - if (cipher.name && cipher.name !== '--' && type !== 'Web Logins' && type !== 'Servers' && - type !== 'Email Accounts') { - cipher.name = type + ': ' + cipher.name; - } - - if (cipher.notes === '') { - cipher.notes = null; - } - - ciphers.push(cipher); - - if (addFolder) { - folders.push({ - name: category - }); - } - - if (hasFolder) { - var relationship = { - key: cipherIndex, - value: folderIndex - }; - folderRelationships.push(relationship); - } - } - - success(folders, ciphers, folderRelationships); - } - }); - } - - function importMeldiumCsv(file, success, error) { - Papa.parse(file, { - header: true, - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - var folders = [], - ciphers = []; - - for (var j = 0; j < results.data.length; j++) { - var row = results.data[j]; - var cipher = { - type: constants.cipherType.login, - name: row.DisplayName && row.DisplayName !== '' ? row.DisplayName : '--', - favorite: false, - notes: row.Notes && row.Notes !== '' ? row.Notes : null, - login: { - uris: makeUriArray(row.Url), - password: row.Password && row.Password !== '' ? row.Password : null, - username: row.UserName && row.UserName !== '' ? row.UserName : null - } - }; - - ciphers.push(cipher); - } - - success(folders, ciphers, []); - } - }); - } - - function importPassKeepCsv(file, success, error) { - function getValue(key, obj) { - var val = obj[key] || obj[(' ' + key)]; - if (val && val !== '') { - return val; - } - - return null; - } - - Papa.parse(file, { - header: true, - encoding: 'UTF-8', - complete: function (results) { - parseCsvErrors(results); - - var folders = [], - ciphers = [], - folderRelationships = []; - - angular.forEach(results.data, function (value, key) { - var folderIndex = folders.length, - cipherIndex = ciphers.length, - hasFolder = !!getValue('category', value), - addFolder = hasFolder, - i = 0; - - if (hasFolder) { - for (i = 0; i < folders.length; i++) { - if (folders[i].name === getValue('category', value)) { - addFolder = false; - folderIndex = i; - break; - } - } - } - - var cipher = { - type: constants.cipherType.login, - favorite: false, - notes: !!getValue('description', value) ? getValue('description', value) : null, - name: !!getValue('title', value) ? getValue('title', value) : '--', - login: { - uris: !!getValue('site', value) ? makeUriArray(getValue('site', value)) : null, - username: !!getValue('username', value) ? getValue('username', value) : null, - password: !!getValue('password', value) ? getValue('password', value) : null - } - }; - - if (!!getValue('password2', value)) { - if (!cipher.notes) { - cipher.notes = ''; - } - else { - cipher.notes += '\n'; - } - - cipher.notes += ('Password 2: ' + getValue('password2', value)); - } - - ciphers.push(cipher); - - if (addFolder) { - folders.push({ - name: getValue('category', value) - }); - } - - if (hasFolder) { - var relationship = { - key: cipherIndex, - value: folderIndex - }; - folderRelationships.push(relationship); - } - }); - - success(folders, ciphers, folderRelationships); - } - }); - } - - function importGnomeJson(file, success, error) { - var folders = [], - ciphers = [], - folderRelationships = [], - i = 0; - - getFileContents(file, parseJson, error); - - function parseJson(fileContent) { - var fileJson = JSON.parse(fileContent); - var folderIndex = 0; - var cipherIndex = 0; - - if (fileJson && Object.keys(fileJson).length) { - for (var keyRing in fileJson) { - if (fileJson.hasOwnProperty(keyRing) && fileJson[keyRing].length) { - folderIndex = folders.length; - folders.push({ - name: keyRing - }); - - for (i = 0; i < fileJson[keyRing].length; i++) { - var item = fileJson[keyRing][i]; - if (!item.display_name || item.display_name.indexOf('http') !== 0) { - continue; - } - - cipherIndex = ciphers.length; - - var cipher = { - type: constants.cipherType.login, - favorite: false, - notes: '', - name: item.display_name.replace('http://', '').replace('https://', ''), - login: { - uris: makeUriArray(item.display_name), - username: item.attributes.username_value && item.attributes.username_value !== '' ? - item.attributes.username_value : null, - password: item.secret && item.secret !== '' ? item.secret : null - } - }; - - if (cipher.name > 30) { - cipher.name = cipher.name.substring(0, 30); - } - - for (var attr in item.attributes) { - if (item.attributes.hasOwnProperty(attr) && attr !== 'username_value' && - attr !== 'xdg:schema') { - if (cipher.notes !== '') { - cipher.notes += '\n'; - } - cipher.notes += (attr + ': ' + item.attributes[attr]); - } - } - - if (cipher.notes === '') { - cipher.notes = null; - } - - ciphers.push(cipher); - folderRelationships.push({ - key: cipherIndex, - value: folderIndex - }); - } - } - } - } - - success(folders, ciphers, folderRelationships); - } - } - - return _service; - }); diff --git a/src/app/services/passwordService.js b/src/app/services/passwordService.js deleted file mode 100644 index 54504f80..00000000 --- a/src/app/services/passwordService.js +++ /dev/null @@ -1,136 +0,0 @@ -angular - .module('bit.services') - - .factory('passwordService', function () { - var _service = {}; - - _service.generatePassword = function (options) { - var defaults = { - length: 10, - ambiguous: false, - number: true, - minNumber: 1, - uppercase: true, - minUppercase: 1, - lowercase: true, - minLowercase: 1, - special: false, - minSpecial: 1 - }; - - // overload defaults with given options - var o = angular.extend({}, defaults, options); - - // sanitize - if (o.uppercase && o.minUppercase < 0) o.minUppercase = 1; - if (o.lowercase && o.minLowercase < 0) o.minLowercase = 1; - if (o.number && o.minNumber < 0) o.minNumber = 1; - if (o.special && o.minSpecial < 0) o.minSpecial = 1; - - if (!o.length || o.length < 1) o.length = 10; - var minLength = o.minUppercase + o.minLowercase + o.minNumber + o.minSpecial; - if (o.length < minLength) o.length = minLength; - - var positions = []; - if (o.lowercase && o.minLowercase > 0) { - for (var i = 0; i < o.minLowercase; i++) { - positions.push('l'); - } - } - if (o.uppercase && o.minUppercase > 0) { - for (var j = 0; j < o.minUppercase; j++) { - positions.push('u'); - } - } - if (o.number && o.minNumber > 0) { - for (var k = 0; k < o.minNumber; k++) { - positions.push('n'); - } - } - if (o.special && o.minSpecial > 0) { - for (var l = 0; l < o.minSpecial; l++) { - positions.push('s'); - } - } - while (positions.length < o.length) { - positions.push('a'); - } - - // shuffle - positions.sort(function () { - return randomInt(0, 1) * 2 - 1; - }); - - // build out the char sets - var allCharSet = ''; - - var lowercaseCharSet = 'abcdefghijkmnopqrstuvwxyz'; - if (o.ambiguous) lowercaseCharSet += 'l'; - if (o.lowercase) allCharSet += lowercaseCharSet; - - var uppercaseCharSet = 'ABCDEFGHIJKLMNPQRSTUVWXYZ'; - if (o.ambiguous) uppercaseCharSet += 'O'; - if (o.uppercase) allCharSet += uppercaseCharSet; - - var numberCharSet = '23456789'; - if (o.ambiguous) numberCharSet += '01'; - if (o.number) allCharSet += numberCharSet; - - var specialCharSet = '!@#$%^&*'; - if (o.special) allCharSet += specialCharSet; - - var password = ''; - for (var m = 0; m < o.length; m++) { - var positionChars; - switch (positions[m]) { - case 'l': positionChars = lowercaseCharSet; break; - case 'u': positionChars = uppercaseCharSet; break; - case 'n': positionChars = numberCharSet; break; - case 's': positionChars = specialCharSet; break; - case 'a': positionChars = allCharSet; break; - } - - var randomCharIndex = randomInt(0, positionChars.length - 1); - password += positionChars.charAt(randomCharIndex); - } - - return password; - }; - - // EFForg/OpenWireless - // ref https://github.com/EFForg/OpenWireless/blob/master/app/js/diceware.js - function randomInt(min, max) { - var rval = 0; - var range = max - min; - - var bits_needed = Math.ceil(Math.log2(range)); - if (bits_needed > 53) { - throw new Exception("We cannot generate numbers larger than 53 bits."); - } - var bytes_needed = Math.ceil(bits_needed / 8); - var mask = Math.pow(2, bits_needed) - 1; - // 7776 -> (2^13 = 8192) -1 == 8191 or 0x00001111 11111111 - - // Create byte array and fill with N random numbers - var byteArray = new Uint8Array(bytes_needed); - window.crypto.getRandomValues(byteArray); - - var p = (bytes_needed - 1) * 8; - for (var i = 0; i < bytes_needed; i++) { - rval += byteArray[i] * Math.pow(2, p); - p -= 8; - } - - // Use & to apply the mask and reduce the number of recursive lookups - rval = rval & mask; - - if (rval >= range) { - // Integer out of acceptable range - return randomInt(min, max); - } - // Return an integer that falls within the range - return min + rval; - } - - return _service; - }); diff --git a/src/app/services/servicesModule.js b/src/app/services/servicesModule.js deleted file mode 100644 index 0fbfca98..00000000 --- a/src/app/services/servicesModule.js +++ /dev/null @@ -1,2 +0,0 @@ -angular - .module('bit.services', ['ngResource', 'ngStorage', 'angular-jwt']); diff --git a/src/app/services/tokenService.js b/src/app/services/tokenService.js deleted file mode 100644 index 3c66b8b4..00000000 --- a/src/app/services/tokenService.js +++ /dev/null @@ -1,90 +0,0 @@ -angular - .module('bit.services') - - .factory('tokenService', function ($sessionStorage, $localStorage, jwtHelper) { - var _service = {}, - _token = null, - _refreshToken = null; - - _service.setToken = function (token) { - $sessionStorage.accessToken = token; - _token = token; - }; - - _service.getToken = function () { - if (!_token) { - _token = $sessionStorage.accessToken; - } - - return _token ? _token : null; - }; - - _service.clearToken = function () { - _token = null; - delete $sessionStorage.accessToken; - }; - - _service.setRefreshToken = function (token) { - $sessionStorage.refreshToken = token; - _refreshToken = token; - }; - - _service.getRefreshToken = function () { - if (!_refreshToken) { - _refreshToken = $sessionStorage.refreshToken; - } - - return _refreshToken ? _refreshToken : null; - }; - - _service.clearRefreshToken = function () { - _refreshToken = null; - delete $sessionStorage.refreshToken; - }; - - _service.setTwoFactorToken = function (token, email) { - if (!$localStorage.twoFactor) { - $localStorage.twoFactor = {}; - } - $localStorage.twoFactor[email] = token; - }; - - _service.getTwoFactorToken = function (email) { - return $localStorage.twoFactor ? $localStorage.twoFactor[email] : null; - }; - - _service.clearTwoFactorToken = function (email) { - if (email) { - if ($localStorage.twoFactor && $localStorage.twoFactor[email]) { - delete $localStorage.twoFactor[email]; - } - } - else { - delete $localStorage.twoFactor; - } - }; - - _service.clearTokens = function () { - _service.clearToken(); - _service.clearRefreshToken(); - }; - - _service.tokenSecondsRemaining = function (token, offsetSeconds) { - var d = jwtHelper.getTokenExpirationDate(token); - offsetSeconds = offsetSeconds || 0; - if (d === null) { - return 0; - } - - var msRemaining = d.valueOf() - (new Date().valueOf() + (offsetSeconds * 1000)); - return Math.round(msRemaining / 1000); - }; - - _service.tokenNeedsRefresh = function (token, minutes) { - minutes = minutes || 5; // default 5 minutes - var sRemaining = _service.tokenSecondsRemaining(token); - return sRemaining < (60 * minutes); - }; - - return _service; - }); diff --git a/src/app/services/utilsService.js b/src/app/services/utilsService.js deleted file mode 100644 index f787b418..00000000 --- a/src/app/services/utilsService.js +++ /dev/null @@ -1,47 +0,0 @@ -angular - .module('bit.services') - - .factory('utilsService', function (constants) { - var _service = {}; - var _browserCache; - - _service.getDeviceType = function (token) { - if (_browserCache) { - return _browserCache; - } - - if (navigator.userAgent.indexOf(' Vivaldi/') >= 0) { - _browserCache = constants.deviceType.vivaldi; - } - else if (!!window.chrome && !!window.chrome.webstore) { - _browserCache = constants.deviceType.chrome; - } - else if (typeof InstallTrigger !== 'undefined') { - _browserCache = constants.deviceType.firefox; - } - else if ((!!window.opr && !!opr.addons) || !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0) { - _browserCache = constants.deviceType.firefox; - } - else if (/constructor/i.test(window.HTMLElement) || - safariCheck(!window.safari || (typeof safari !== 'undefined' && safari.pushNotification))) { - _browserCache = constants.deviceType.opera; - } - else if (!!document.documentMode) { - _browserCache = constants.deviceType.ie; - } - else if (!!window.StyleMedia) { - _browserCache = constants.deviceType.edge; - } - else { - _browserCache = constants.deviceType.unknown; - } - - return _browserCache; - }; - - function safariCheck(p) { - return p.toString() === '[object SafariRemoteNotification]'; - } - - return _service; - }); diff --git a/src/app/services/validationService.js b/src/app/services/validationService.js deleted file mode 100644 index 1e83b2eb..00000000 --- a/src/app/services/validationService.js +++ /dev/null @@ -1,102 +0,0 @@ -angular - .module('bit.services') - - .factory('validationService', function () { - var _service = {}; - - _service.addErrors = function (form, reason) { - var data = reason.data; - var defaultErrorMessage = 'An unexpected error has occurred.'; - form.$errors = []; - - if (!data || !angular.isObject(data)) { - form.$errors.push(defaultErrorMessage); - return; - } - - if (data && data.ErrorModel) { - data = data.ErrorModel; - } - - if (!data.ValidationErrors) { - if (data.Message) { - form.$errors.push(data.Message); - } - else { - form.$errors.push(defaultErrorMessage); - } - - return; - } - - for (var key in data.ValidationErrors) { - if (!data.ValidationErrors.hasOwnProperty(key)) { - continue; - } - - for (var i = 0; i < data.ValidationErrors[key].length; i++) { - _service.addError(form, key, data.ValidationErrors[key][i]); - } - } - }; - - _service.addError = function (form, key, errorMessage, clearExistingErrors) { - if (clearExistingErrors || !form.$errors) { - form.$errors = []; - } - - var pushError = true; - for (var i = 0; i < form.$errors.length; i++) { - if (form.$errors[i] === errorMessage) { - pushError = false; - break; - } - } - - if (pushError) { - form.$errors.push(errorMessage); - } - - if (key && key !== '' && form[key] && form[key].$registerApiError) { - form[key].$registerApiError(); - } - }; - - _service.parseErrors = function (reason) { - var data = reason.data; - var defaultErrorMessage = 'An unexpected error has occurred.'; - var errors = []; - - if (!data || !angular.isObject(data)) { - errors.push(defaultErrorMessage); - return errors; - } - - if (data && data.ErrorModel) { - data = data.ErrorModel; - } - - if (!data.ValidationErrors) { - if (data.Message) { - errors.push(data.Message); - } - else { - errors.push(defaultErrorMessage); - } - } - - for (var key in data.ValidationErrors) { - if (!data.ValidationErrors.hasOwnProperty(key)) { - continue; - } - - for (var i = 0; i < data.ValidationErrors[key].length; i++) { - errors.push(data.ValidationErrors[key][i]); - } - } - - return errors; - }; - - return _service; - }); diff --git a/src/app/settings.js b/src/app/settings.js deleted file mode 100644 index 33c8cf1d..00000000 --- a/src/app/settings.js +++ /dev/null @@ -1,2 +0,0 @@ -angular.module("bit") -.constant("appSettings", {"apiUri":"/api","identityUri":"/identity","iconsUri":"https://icons.bitwarden.com","stripeKey":"pk_live_bpN0P37nMxrMQkcaHXtAybJk","braintreeKey":"production_qfbsv8kc_njj2zjtyngtjmbjd","selfHosted":false,"version":"1.27.0","environment":"Production"}); diff --git a/src/app/settings/settingsAddEditEquivalentDomainController.js b/src/app/settings/settingsAddEditEquivalentDomainController.js deleted file mode 100644 index 3611eed5..00000000 --- a/src/app/settings/settingsAddEditEquivalentDomainController.js +++ /dev/null @@ -1,19 +0,0 @@ -angular - .module('bit.vault') - - .controller('settingsAddEditEquivalentDomainController', function ($scope, $uibModalInstance, $analytics, - domainIndex, domains) { - $analytics.eventTrack('settingsAddEditEquivalentDomainController', { category: 'Modal' }); - - $scope.domains = domains; - $scope.index = domainIndex; - - $scope.submit = function (form) { - $analytics.eventTrack((domainIndex ? 'Edited' : 'Added') + ' Equivalent Domain'); - $uibModalInstance.close({ domains: $scope.domains, index: domainIndex }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('close'); - }; - }); diff --git a/src/app/settings/settingsBillingAdjustStorageController.js b/src/app/settings/settingsBillingAdjustStorageController.js deleted file mode 100644 index ceb1709c..00000000 --- a/src/app/settings/settingsBillingAdjustStorageController.js +++ /dev/null @@ -1,37 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsBillingAdjustStorageController', function ($scope, $state, $uibModalInstance, apiService, - $analytics, toastr, add) { - $analytics.eventTrack('settingsBillingAdjustStorageController', { category: 'Modal' }); - $scope.add = add; - $scope.storageAdjustment = 0; - - $scope.submit = function () { - var request = { - storageGbAdjustment: $scope.storageAdjustment - }; - - if (!add) { - request.storageGbAdjustment *= -1; - } - - $scope.submitPromise = apiService.accounts.putStorage(null, request) - .$promise.then(function (response) { - if (add) { - $analytics.eventTrack('Added Storage'); - toastr.success('You have added ' + $scope.storageAdjustment + ' GB.'); - } - else { - $analytics.eventTrack('Removed Storage'); - toastr.success('You have removed ' + $scope.storageAdjustment + ' GB.'); - } - - $uibModalInstance.close(); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/settings/settingsBillingChangePaymentController.js b/src/app/settings/settingsBillingChangePaymentController.js deleted file mode 100644 index b1a50aac..00000000 --- a/src/app/settings/settingsBillingChangePaymentController.js +++ /dev/null @@ -1,101 +0,0 @@ -angular - .module('bit.organization') - - .controller('settingsBillingChangePaymentController', function ($scope, $state, $uibModalInstance, apiService, - $analytics, toastr, existingPaymentMethod, appSettings, $timeout - // @if !selfHosted - /* jshint ignore:start */ - , stripe - /* jshint ignore:end */ - // @endif - ) { - $analytics.eventTrack('settingsBillingChangePaymentController', { category: 'Modal' }); - $scope.existingPaymentMethod = existingPaymentMethod; - $scope.paymentMethod = 'card'; - $scope.dropinLoaded = false; - $scope.showPaymentOptions = false; - $scope.hideBank = true; - $scope.card = {}; - var btInstance = null; - - $scope.changePaymentMethod = function (val) { - $scope.paymentMethod = val; - if ($scope.paymentMethod !== 'paypal') { - return; - } - - braintree.dropin.create({ - authorization: appSettings.braintreeKey, - container: '#bt-dropin-container', - paymentOptionPriority: ['paypal'], - paypal: { - flow: 'vault', - buttonStyle: { - label: 'pay', - size: 'medium', - shape: 'pill', - color: 'blue' - } - } - }, function (createErr, instance) { - if (createErr) { - console.error(createErr); - return; - } - - btInstance = instance; - $timeout(function () { - $scope.dropinLoaded = true; - }); - }); - }; - - $scope.submit = function () { - $scope.submitPromise = getPaymentToken($scope.card).then(function (token) { - if (!token) { - throw 'No payment token.'; - } - - var request = { - paymentToken: token - }; - - return apiService.accounts.putPayment(null, request).$promise; - }, function (err) { - throw err; - }).then(function (response) { - $scope.card = null; - if (existingPaymentMethod) { - $analytics.eventTrack('Changed Payment Method'); - toastr.success('You have changed your payment method.'); - } - else { - $analytics.eventTrack('Added Payment Method'); - toastr.success('You have added a payment method.'); - } - - $uibModalInstance.close(); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - - function getPaymentToken(card) { - if ($scope.paymentMethod === 'paypal') { - return btInstance.requestPaymentMethod().then(function (payload) { - return payload.nonce; - }).catch(function (err) { - throw err.message; - }); - } - else { - return stripe.card.createToken(card).then(function (response) { - return response.id; - }).catch(function (err) { - throw err.message; - }); - } - } - }); diff --git a/src/app/settings/settingsBillingController.js b/src/app/settings/settingsBillingController.js deleted file mode 100644 index faf498a7..00000000 --- a/src/app/settings/settingsBillingController.js +++ /dev/null @@ -1,225 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsBillingController', function ($scope, apiService, authService, $state, $uibModal, toastr, $analytics, - appSettings) { - $scope.selfHosted = appSettings.selfHosted; - $scope.charges = []; - $scope.paymentSource = null; - $scope.subscription = null; - $scope.loading = true; - var license = null; - $scope.expiration = null; - - $scope.$on('$viewContentLoaded', function () { - load(); - }); - - $scope.changePayment = function () { - if ($scope.selfHosted) { - return; - } - - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/settings/views/settingsBillingChangePayment.html', - controller: 'settingsBillingChangePaymentController', - resolve: { - existingPaymentMethod: function () { - return $scope.paymentSource ? $scope.paymentSource.description : null; - } - } - }); - - modal.result.then(function () { - load(); - }); - }; - - $scope.adjustStorage = function (add) { - if ($scope.selfHosted) { - return; - } - - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/settings/views/settingsBillingAdjustStorage.html', - controller: 'settingsBillingAdjustStorageController', - resolve: { - add: function () { - return add; - } - } - }); - - modal.result.then(function () { - load(); - }); - }; - - $scope.cancel = function () { - if ($scope.selfHosted) { - return; - } - - if (!confirm('Are you sure you want to cancel? You will lose access to all premium features at the end ' + - 'of this billing cycle.')) { - return; - } - - apiService.accounts.putCancelPremium({}, {}) - .$promise.then(function (response) { - $analytics.eventTrack('Canceled Premium'); - toastr.success('Premium subscription has been canceled.'); - load(); - }); - }; - - $scope.reinstate = function () { - if ($scope.selfHosted) { - return; - } - - if (!confirm('Are you sure you want to remove the cancellation request and reinstate your premium membership?')) { - return; - } - - apiService.accounts.putReinstatePremium({}, {}) - .$promise.then(function (response) { - $analytics.eventTrack('Reinstated Premium'); - toastr.success('Premium cancellation request has been removed.'); - load(); - }); - }; - - $scope.updateLicense = function () { - if (!$scope.selfHosted) { - return; - } - - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/settings/views/settingsBillingUpdateLicense.html', - controller: 'settingsBillingUpdateLicenseController' - }); - - modal.result.then(function () { - load(); - }); - }; - - $scope.license = function () { - if ($scope.selfHosted) { - return; - } - - var licenseString = JSON.stringify(license, null, 2); - var licenseBlob = new Blob([licenseString]); - - // IE hack. ref http://msdn.microsoft.com/en-us/library/ie/hh779016.aspx - if (window.navigator.msSaveOrOpenBlob) { - window.navigator.msSaveBlob(licenseBlob, 'bitwarden_premium_license.json'); - } - else { - var a = window.document.createElement('a'); - a.href = window.URL.createObjectURL(licenseBlob, { type: 'text/plain' }); - a.download = 'bitwarden_premium_license.json'; - document.body.appendChild(a); - // IE: "Access is denied". - // ref: https://connect.microsoft.com/IE/feedback/details/797361/ie-10-treats-blob-url-as-cross-origin-and-denies-access - a.click(); - document.body.removeChild(a); - } - }; - - function load() { - authService.getUserProfile().then(function (profile) { - $scope.premium = profile.premium; - if (!profile.premium) { - return null; - } - - return apiService.accounts.getBilling({}).$promise; - }).then(function (billing) { - if (!billing) { - return $state.go('backend.user.settingsPremium'); - } - - var i = 0; - $scope.expiration = billing.Expiration; - license = billing.License; - - $scope.storage = null; - if (billing && billing.MaxStorageGb) { - $scope.storage = { - currentGb: billing.StorageGb || 0, - maxGb: billing.MaxStorageGb, - currentName: billing.StorageName || '0 GB' - }; - - $scope.storage.percentage = +(100 * ($scope.storage.currentGb / $scope.storage.maxGb)).toFixed(2); - } - - $scope.subscription = null; - if (billing && billing.Subscription) { - $scope.subscription = { - trialEndDate: billing.Subscription.TrialEndDate, - cancelledDate: billing.Subscription.CancelledDate, - status: billing.Subscription.Status, - cancelled: billing.Subscription.Cancelled, - markedForCancel: !billing.Subscription.Cancelled && billing.Subscription.CancelAtEndDate - }; - } - - $scope.nextInvoice = null; - if (billing && billing.UpcomingInvoice) { - $scope.nextInvoice = { - date: billing.UpcomingInvoice.Date, - amount: billing.UpcomingInvoice.Amount - }; - } - - if (billing && billing.Subscription && billing.Subscription.Items) { - $scope.subscription.items = []; - for (i = 0; i < billing.Subscription.Items.length; i++) { - $scope.subscription.items.push({ - amount: billing.Subscription.Items[i].Amount, - name: billing.Subscription.Items[i].Name, - interval: billing.Subscription.Items[i].Interval, - qty: billing.Subscription.Items[i].Quantity - }); - } - } - - $scope.paymentSource = null; - if (billing && billing.PaymentSource) { - $scope.paymentSource = { - type: billing.PaymentSource.Type, - description: billing.PaymentSource.Description, - cardBrand: billing.PaymentSource.CardBrand - }; - } - - var charges = []; - if (billing && billing.Charges) { - for (i = 0; i < billing.Charges.length; i++) { - charges.push({ - date: billing.Charges[i].CreatedDate, - paymentSource: billing.Charges[i].PaymentSource ? - billing.Charges[i].PaymentSource.Description : '-', - amount: billing.Charges[i].Amount, - status: billing.Charges[i].Status, - failureMessage: billing.Charges[i].FailureMessage, - refunded: billing.Charges[i].Refunded, - partiallyRefunded: billing.Charges[i].PartiallyRefunded, - refundedAmount: billing.Charges[i].RefundedAmount, - invoiceId: billing.Charges[i].InvoiceId - }); - } - } - $scope.charges = charges; - - $scope.loading = false; - }); - } - }); diff --git a/src/app/settings/settingsBillingUpdateLicenseController.js b/src/app/settings/settingsBillingUpdateLicenseController.js deleted file mode 100644 index 3b5d7fa5..00000000 --- a/src/app/settings/settingsBillingUpdateLicenseController.js +++ /dev/null @@ -1,30 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsBillingUpdateLicenseController', function ($scope, $state, $uibModalInstance, apiService, - $analytics, toastr, validationService) { - $analytics.eventTrack('settingsBillingUpdateLicenseController', { category: 'Modal' }); - - $scope.submit = function (form) { - var fileEl = document.getElementById('file'); - var files = fileEl.files; - if (!files || !files.length) { - validationService.addError(form, 'file', 'Select a license file.', true); - return; - } - - var fd = new FormData(); - fd.append('license', files[0]); - - $scope.submitPromise = apiService.accounts.putLicense(fd) - .$promise.then(function (response) { - $analytics.eventTrack('Updated License'); - toastr.success('You have updated your license.'); - $uibModalInstance.close(); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/settings/settingsChangeEmailController.js b/src/app/settings/settingsChangeEmailController.js deleted file mode 100644 index 04cc5908..00000000 --- a/src/app/settings/settingsChangeEmailController.js +++ /dev/null @@ -1,63 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsChangeEmailController', function ($scope, $state, apiService, $uibModalInstance, cryptoService, - authService, toastr, $analytics, validationService) { - $analytics.eventTrack('settingsChangeEmailController', { category: 'Modal' }); - - var _masterPasswordHash, - _masterPassword, - _newEmail; - - $scope.token = function (model, form) { - var encKey = cryptoService.getEncKey(); - if (!encKey) { - validationService.addError(form, null, - 'You cannot change your email until you update your encryption key.', true); - return; - } - - _masterPassword = model.masterPassword; - _newEmail = model.newEmail.toLowerCase(); - - $scope.tokenPromise = cryptoService.hashPassword(_masterPassword).then(function (hash) { - _masterPasswordHash = hash; - - var request = { - newEmail: _newEmail, - masterPasswordHash: _masterPasswordHash - }; - - return apiService.accounts.emailToken(request, function () { - $scope.tokenSent = true; - }).$promise; - }); - }; - - $scope.confirm = function (model) { - $scope.confirmPromise = cryptoService.makeKeyAndHash(_newEmail, _masterPassword).then(function (result) { - var encKey = cryptoService.getEncKey(); - var newEncKey = cryptoService.encrypt(encKey.key, result.key, 'raw'); - var request = { - token: model.token, - newEmail: _newEmail, - masterPasswordHash: _masterPasswordHash, - newMasterPasswordHash: result.hash, - key: newEncKey - }; - - return apiService.accounts.email(request).$promise; - }).then(function () { - $uibModalInstance.dismiss('cancel'); - authService.logOut(); - $analytics.eventTrack('Changed Email'); - return $state.go('frontend.login.info'); - }).then(function () { - toastr.success('Please log back in.', 'Email Changed'); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/settings/settingsChangePasswordController.js b/src/app/settings/settingsChangePasswordController.js deleted file mode 100644 index 247a99fa..00000000 --- a/src/app/settings/settingsChangePasswordController.js +++ /dev/null @@ -1,63 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsChangePasswordController', function ($scope, $state, apiService, $uibModalInstance, - cryptoService, authService, validationService, toastr, $analytics) { - $analytics.eventTrack('settingsChangePasswordController', { category: 'Modal' }); - - $scope.save = function (model, form) { - var error = false; - - var encKey = cryptoService.getEncKey(); - if (!encKey) { - validationService.addError(form, null, - 'You cannot change your master password until you update your encryption key.', true); - error = true; - } - - if ($scope.model.newMasterPassword.length < 8) { - validationService.addError(form, 'NewMasterPasswordHash', - 'Master password must be at least 8 characters long.', true); - error = true; - } - if ($scope.model.newMasterPassword !== $scope.model.confirmNewMasterPassword) { - validationService.addError(form, 'ConfirmNewMasterPasswordHash', - 'New master password confirmation does not match.', true); - error = true; - } - - if (error) { - return; - } - - var makeResult; - $scope.savePromise = authService.getUserProfile().then(function (profile) { - return cryptoService.makeKeyAndHash(profile.email, model.newMasterPassword); - }).then(function (result) { - makeResult = result; - return cryptoService.hashPassword(model.masterPassword); - }).then(function (hash) { - var encKey = cryptoService.getEncKey(); - var newEncKey = cryptoService.encrypt(encKey.key, makeResult.key, 'raw'); - - var request = { - masterPasswordHash: hash, - newMasterPasswordHash: makeResult.hash, - key: newEncKey - }; - - return apiService.accounts.putPassword(request).$promise; - }).then(function () { - $uibModalInstance.dismiss('cancel'); - authService.logOut(); - $analytics.eventTrack('Changed Password'); - return $state.go('frontend.login.info'); - }).then(function () { - toastr.success('Please log back in.', 'Master Password Changed'); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/settings/settingsController.js b/src/app/settings/settingsController.js deleted file mode 100644 index f31cc37d..00000000 --- a/src/app/settings/settingsController.js +++ /dev/null @@ -1,143 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsController', function ($scope, $state, $uibModal, apiService, toastr, authService, $localStorage, - $rootScope, cipherService) { - $scope.model = { - profile: {}, - email: null, - disableWebsiteIcons: false - }; - - $scope.$on('$viewContentLoaded', function () { - apiService.accounts.getProfile({}, function (user) { - $scope.model = { - profile: { - name: user.Name, - masterPasswordHint: user.MasterPasswordHint, - culture: user.Culture - }, - email: user.Email, - disableWebsiteIcons: $localStorage.disableWebsiteIcons - }; - - if (user.Organizations) { - var orgs = []; - for (var i = 0; i < user.Organizations.length; i++) { - // Only confirmed - if (user.Organizations[i].Status !== 2) { - continue; - } - - orgs.push({ - id: user.Organizations[i].Id, - name: user.Organizations[i].Name, - status: user.Organizations[i].Status, - type: user.Organizations[i].Type, - enabled: user.Organizations[i].Enabled - }); - } - - $scope.model.organizations = orgs; - } - }); - }); - - $scope.generalSave = function () { - $scope.generalPromise = apiService.accounts.putProfile({}, $scope.model.profile, function (profile) { - authService.setUserProfile(profile).then(function (updatedProfile) { - toastr.success('Account has been updated.', 'Success!'); - }); - }).$promise; - }; - - $scope.passwordHintSave = function () { - $scope.passwordHintPromise = apiService.accounts.putProfile({}, $scope.model.profile, function (profile) { - authService.setUserProfile(profile).then(function (updatedProfile) { - toastr.success('Account has been updated.', 'Success!'); - }); - }).$promise; - }; - - $scope.optionsSave = function () { - $localStorage.disableWebsiteIcons = cipherService.disableWebsiteIcons = $scope.model.disableWebsiteIcons; - $rootScope.vaultCiphers = null; - - toastr.success('Options have been updated.', 'Success!'); - }; - - $scope.changePassword = function () { - $uibModal.open({ - animation: true, - templateUrl: 'app/settings/views/settingsChangePassword.html', - controller: 'settingsChangePasswordController' - }); - }; - - $scope.changeEmail = function () { - $uibModal.open({ - animation: true, - templateUrl: 'app/settings/views/settingsChangeEmail.html', - controller: 'settingsChangeEmailController' - }); - }; - - $scope.viewOrganization = function (org) { - if (org.type === 2) { // 2 = User - scrollToTop(); - toastr.error('You cannot manage this organization.'); - return; - } - - $state.go('backend.org.dashboard', { orgId: org.id }); - }; - - $scope.leaveOrganization = function (org) { - if (!confirm('Are you sure you want to leave this organization (' + org.name + ')?')) { - return; - } - - apiService.organizations.postLeave({ id: org.id }, {}, function (response) { - authService.refreshAccessToken().then(function () { - var index = $scope.model.organizations.indexOf(org); - if (index > -1) { - $scope.model.organizations.splice(index, 1); - } - - toastr.success('You have left the organization.'); - scrollToTop(); - }); - }, function (error) { - toastr.error('Unable to leave this organization.'); - scrollToTop(); - }); - }; - - $scope.sessions = function () { - $uibModal.open({ - animation: true, - templateUrl: 'app/settings/views/settingsSessions.html', - controller: 'settingsSessionsController' - }); - }; - - $scope.delete = function () { - $uibModal.open({ - animation: true, - templateUrl: 'app/settings/views/settingsDelete.html', - controller: 'settingsDeleteController' - }); - }; - - $scope.purge = function () { - $uibModal.open({ - animation: true, - templateUrl: 'app/settings/views/settingsPurge.html', - controller: 'settingsPurgeController' - }); - }; - - function scrollToTop() { - $('html, body').animate({ scrollTop: 0 }, 200); - } - }); diff --git a/src/app/settings/settingsCreateOrganizationController.js b/src/app/settings/settingsCreateOrganizationController.js deleted file mode 100644 index 9f5bbf4a..00000000 --- a/src/app/settings/settingsCreateOrganizationController.js +++ /dev/null @@ -1,145 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsCreateOrganizationController', function ($scope, $state, apiService, cryptoService, - toastr, $analytics, authService, constants, appSettings, validationService - // @if !selfHosted - /* jshint ignore:start */ - , stripe - /* jshint ignore:end */ - // @endif - ) { - $scope.plans = constants.plans; - $scope.storageGb = constants.storageGb; - $scope.paymentMethod = 'card'; - $scope.selfHosted = appSettings.selfHosted; - - $scope.model = { - plan: 'free', - additionalSeats: 0, - interval: 'year', - ownedBusiness: false, - additionalStorageGb: null - }; - - $scope.totalPrice = function () { - if ($scope.model.interval === 'month') { - return (($scope.model.additionalSeats || 0) * ($scope.plans[$scope.model.plan].monthlySeatPrice || 0)) + - (($scope.model.additionalStorageGb || 0) * $scope.storageGb.monthlyPrice) + - ($scope.plans[$scope.model.plan].monthlyBasePrice || 0); - } - else { - return (($scope.model.additionalSeats || 0) * ($scope.plans[$scope.model.plan].annualSeatPrice || 0)) + - (($scope.model.additionalStorageGb || 0) * $scope.storageGb.yearlyPrice) + - ($scope.plans[$scope.model.plan].annualBasePrice || 0); - } - }; - - $scope.changePaymentMethod = function (val) { - $scope.paymentMethod = val; - }; - - $scope.changedPlan = function () { - if ($scope.plans[$scope.model.plan].hasOwnProperty('monthPlanType')) { - $scope.model.interval = 'year'; - } - - if ($scope.plans[$scope.model.plan].noAdditionalSeats) { - $scope.model.additionalSeats = 0; - } - else if (!$scope.model.additionalSeats && !$scope.plans[$scope.model.plan].baseSeats && - !$scope.plans[$scope.model.plan].noAdditionalSeats) { - $scope.model.additionalSeats = 1; - } - }; - - $scope.changedBusiness = function () { - if ($scope.model.ownedBusiness) { - $scope.model.plan = 'teams'; - } - }; - - $scope.submit = function (model, form) { - var shareKey = cryptoService.makeShareKey(); - var defaultCollectionCt = cryptoService.encrypt('Default Collection', shareKey.key); - - if ($scope.selfHosted) { - var fileEl = document.getElementById('file'); - var files = fileEl.files; - if (!files || !files.length) { - validationService.addError(form, 'file', 'Select a license file.', true); - return; - } - - var fd = new FormData(); - fd.append('license', files[0]); - fd.append('key', shareKey.ct); - fd.append('collectionName', defaultCollectionCt); - - $scope.submitPromise = apiService.organizations.postLicense(fd).$promise.then(finalizeCreate); - } - else { - if (model.plan === 'free') { - var freeRequest = { - name: model.name, - planType: model.plan, - key: shareKey.ct, - billingEmail: model.billingEmail, - collectionName: defaultCollectionCt - }; - - $scope.submitPromise = apiService.organizations.post(freeRequest).$promise.then(finalizeCreate); - } - else { - var stripeReq = null; - if ($scope.paymentMethod === 'card') { - stripeReq = stripe.card.createToken(model.card); - } - else if ($scope.paymentMethod === 'bank') { - model.bank.currency = 'USD'; - model.bank.country = 'US'; - stripeReq = stripe.bankAccount.createToken(model.bank); - } - else { - return; - } - - $scope.submitPromise = stripeReq.then(function (response) { - var paidRequest = { - name: model.name, - planType: model.interval === 'month' ? $scope.plans[model.plan].monthPlanType : - $scope.plans[model.plan].annualPlanType, - key: shareKey.ct, - paymentToken: response.id, - additionalSeats: model.additionalSeats, - additionalStorageGb: model.additionalStorageGb, - billingEmail: model.billingEmail, - businessName: model.ownedBusiness ? model.businessName : null, - country: $scope.paymentMethod === 'card' ? model.card.address_country : null, - collectionName: defaultCollectionCt - }; - - return apiService.organizations.post(paidRequest).$promise; - }, function (err) { - throw err.message; - }).then(finalizeCreate); - } - } - - function finalizeCreate(result) { - $analytics.eventTrack('Created Organization'); - authService.addProfileOrganizationOwner(result, shareKey.ct); - authService.refreshAccessToken().then(function () { - goToOrg(result.Id); - }, function () { - goToOrg(result.Id); - }); - } - - function goToOrg(id) { - $state.go('backend.org.dashboard', { orgId: id }).then(function () { - toastr.success('Your new organization is ready to go!', 'Organization Created'); - }); - } - }; - }); diff --git a/src/app/settings/settingsDeleteController.js b/src/app/settings/settingsDeleteController.js deleted file mode 100644 index f5d1e303..00000000 --- a/src/app/settings/settingsDeleteController.js +++ /dev/null @@ -1,31 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsDeleteController', function ($scope, $state, apiService, $uibModalInstance, cryptoService, - authService, toastr, $analytics, tokenService) { - $analytics.eventTrack('settingsDeleteController', { category: 'Modal' }); - $scope.submit = function (model) { - var profile; - - $scope.submitPromise = authService.getUserProfile().then(function (theProfile) { - profile = theProfile; - return cryptoService.hashPassword(model.masterPassword); - }).then(function (hash) { - return apiService.accounts.postDelete({ - masterPasswordHash: hash - }).$promise; - }).then(function () { - $uibModalInstance.dismiss('cancel'); - authService.logOut(); - tokenService.clearTwoFactorToken(profile.email); - $analytics.eventTrack('Deleted Account'); - return $state.go('frontend.login.info'); - }).then(function () { - toastr.success('Your account has been closed and all associated data has been deleted.', 'Account Deleted'); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/settings/settingsDomainsController.js b/src/app/settings/settingsDomainsController.js deleted file mode 100644 index cd193b40..00000000 --- a/src/app/settings/settingsDomainsController.js +++ /dev/null @@ -1,103 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsDomainsController', function ($scope, $state, apiService, toastr, $analytics, $uibModal) { - $scope.globalEquivalentDomains = []; - $scope.equivalentDomains = []; - - apiService.settings.getDomains({}, function (response) { - var i; - if (response.EquivalentDomains) { - for (i = 0; i < response.EquivalentDomains.length; i++) { - $scope.equivalentDomains.push(response.EquivalentDomains[i].join(', ')); - } - } - - if (response.GlobalEquivalentDomains) { - for (i = 0; i < response.GlobalEquivalentDomains.length; i++) { - $scope.globalEquivalentDomains.push({ - domains: response.GlobalEquivalentDomains[i].Domains.join(', '), - excluded: response.GlobalEquivalentDomains[i].Excluded, - key: response.GlobalEquivalentDomains[i].Type - }); - } - } - }); - - $scope.toggleExclude = function (globalDomain) { - globalDomain.excluded = !globalDomain.excluded; - }; - - $scope.customize = function (globalDomain) { - globalDomain.excluded = true; - $scope.equivalentDomains.push(globalDomain.domains); - }; - - $scope.delete = function (i) { - $scope.equivalentDomains.splice(i, 1); - $scope.$emit('removeAppendedDropdownMenu'); - }; - - $scope.addEdit = function (i) { - var addEditModal = $uibModal.open({ - animation: true, - templateUrl: 'app/settings/views/settingsAddEditEquivalentDomain.html', - controller: 'settingsAddEditEquivalentDomainController', - resolve: { - domainIndex: function () { return i; }, - domains: function () { return i !== null ? $scope.equivalentDomains[i] : null; } - } - }); - - addEditModal.result.then(function (returnObj) { - if (returnObj.domains) { - returnObj.domains = returnObj.domains.split(' ').join('').split(',').join(', '); - } - - if (returnObj.index !== null) { - $scope.equivalentDomains[returnObj.index] = returnObj.domains; - } - else { - $scope.equivalentDomains.push(returnObj.domains); - } - }); - }; - - $scope.saveGlobal = function () { - $scope.globalPromise = save(); - }; - - $scope.saveCustom = function () { - $scope.customPromise = save(); - }; - - var save = function () { - var request = { - ExcludedGlobalEquivalentDomains: [], - EquivalentDomains: [] - }; - - for (var i = 0; i < $scope.globalEquivalentDomains.length; i++) { - if ($scope.globalEquivalentDomains[i].excluded) { - request.ExcludedGlobalEquivalentDomains.push($scope.globalEquivalentDomains[i].key); - } - } - - for (i = 0; i < $scope.equivalentDomains.length; i++) { - request.EquivalentDomains.push($scope.equivalentDomains[i].split(' ').join('').split(',')); - } - - if (!request.EquivalentDomains.length) { - request.EquivalentDomains = null; - } - - if (!request.ExcludedGlobalEquivalentDomains.length) { - request.ExcludedGlobalEquivalentDomains = null; - } - - return apiService.settings.putDomains(request, function (domains) { - $analytics.eventTrack('Saved Equivalent Domains'); - toastr.success('Domains have been updated.', 'Success!'); - }).$promise; - }; - }); diff --git a/src/app/settings/settingsModule.js b/src/app/settings/settingsModule.js deleted file mode 100644 index 4c5aa7f7..00000000 --- a/src/app/settings/settingsModule.js +++ /dev/null @@ -1,2 +0,0 @@ -angular - .module('bit.settings', ['ui.bootstrap', 'toastr']); diff --git a/src/app/settings/settingsPremiumController.js b/src/app/settings/settingsPremiumController.js deleted file mode 100644 index ca9cd7f3..00000000 --- a/src/app/settings/settingsPremiumController.js +++ /dev/null @@ -1,136 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsPremiumController', function ($scope, $state, apiService, toastr, $analytics, authService, - constants, $timeout, appSettings, validationService - // @if !selfHosted - /* jshint ignore:start */ - , stripe - /* jshint ignore:end */ - // @endif - ) { - var profile = null; - - authService.getUserProfile().then(function (theProfile) { - profile = theProfile; - if (profile && profile.premium) { - return $state.go('backend.user.settingsBilling'); - } - }); - - $scope.selfHosted = appSettings.selfHosted; - - var btInstance = null; - $scope.storageGbPrice = constants.storageGb.yearlyPrice; - $scope.premiumPrice = constants.premium.price; - $scope.paymentMethod = 'card'; - $scope.dropinLoaded = false; - - $scope.model = { - additionalStorageGb: null - }; - - $scope.changePaymentMethod = function (val) { - $scope.paymentMethod = val; - if ($scope.paymentMethod !== 'paypal') { - return; - } - - braintree.dropin.create({ - authorization: appSettings.braintreeKey, - container: '#bt-dropin-container', - paymentOptionPriority: ['paypal'], - paypal: { - flow: 'vault', - buttonStyle: { - label: 'pay', - size: 'medium', - shape: 'pill', - color: 'blue' - } - } - }, function (createErr, instance) { - if (createErr) { - console.error(createErr); - return; - } - - btInstance = instance; - $timeout(function () { - $scope.dropinLoaded = true; - }); - }); - }; - - $scope.totalPrice = function () { - return $scope.premiumPrice + (($scope.model.additionalStorageGb || 0) * $scope.storageGbPrice); - }; - - $scope.submit = function (model, form) { - if ($scope.selfHosted) { - if (profile && !profile.emailVerified) { - validationService.addError(form, null, 'Your account\'s email address first must be verified.', true); - return; - } - - var fileEl = document.getElementById('file'); - var files = fileEl.files; - if (!files || !files.length) { - validationService.addError(form, 'file', 'Select a license file.', true); - return; - } - - var fd = new FormData(); - fd.append('license', files[0]); - - $scope.submitPromise = apiService.accounts.postPremium(fd).$promise.then(function (result) { - return finalizePremium(); - }); - } - else { - $scope.submitPromise = getPaymentToken(model).then(function (token) { - if (!token) { - throw 'No payment token.'; - } - - var fd = new FormData(); - fd.append('paymentToken', token); - fd.append('additionalStorageGb', model.additionalStorageGb || 0); - - return apiService.accounts.postPremium(fd).$promise; - }, function (err) { - throw err; - }).then(function (result) { - return finalizePremium(); - }); - } - }; - - function finalizePremium() { - return authService.updateProfilePremium(true).then(function () { - $analytics.eventTrack('Signed Up Premium'); - return authService.refreshAccessToken(); - }).then(function () { - return $state.go('backend.user.settingsBilling'); - }).then(function () { - toastr.success('Premium upgrade complete.', 'Success'); - }); - } - - function getPaymentToken(model) { - if ($scope.paymentMethod === 'paypal') { - return btInstance.requestPaymentMethod().then(function (payload) { - return payload.nonce; - }).catch(function (err) { - throw err.message; - }); - } - else { - return stripe.card.createToken(model.card).then(function (response) { - return response.id; - }).catch(function (err) { - throw err.message; - }); - } - } - }); diff --git a/src/app/settings/settingsPurgeController.js b/src/app/settings/settingsPurgeController.js deleted file mode 100644 index 74859d78..00000000 --- a/src/app/settings/settingsPurgeController.js +++ /dev/null @@ -1,24 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsPurgeController', function ($scope, $state, apiService, $uibModalInstance, cryptoService, - authService, toastr, $analytics, tokenService) { - $analytics.eventTrack('settingsPurgeController', { category: 'Modal' }); - $scope.submit = function (model) { - $scope.submitPromise = cryptoService.hashPassword(model.masterPassword).then(function (hash) { - return apiService.ciphers.purge({ - masterPasswordHash: hash - }).$promise; - }).then(function () { - $uibModalInstance.dismiss('cancel'); - $analytics.eventTrack('Purged Vault'); - return $state.go('backend.user.vault', { refreshFromServer: true }); - }).then(function () { - toastr.success('All items in your vault have been deleted.', 'Vault Purged'); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/settings/settingsSessionsController.js b/src/app/settings/settingsSessionsController.js deleted file mode 100644 index 9f726a50..00000000 --- a/src/app/settings/settingsSessionsController.js +++ /dev/null @@ -1,32 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsSessionsController', function ($scope, $state, apiService, $uibModalInstance, cryptoService, - authService, tokenService, toastr, $analytics) { - $analytics.eventTrack('settingsSessionsController', { category: 'Modal' }); - $scope.submit = function (model) { - var hash, profile; - - $scope.submitPromise = cryptoService.hashPassword(model.masterPassword).then(function (theHash) { - hash = theHash; - return authService.getUserProfile(); - }).then(function (theProfile) { - profile = theProfile; - return apiService.accounts.putSecurityStamp({ - masterPasswordHash: hash - }).$promise; - }).then(function () { - $uibModalInstance.dismiss('cancel'); - authService.logOut(); - tokenService.clearTwoFactorToken(profile.email); - $analytics.eventTrack('Deauthorized Sessions'); - return $state.go('frontend.login.info'); - }).then(function () { - toastr.success('Please log back in.', 'All Sessions Deauthorized'); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/settings/settingsTwoStepAuthenticatorController.js b/src/app/settings/settingsTwoStepAuthenticatorController.js deleted file mode 100644 index 18fcdf04..00000000 --- a/src/app/settings/settingsTwoStepAuthenticatorController.js +++ /dev/null @@ -1,108 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsTwoStepAuthenticatorController', function ($scope, apiService, $uibModalInstance, cryptoService, - authService, $q, toastr, $analytics, constants, $timeout) { - $analytics.eventTrack('settingsTwoStepAuthenticatorController', { category: 'Modal' }); - var _issuer = 'Bitwarden', - _profile = null, - _masterPasswordHash, - _key = null; - - $timeout(function () { - $("#masterPassword").focus(); - }); - - $scope.auth = function (model) { - var response = null; - $scope.authPromise = cryptoService.hashPassword(model.masterPassword).then(function (hash) { - _masterPasswordHash = hash; - return apiService.twoFactor.getAuthenticator({}, { - masterPasswordHash: _masterPasswordHash - }).$promise; - }).then(function (apiResponse) { - response = apiResponse; - return authService.getUserProfile(); - }).then(function (profile) { - _profile = profile; - $scope.account = _profile.email; - processResponse(response); - }); - }; - - function formatString(s) { - if (!s) { - return null; - } - - return s.replace(/(.{4})/g, '$1 ').trim().toUpperCase(); - } - - function processResponse(response) { - $scope.enabled = response.Enabled; - _key = response.Key; - - $scope.model = { - key: formatString(_key), - qr: 'https://chart.googleapis.com/chart?chs=160x160&chld=L|0&cht=qr&chl=otpauth://totp/' + - _issuer + ':' + encodeURIComponent(_profile.email) + - '%3Fsecret=' + encodeURIComponent(_key) + - '%26issuer=' + _issuer - }; - $scope.updateModel = { - token: null - }; - } - - $scope.submit = function (model) { - if (!model || !model.token) { - disable(); - return; - } - - update(model); - }; - - function disable() { - if (!confirm('Are you sure you want to disable the authenticator app provider?')) { - return; - } - - $scope.submitPromise = apiService.twoFactor.disable({}, { - masterPasswordHash: _masterPasswordHash, - type: constants.twoFactorProvider.authenticator - }, function (response) { - $analytics.eventTrack('Disabled Two-step Authenticator'); - toastr.success('Authenticator app has been disabled.'); - $scope.enabled = response.Enabled; - $scope.close(); - }).$promise; - } - - function update(model) { - $scope.submitPromise = apiService.twoFactor.putAuthenticator({}, { - token: model.token.replace(' ', ''), - key: _key, - masterPasswordHash: _masterPasswordHash - }, function (response) { - $analytics.eventTrack('Enabled Two-step Authenticator'); - processResponse(response); - model.token = null; - }).$promise; - } - - var closing = false; - $scope.close = function () { - closing = true; - $uibModalInstance.close($scope.enabled); - }; - - $scope.$on('modal.closing', function (e, reason, closed) { - if (closing) { - return; - } - - e.preventDefault(); - $scope.close(); - }); - }); diff --git a/src/app/settings/settingsTwoStepController.js b/src/app/settings/settingsTwoStepController.js deleted file mode 100644 index 58cd2efc..00000000 --- a/src/app/settings/settingsTwoStepController.js +++ /dev/null @@ -1,83 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsTwoStepController', function ($scope, apiService, toastr, $analytics, constants, - $filter, $uibModal, authService) { - $scope.providers = $filter('filter')(constants.twoFactorProviderInfo, { organization: false }); - $scope.premium = true; - - authService.getUserProfile().then(function (profile) { - $scope.premium = profile.premium; - return apiService.twoFactor.list({}).$promise; - }).then(function (response) { - if (response.Data) { - for (var i = 0; i < response.Data.length; i++) { - if (!response.Data[i].Enabled) { - continue; - } - - var provider = $filter('filter')($scope.providers, { type: response.Data[i].Type }); - if (provider.length) { - provider[0].enabled = true; - } - } - } - - return; - }); - - $scope.edit = function (provider) { - if (!$scope.premium && !provider.free) { - $uibModal.open({ - animation: true, - templateUrl: 'app/views/premiumRequired.html', - controller: 'premiumRequiredController' - }); - return; - } - - if (provider.type === constants.twoFactorProvider.authenticator) { - typeName = 'Authenticator'; - } - else if (provider.type === constants.twoFactorProvider.email) { - typeName = 'Email'; - } - else if (provider.type === constants.twoFactorProvider.yubikey) { - typeName = 'Yubi'; - } - else if (provider.type === constants.twoFactorProvider.duo) { - typeName = 'Duo'; - } - else if (provider.type === constants.twoFactorProvider.u2f) { - typeName = 'U2f'; - } - else { - return; - } - - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/settings/views/settingsTwoStep' + typeName + '.html', - controller: 'settingsTwoStep' + typeName + 'Controller', - resolve: { - enabled: function () { return provider.enabled; }, - orgId: function () { return null; } - } - }); - - modal.result.then(function (enabled) { - if (enabled || enabled === false) { - // do not adjust when undefined or null - provider.enabled = enabled; - } - }); - }; - - $scope.viewRecover = function () { - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/settings/views/settingsTwoStepRecover.html', - controller: 'settingsTwoStepRecoverController' - }); - }; - }); diff --git a/src/app/settings/settingsTwoStepDuoController.js b/src/app/settings/settingsTwoStepDuoController.js deleted file mode 100644 index ad1b14fd..00000000 --- a/src/app/settings/settingsTwoStepDuoController.js +++ /dev/null @@ -1,124 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsTwoStepDuoController', function ($scope, apiService, $uibModalInstance, cryptoService, - toastr, $analytics, constants, $timeout, orgId) { - $analytics.eventTrack('settingsTwoStepDuoController', { category: 'Modal' }); - var _masterPasswordHash; - - $scope.updateModel = { - token: null, - host: null, - ikey: null, - skey: null - }; - - $timeout(function () { - $("#masterPassword").focus(); - }); - - $scope.auth = function (model) { - $scope.authPromise = cryptoService.hashPassword(model.masterPassword).then(function (hash) { - _masterPasswordHash = hash; - var requestModel = { - masterPasswordHash: _masterPasswordHash - }; - - if (orgId) { - return apiService.twoFactor.getOrganizationDuo({ orgId: orgId }, requestModel).$promise; - } - else { - return apiService.twoFactor.getDuo({}, requestModel).$promise; - } - }).then(function (apiResponse) { - processResult(apiResponse); - $scope.authed = true; - }); - }; - - $scope.submit = function (model) { - if ($scope.enabled) { - disable(); - return; - } - - update(model); - }; - - function disable() { - if (!confirm('Are you sure you want to disable the Duo provider?')) { - return; - } - - if (orgId) { - $scope.submitPromise = apiService.twoFactor.disableOrganization({ orgId: orgId }, { - masterPasswordHash: _masterPasswordHash, - type: constants.twoFactorProvider.organizationDuo - }, function (response) { - $analytics.eventTrack('Disabled Two-step Organization Duo'); - toastr.success('Duo has been disabled.'); - $scope.enabled = response.Enabled; - $scope.close(); - }).$promise; - } - else { - $scope.submitPromise = apiService.twoFactor.disable({}, { - masterPasswordHash: _masterPasswordHash, - type: constants.twoFactorProvider.duo - }, function (response) { - $analytics.eventTrack('Disabled Two-step Duo'); - toastr.success('Duo has been disabled.'); - $scope.enabled = response.Enabled; - $scope.close(); - }).$promise; - } - } - - function update(model) { - var requestModel = { - integrationKey: model.ikey, - secretKey: model.skey, - host: model.host, - masterPasswordHash: _masterPasswordHash - }; - - if (orgId) { - $scope.submitPromise = apiService.twoFactor.putOrganizationDuo({ orgId: orgId }, requestModel, - function (response) { - $analytics.eventTrack('Enabled Two-step Organization Duo'); - processResult(response); - }).$promise; - } - else { - $scope.submitPromise = apiService.twoFactor.putDuo({}, requestModel, - function (response) { - $analytics.eventTrack('Enabled Two-step Duo'); - processResult(response); - }).$promise; - } - } - - function processResult(response) { - $scope.enabled = response.Enabled; - $scope.updateModel = { - ikey: response.IntegrationKey, - skey: response.SecretKey, - host: response.Host - }; - } - - var closing = false; - $scope.close = function () { - closing = true; - $uibModalInstance.close($scope.enabled); - }; - - $scope.$on('modal.closing', function (e, reason, closed) { - if (closing) { - return; - } - - e.preventDefault(); - $scope.close(); - }); - }); diff --git a/src/app/settings/settingsTwoStepEmailController.js b/src/app/settings/settingsTwoStepEmailController.js deleted file mode 100644 index 42133f7a..00000000 --- a/src/app/settings/settingsTwoStepEmailController.js +++ /dev/null @@ -1,114 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsTwoStepEmailController', function ($scope, apiService, $uibModalInstance, cryptoService, - authService, toastr, $analytics, constants, $timeout) { - $analytics.eventTrack('settingsTwoStepEmailController', { category: 'Modal' }); - var _profile = null, - _masterPasswordHash; - - $scope.updateModel = { - token: null, - email: null - }; - - $timeout(function () { - $("#masterPassword").focus(); - }); - - $scope.auth = function (model) { - var response = null; - $scope.authPromise = cryptoService.hashPassword(model.masterPassword).then(function (hash) { - _masterPasswordHash = hash; - return apiService.twoFactor.getEmail({}, { - masterPasswordHash: _masterPasswordHash - }).$promise; - }).then(function (apiResponse) { - response = apiResponse; - return authService.getUserProfile(); - }).then(function (profile) { - _profile = profile; - $scope.enabled = response.Enabled; - $scope.updateModel.email = $scope.enabled ? response.Email : _profile.email; - $scope.authed = true; - }); - }; - - $scope.sendEmail = function (model) { - $scope.emailError = false; - $scope.emailSuccess = false; - - if (!model || !model.email || model.email.indexOf('@') < 0) { - $scope.emailError = true; - $scope.emailSuccess = false; - return; - } - - $scope.emailLoading = true; - apiService.twoFactor.sendEmail({}, { - masterPasswordHash: _masterPasswordHash, - email: model.email - }, function (response) { - $scope.emailError = false; - $scope.emailSuccess = true; - $scope.emailLoading = false; - }, function (response) { - $scope.emailError = true; - $scope.emailSuccess = false; - $scope.emailLoading = false; - }); - }; - - $scope.submit = function (model) { - if (!model || !model.token) { - disable(); - return; - } - - update(model); - }; - - function disable() { - if (!confirm('Are you sure you want to disable the email provider?')) { - return; - } - - $scope.submitPromise = apiService.twoFactor.disable({}, { - masterPasswordHash: _masterPasswordHash, - type: constants.twoFactorProvider.email - }, function (response) { - $analytics.eventTrack('Disabled Two-step Email'); - toastr.success('Email has been disabled.'); - $scope.enabled = response.Enabled; - $scope.close(); - }).$promise; - } - - function update(model) { - $scope.submitPromise = apiService.twoFactor.putEmail({}, { - email: model.email.toLowerCase().trim(), - token: model.token.replace(' ', ''), - masterPasswordHash: _masterPasswordHash - }, function (response) { - $analytics.eventTrack('Enabled Two-step Email'); - $scope.enabled = response.Enabled; - model.email = response.Email; - model.token = null; - }).$promise; - } - - var closing = false; - $scope.close = function () { - closing = true; - $uibModalInstance.close($scope.enabled); - }; - - $scope.$on('modal.closing', function (e, reason, closed) { - if (closing) { - return; - } - - e.preventDefault(); - $scope.close(); - }); - }); diff --git a/src/app/settings/settingsTwoStepRecoverController.js b/src/app/settings/settingsTwoStepRecoverController.js deleted file mode 100644 index 4c2b4dd8..00000000 --- a/src/app/settings/settingsTwoStepRecoverController.js +++ /dev/null @@ -1,49 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsTwoStepRecoverController', function ($scope, apiService, $uibModalInstance, cryptoService, - $analytics, $timeout) { - $analytics.eventTrack('settingsTwoStepRecoverController', { category: 'Modal' }); - $scope.code = null; - - $scope.auth = function (model) { - $scope.authPromise = cryptoService.hashPassword(model.masterPassword).then(function (hash) { - return apiService.twoFactor.getRecover({}, { - masterPasswordHash: hash - }).$promise; - }).then(function (apiResponse) { - $scope.code = formatString(apiResponse.Code); - $scope.authed = true; - }); - }; - - $timeout(function () { - $("#masterPassword").focus(); - }); - - $scope.print = function () { - if (!$scope.code) { - return; - } - - $analytics.eventTrack('Print Recovery Code'); - var w = window.open(); - w.document.write('

Bitwarden two-step login recovery code:

' + - '' + $scope.code + '' + - '

' + new Date() + '

'); - w.print(); - w.close(); - }; - - function formatString(s) { - if (!s) { - return null; - } - - return s.replace(/(.{4})/g, '$1 ').trim().toUpperCase(); - } - - $scope.close = function () { - $uibModalInstance.close(); - }; - }); diff --git a/src/app/settings/settingsTwoStepU2fController.js b/src/app/settings/settingsTwoStepU2fController.js deleted file mode 100644 index c92cf284..00000000 --- a/src/app/settings/settingsTwoStepU2fController.js +++ /dev/null @@ -1,117 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsTwoStepU2fController', function ($scope, apiService, $uibModalInstance, cryptoService, - authService, toastr, $analytics, constants, $timeout, $window) { - $analytics.eventTrack('settingsTwoStepU2fController', { category: 'Modal' }); - var _masterPasswordHash; - var closed = false; - - $scope.deviceResponse = null; - $scope.deviceListening = false; - $scope.deviceError = false; - - $timeout(function () { - $("#masterPassword").focus(); - }); - - $scope.auth = function (model) { - $scope.authPromise = cryptoService.hashPassword(model.masterPassword).then(function (hash) { - _masterPasswordHash = hash; - return apiService.twoFactor.getU2f({}, { - masterPasswordHash: _masterPasswordHash - }).$promise; - }).then(function (response) { - $scope.enabled = response.Enabled; - $scope.challenge = response.Challenge; - $scope.authed = true; - return $scope.readDevice(); - }); - }; - - $scope.readDevice = function () { - if (closed || $scope.enabled) { - return; - } - - console.log('listening for key...'); - - $scope.deviceResponse = null; - $scope.deviceError = false; - $scope.deviceListening = true; - - $window.u2f.register($scope.challenge.AppId, [{ - version: $scope.challenge.Version, - challenge: $scope.challenge.Challenge - }], [], function (data) { - $scope.deviceListening = false; - if (data.errorCode === 5) { - $scope.readDevice(); - return; - } - else if (data.errorCode) { - $timeout(function () { - $scope.deviceError = true; - }); - console.log('error: ' + data.errorCode); - return; - } - - $timeout(function () { - $scope.deviceResponse = JSON.stringify(data); - }); - }, 10); - }; - - $scope.submit = function () { - if ($scope.enabled) { - disable(); - return; - } - - update(); - }; - - function disable() { - if (!confirm('Are you sure you want to disable the U2F provider?')) { - return; - } - - $scope.submitPromise = apiService.twoFactor.disable({}, { - masterPasswordHash: _masterPasswordHash, - type: constants.twoFactorProvider.u2f - }, function (response) { - $analytics.eventTrack('Disabled Two-step U2F'); - toastr.success('U2F has been disabled.'); - $scope.enabled = response.Enabled; - $scope.close(); - }).$promise; - } - - function update() { - $scope.submitPromise = apiService.twoFactor.putU2f({}, { - deviceResponse: $scope.deviceResponse, - masterPasswordHash: _masterPasswordHash - }, function (response) { - $analytics.eventTrack('Enabled Two-step U2F'); - $scope.enabled = response.Enabled; - $scope.challenge = null; - $scope.deviceResponse = null; - $scope.deviceError = false; - }).$promise; - } - - $scope.close = function () { - closed = true; - $uibModalInstance.close($scope.enabled); - }; - - $scope.$on('modal.closing', function (e, reason, isClosed) { - if (closed) { - return; - } - - e.preventDefault(); - $scope.close(); - }); - }); diff --git a/src/app/settings/settingsTwoStepYubiController.js b/src/app/settings/settingsTwoStepYubiController.js deleted file mode 100644 index 7adfe282..00000000 --- a/src/app/settings/settingsTwoStepYubiController.js +++ /dev/null @@ -1,116 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsTwoStepYubiController', function ($scope, apiService, $uibModalInstance, cryptoService, - authService, toastr, $analytics, constants, $timeout) { - $analytics.eventTrack('settingsTwoStepYubiController', { category: 'Modal' }); - var _profile = null, - _masterPasswordHash; - - $timeout(function () { - $("#masterPassword").focus(); - }); - - $scope.auth = function (model) { - var response = null; - $scope.authPromise = cryptoService.hashPassword(model.masterPassword).then(function (hash) { - _masterPasswordHash = hash; - return apiService.twoFactor.getYubi({}, { - masterPasswordHash: _masterPasswordHash - }).$promise; - }).then(function (apiResponse) { - response = apiResponse; - return authService.getUserProfile(); - }).then(function (profile) { - _profile = profile; - processResult(response); - $scope.authed = true; - }); - }; - - $scope.remove = function (model) { - model.key = null; - model.existingKey = null; - }; - - $scope.submit = function (model) { - $scope.submitPromise = apiService.twoFactor.putYubi({}, { - key1: model.key1.key, - key2: model.key2.key, - key3: model.key3.key, - nfc: model.nfc, - masterPasswordHash: _masterPasswordHash - }, function (response) { - $analytics.eventTrack('Saved Two-step YubiKey'); - toastr.success('YubiKey saved.'); - processResult(response); - }).$promise; - }; - - $scope.disable = function () { - if (!confirm('Are you sure you want to disable the YubiKey provider?')) { - return; - } - - $scope.disableLoading = true; - $scope.submitPromise = apiService.twoFactor.disable({}, { - masterPasswordHash: _masterPasswordHash, - type: constants.twoFactorProvider.yubikey - }, function (response) { - $scope.disableLoading = false; - $analytics.eventTrack('Disabled Two-step YubiKey'); - toastr.success('YubiKey has been disabled.'); - $scope.enabled = response.Enabled; - $scope.close(); - }, function (response) { - toastr.error('Failed to disable.'); - $scope.disableLoading = false; - }).$promise; - }; - - function processResult(response) { - $scope.enabled = response.Enabled; - $scope.updateModel = { - key1: { - key: response.Key1, - existingKey: padRight(response.Key1, '*', 44) - }, - key2: { - key: response.Key2, - existingKey: padRight(response.Key2, '*', 44) - }, - key3: { - key: response.Key3, - existingKey: padRight(response.Key3, '*', 44) - }, - nfc: response.Nfc === true || !response.Enabled - }; - } - - function padRight(str, character, size) { - if (!str || !character || str.length >= size) { - return str; - } - - var max = (size - str.length) / character.length; - for (var i = 0; i < max; i++) { - str += character; - } - return str; - } - - var closing = false; - $scope.close = function () { - closing = true; - $uibModalInstance.close($scope.enabled); - }; - - $scope.$on('modal.closing', function (e, reason, closed) { - if (closing) { - return; - } - - e.preventDefault(); - $scope.close(); - }); - }); diff --git a/src/app/settings/settingsUpdateKeyController.js b/src/app/settings/settingsUpdateKeyController.js deleted file mode 100644 index 51114604..00000000 --- a/src/app/settings/settingsUpdateKeyController.js +++ /dev/null @@ -1,81 +0,0 @@ -angular - .module('bit.settings') - - .controller('settingsUpdateKeyController', function ($scope, $state, apiService, $uibModalInstance, cipherService, - cryptoService, authService, validationService, toastr, $analytics, $q) { - $analytics.eventTrack('settingsUpdateKeyController', { category: 'Modal' }); - - $scope.save = function (form) { - var encKey = cryptoService.getEncKey(); - if (encKey) { - validationService.addError(form, 'MasterPasswordHash', - 'You do not need to update. You are already using the new encryption key.', true); - return; - } - - $scope.savePromise = cryptoService.hashPassword($scope.masterPassword).then(function (hash) { - return updateKey(hash); - }).then(function () { - $uibModalInstance.dismiss('cancel'); - authService.logOut(); - $analytics.eventTrack('Key Updated'); - return $state.go('frontend.login.info'); - }, function (e) { - throw e ? e : 'Error occurred.'; - }).then(function () { - toastr.success('Please log back in. If you are using other Bitwarden applications, ' + - 'log out and back in to those as well.', 'Key Updated', { timeOut: 10000 }); - }); - }; - - function updateKey(masterPasswordHash) { - var madeEncKey = cryptoService.makeEncKey(null); - - var reencryptedCiphers = []; - var ciphersPromise = apiService.ciphers.list({}, function (encryptedCiphers) { - var filteredEncryptedCiphers = []; - for (var i = 0; i < encryptedCiphers.Data.length; i++) { - if (encryptedCiphers.Data[i].OrganizationId) { - continue; - } - - filteredEncryptedCiphers.push(encryptedCiphers.Data[i]); - } - - var unencryptedCiphers = cipherService.decryptCiphers(filteredEncryptedCiphers); - reencryptedCiphers = cipherService.encryptCiphers(unencryptedCiphers, madeEncKey.encKey); - }).$promise; - - var reencryptedFolders = []; - var foldersPromise = apiService.folders.list({}, function (encryptedFolders) { - var unencryptedFolders = cipherService.decryptFolders(encryptedFolders.Data); - reencryptedFolders = cipherService.encryptFolders(unencryptedFolders, madeEncKey.encKey); - }).$promise; - - var privateKey = cryptoService.getPrivateKey('raw'), - reencryptedPrivateKey = null; - if (privateKey) { - reencryptedPrivateKey = cryptoService.encrypt(privateKey, madeEncKey.encKey, 'raw'); - } - - return $q.all([ciphersPromise, foldersPromise]).then(function () { - var request = { - masterPasswordHash: masterPasswordHash, - ciphers: reencryptedCiphers, - folders: reencryptedFolders, - privateKey: reencryptedPrivateKey, - key: madeEncKey.encKeyEnc - }; - - return apiService.accounts.putKey(request).$promise; - }, function () { - throw 'Error while encrypting data.'; - }).then(function () { - cryptoService.setEncKey(madeEncKey.encKey, null, true); - }); - } - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/settings/views/settings.html b/src/app/settings/views/settings.html deleted file mode 100644 index 1b50ffb5..00000000 --- a/src/app/settings/views/settings.html +++ /dev/null @@ -1,164 +0,0 @@ -
-

- Settings - manage your account -

-
-
-
-
-

General

-
-
-
-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
- - -
-
- - -
-
-
- -
-
-
-
- - -
-
-
-
-
-

Master Password

-
-
-
-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-
-
-
- - -
-
-
-
-
-

Web Vault Options

-
-
-
-
- -

Website Icons provide a recognizable image next to each login item in your vault.

-
-
-
- -
-
-
-
-
-

Organizations

-
-
- No organizations yet for your account. -
-
-
-
- - -
- - - {{org.name}} - DISABLED - -
-
-
- - Create an Organization - -
-
-
-
-

Danger Zone

-
-
- Careful, these actions are not reversible! -
-
- - - -
-
-
\ No newline at end of file diff --git a/src/app/settings/views/settingsAddEditEquivalentDomain.html b/src/app/settings/views/settingsAddEditEquivalentDomain.html deleted file mode 100644 index b2fcfbcb..00000000 --- a/src/app/settings/views/settingsAddEditEquivalentDomain.html +++ /dev/null @@ -1,35 +0,0 @@ -
- -

{{index ? 'Edit Equivalent Domain' : 'Add Equivalent Domain'}}

-
-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-

- Enter a list of domains separated by commas. -

-
- * - -

- Only "base" domains are allowed. Do not enter subdomains. For example, enter "google.com" instead of - "www.google.com". -

-

- You can also enter "androidapp://package.name" to associate an android app with other website domains. -

-
-
-
- - -
-
\ No newline at end of file diff --git a/src/app/settings/views/settingsBilling.html b/src/app/settings/views/settingsBilling.html deleted file mode 100644 index 5c67d69b..00000000 --- a/src/app/settings/views/settingsBilling.html +++ /dev/null @@ -1,178 +0,0 @@ -
-

Billing manage your membership

-
-
-
-

Canceled

- The premium membership subscription has been canceled. -
-
-

Pending Cancellation

-

- The premium membership has been marked for cancellation at the end of the - current billing period. -

- -
-
-
-

Premium Membership

-
-
-
-
Expiration
-
- Loading... -
-
- {{expiration | date: 'medium'}} -
-
- Never expires -
-
-
-
-
-
Status
-
- {{(subscription && subscription.status) || '-'}} - - marked for cancellation -
-
Next Charge
-
{{nextInvoice ? ((nextInvoice.date | date: 'mediumDate') + ', ' + (nextInvoice.amount | currency:'$')) : '-'}}
-
-
-
- Details -
- Loading... -
-
- - - - - - - -
- {{item.name}} {{item.qty > 1 ? '×' + item.qty : ''}} - @ {{item.amount | currency:'$'}} - {{(item.qty * item.amount) | currency:'$'}} /{{item.interval}}
-
-
-
-
-
- - - -
-
- - - Manage Membership - -
-
-
-
-

Storage

-
-
-

- Your membership has a total of {{storage.maxGb}} GB of encrypted file storage. - You are currently using {{storage.currentName}}. -

-
-
- {{storage.percentage}}% -
-
-
-
- - -
-
-
-
-

Payment Method

-
-
-
- Loading... -
-
- No payment method on file. -
-
- - {{paymentSource.description}} -
-
-
- -
-
-
-
-

Charges

-
-
-
- Loading... -
-
- No charges. -
-
- - - - - - - - - -
- {{charge.date | date: 'mediumDate'}} - - {{charge.paymentSource}} - - {{charge.status}} - - {{charge.amount | currency:'$'}} -
-
-
-
- Note: Any charges will appear on your statement as BITWARDEN. -
-
-
diff --git a/src/app/settings/views/settingsBillingAdjustStorage.html b/src/app/settings/views/settingsBillingAdjustStorage.html deleted file mode 100644 index 2d2315cf..00000000 --- a/src/app/settings/views/settingsBillingAdjustStorage.html +++ /dev/null @@ -1,46 +0,0 @@ -
- -

- - {{add ? 'Add Storage' : 'Remove Storage'}} -

-
-
-
-
-

Note About Charges

-

- Adding storage to your plan will result in adjustments to your billing totals and immediately charge your - payment method on file. The first charge will be prorated for the remainder of the current billing cycle. -

-
-
-

Note About Charges

-

- Removing storage will result in adjustments to your billing totals that will be prorated as credits - to your next billing charge. -

-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
-
-
- - -
-
-
-
-
- - -
-
diff --git a/src/app/settings/views/settingsBillingChangePayment.html b/src/app/settings/views/settingsBillingChangePayment.html deleted file mode 100644 index 5e08b09d..00000000 --- a/src/app/settings/views/settingsBillingChangePayment.html +++ /dev/null @@ -1,433 +0,0 @@ -
- -

- - {{existingPaymentMethod ? 'Change Payment Method' : 'Add Payment Method'}} -

-
-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - - -
-
-
-
-
-
-
-

You must verify your bank account

-

- Payment with a bank account is only available to customers in the United States. - You will be required to verify your bank account. We will make two micro-deposits within the next - 1-2 business days. Enter these amounts in the organization's billing area to verify the bank account. - Failure to verify the bank account will result in a missed payment and your organization being - disabled. -

-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
-
-
- - -
-
-
-
    -
    • -
    • -
    • -
    • -
    • -
    • -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- - -
-
diff --git a/src/app/settings/views/settingsBillingUpdateLicense.html b/src/app/settings/views/settingsBillingUpdateLicense.html deleted file mode 100644 index d26834d2..00000000 --- a/src/app/settings/views/settingsBillingUpdateLicense.html +++ /dev/null @@ -1,30 +0,0 @@ -
- -

- - Update License -

-
-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -

- Select your .json license file. -

-
-
-
- - -
-
diff --git a/src/app/settings/views/settingsChangeEmail.html b/src/app/settings/views/settingsChangeEmail.html deleted file mode 100644 index 05c359d2..00000000 --- a/src/app/settings/views/settingsChangeEmail.html +++ /dev/null @@ -1,58 +0,0 @@ -
- - -
-
-
-

Below you can change your account's email address.

-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
- - -
-
-
- - -
-
-
-
-

We have emailed a verification code to {{model.newEmail}}. Please check your email for this code and enter it below to finalize your the email address change.

-
-

Warning

- Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices - may continue to remain active for up to one hour. -
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-
- - -
-
diff --git a/src/app/settings/views/settingsChangePassword.html b/src/app/settings/views/settingsChangePassword.html deleted file mode 100644 index 0909fedc..00000000 --- a/src/app/settings/views/settingsChangePassword.html +++ /dev/null @@ -1,43 +0,0 @@ -
- - -
-
-
-

Below you can change your account's master password.

-

We recommend that you change your master password immediately if you believe that your credentials have been compromised.

-
-

Warning

- Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices - may continue to remain active for up to one hour. -
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-
- - -
-
- - -
-
-
- - -
-
diff --git a/src/app/settings/views/settingsCreateOrganization.html b/src/app/settings/views/settingsCreateOrganization.html deleted file mode 100644 index 98a9dd8e..00000000 --- a/src/app/settings/views/settingsCreateOrganization.html +++ /dev/null @@ -1,697 +0,0 @@ -
-

Create Organization

-
-
-

- Organizations allow you to share parts of your vault with others as well as manage related users - for a specific entity (such as a family, small team, or large company). -

-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
-
-
-

License

-
-
-

To create an on-premise hosted organization you need to upload a valid license file.

-
- - -

- Your license file will be named something like bitwarden_organization_license.json -

-
-
-
- -
-
-
-
-
-
-

General Information

-
-
-
-
-
- - -
-
-
-
- - -
-
-
-
- -
-
-
-
- - -
-
-
-
-
-
-
-

Choose Your Plan

-
-
-
- -
-
- -
-
- -
-
- -
-
-
- -
-
-
-
-

Additional Users (Seats)

-
-
-

- Your plan comes with {{plans[model.plan].baseSeats}} users (seats). You can add additional users - - (up to {{plans[model.plan].maxAdditionalSeats}} more) - - for {{plans[model.plan].seatPrice | currency:'$'}} per user /month. -

-
-
-
- - -
-
-
-
-
-
-
-

Users (Seats)

-
-
-

- How many user seats do you need? - You can also add additional seats later if needed. -

-
-
-
- - -
-
-
-
-
-
-
-

Additional Storage

-
-
-
-

- Your plan comes with 1 GB of encrypted file storage. You can add additional - storage for {{storageGb.price | currency:"$":2}} per GB /month. -

-
-
- - -
-
-
-
-
-
-
-

Billing Summary

-
-
-
- -
-
- -
-
-
-

- Total: - {{totalPrice() | currency:"USD $":2}} /{{model.interval}} -

- Your plan comes with a free 7 day trial. Your card will not be charged until the trial has ended. - You may cancel at any time. -
-
-
-
-

Payment Information

-
-
- - -
-
-
-

You must verify your bank account

-

- Payment with a bank account is only available to customers in the United States. - You will be required to verify your bank account. We will make two micro-deposits within the next - 1-2 business days. Enter these amounts in the organization's billing area to verify the bank account. - Failure to verify the bank account will result in a missed payment and your organization being - disabled. -

-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
-
-
- - -
-
-
- -
    -
    • -
    • -
    • -
    • -
    • -
    • -
-
-
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- -
-
-
-
-
diff --git a/src/app/settings/views/settingsDelete.html b/src/app/settings/views/settingsDelete.html deleted file mode 100644 index aac207e9..00000000 --- a/src/app/settings/views/settingsDelete.html +++ /dev/null @@ -1,30 +0,0 @@ -
- - -
-
-
-

Continue below to delete your account and all associated data.

-
-

Warning

- Deleting your account is permanent. It cannot be undone. -
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-
- - -
-
diff --git a/src/app/settings/views/settingsDomains.html b/src/app/settings/views/settingsDomains.html deleted file mode 100644 index 9bfe501c..00000000 --- a/src/app/settings/views/settingsDomains.html +++ /dev/null @@ -1,117 +0,0 @@ -
-

Domain Rules

-
-
-

- If you have the same login across multiple different website domains, you can mark the website as "equivalent". - "Global" domains are ones already created for you by Bitwarden. -

-
-
-
-

Custom

-
- -
-
-
-
- - - - - - - - - - - - -
-
- - -
- 		{{customDomain}}
No domains to list.
-
-
-
- -
-
-
- -
-
-
-

Global

-
-
-
- - - - - - - - - - - - -
-
- - -
- 		{{::globalDomain.domains}}
No domains to list.
-
-
-
- -
-
-
-
- diff --git a/src/app/settings/views/settingsPremium.html b/src/app/settings/views/settingsPremium.html deleted file mode 100644 index 95a210e7..00000000 --- a/src/app/settings/views/settingsPremium.html +++ /dev/null @@ -1,487 +0,0 @@ -
-

Premiumget started today!

-
-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
-
-
-
-

Sign up for a premium membership and get:

-
    -
  • - - 1 GB of encrypted file storage. -
    • -
  • - - Additional two-step login options such as YubiKey, FIDO U2F, and Duo. -
    • -
  • - - TOTP verification code (2FA) generator for logins in your vault. -
    • -
  • - - Priority customer support. -
    • -
  • - - All future premium features. More coming soon! -
    • -
-
-
- all for just
- {{premiumPrice | currency:"$":0}} /year -
-
-
-
- - Purchase Premium - -
-
-
-
-
-

License

-
-
-

To upgrade your account to a premium membership you need to upload a valid license file.

-
- - -

- Your license file will be named something like bitwarden_premium_license.json -

-
-
-
- -
-
-
-
-
-
-

Addons

-
-
-
- -

- Your plan comes with 1 GB of encrypted file storage. You can add additional - storage for {{storageGbPrice | currency:"$":0}} per GB /year. -

-
-
- -
-
-
-
-
-
-
-

Billing Summary

-
-
- Premium membership: - {{premiumPrice | currency:"$"}}
- Additional storage: - {{model.additionalStorageGb || 0}} GB × {{storageGbPrice | currency:"$"}} = - {{(model.additionalStorageGb || 0) * storageGbPrice | currency:"$"}} -
-
-

- Total: - {{totalPrice() | currency:"USD $"}} /year -

- Your card will be charged immediately and on a recurring basis each year. You may cancel at any time. -
-
-
-
-

Payment Information

-
-
- - -
-
-
-
-
-
-
-
- - -
-
-
- -
    -
    • -
    • -
    • -
    • -
    • -
    • -
-
-
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- -
-
-
-
-
diff --git a/src/app/settings/views/settingsPurge.html b/src/app/settings/views/settingsPurge.html deleted file mode 100644 index b73d7738..00000000 --- a/src/app/settings/views/settingsPurge.html +++ /dev/null @@ -1,33 +0,0 @@ -
- -

Purge Vault

-
-
-
-

- Continue below to delete all items in your vault. Items that belong to an organization that you share - with will not be deleted. -

-
-

Warning

- Purging your vault is permanent. It cannot be undone. -
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-
- - -
-
diff --git a/src/app/settings/views/settingsSessions.html b/src/app/settings/views/settingsSessions.html deleted file mode 100644 index 5f612a36..00000000 --- a/src/app/settings/views/settingsSessions.html +++ /dev/null @@ -1,37 +0,0 @@ -
- - -
-
-
-

Concerned your account is logged in on another device?

-

Proceed below to deauthorize all computers or devices that you have previously used.

-

- This security step is recommended if you previously used a public PC or accidentally saved your password - on a device that isn't yours. This step will also clear all previously remembered two-step login sessions. -

-
-

Warning

- Proceeding will also log you out of your current session, requiring you to log back in. You will also be prompted - for two-step login again, if enabled. Active sessions on other devices may continue to remain active for up to - one hour. -
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-
- - -
-
diff --git a/src/app/settings/views/settingsTwoStep.html b/src/app/settings/views/settingsTwoStep.html deleted file mode 100644 index 799f6571..00000000 --- a/src/app/settings/views/settingsTwoStep.html +++ /dev/null @@ -1,52 +0,0 @@ -
-

Two-step Login secure your account

-
-
-
-
-

Recovery Code

-
-
- The recovery code allows you to access your account in the event that you can no longer use your normal - two-step login provider (ex. you lose your device). Bitwarden support will not be able to assist you if you lose - access to your account. We recommend you write down or print the recovery code and keep it in a safe place. -
-
- -
-
-
-
-

Providers

-
-
-
- - - - - - - - -
- - {{::provider.name}} - - - - {{::provider.name}} - PREMIUM - -
{{::provider.description}}
- 		- - {{provider.enabled ? 'Enabled' : 'Disabled'}} - -
-
-
-
-
diff --git a/src/app/settings/views/settingsTwoStepAuthenticator.html b/src/app/settings/views/settingsTwoStepAuthenticator.html deleted file mode 100644 index 29d8f0e4..00000000 --- a/src/app/settings/views/settingsTwoStepAuthenticator.html +++ /dev/null @@ -1,116 +0,0 @@ -
- -

- Two-step Login authenticator app -

-
-
-
-

Enter your master password to modify two-step login settings.

-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-
- - -
-
-
-
-
-
-

Enabled

-

- Two-step login via authenticator app is enabled on your account. -

-

- In case you need to add it to another device, below is the QR code (or key) required by your - authenticator app. -

-
-

Need a two-step authenticator app? Download one of the following:

-
-
-

Setting up two-step login with an authenticator app is easy, just follow these steps:

-

1. Download a two-step authenticator app

-
- -

These apps are recommended, however, other authenticator apps will also work.

-
-

2. Scan this QR code with your authenticator app

-
-
-

QR

-
-
-

- Can't scan the code? You can add the code to your application manually using the - following details: -

-
    -
  • Key: {{model.key}}
    • -
  • Account: {{account}}
    • -
  • Time based: Yes
    • -
-
-
-
-

- 3. Enter the resulting 6 digit verification code from the app -

-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-
-
- - -
-
diff --git a/src/app/settings/views/settingsTwoStepDuo.html b/src/app/settings/views/settingsTwoStepDuo.html deleted file mode 100644 index b93cbcd0..00000000 --- a/src/app/settings/views/settingsTwoStepDuo.html +++ /dev/null @@ -1,76 +0,0 @@ -
- -

- Two-step Login duo -

-
-
-
-

Enter your master password to modify two-step login settings.

-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-
- - -
-
-
-
-
-
-

Enabled

-

Two-step log via Duo is enabled on your account.

-
-
    -
  • Integration Key: {{updateModel.ikey}}
    • -
  • Secret Key: ************
    • -
  • API Hostname: {{updateModel.host}}
    • -
-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-

Enter the Bitwarden application information from your Duo Admin panel:

-
- - -
-
- - -
-
- - -
-
-
-
- - -
-
diff --git a/src/app/settings/views/settingsTwoStepEmail.html b/src/app/settings/views/settingsTwoStepEmail.html deleted file mode 100644 index 82331652..00000000 --- a/src/app/settings/views/settingsTwoStepEmail.html +++ /dev/null @@ -1,77 +0,0 @@ -
- -

- Two-step Login email -

-
-
-
-

Enter your master password to modify two-step login settings.

-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-
- - -
-
-
-
-
-
-

Enabled

-

Two-step log via email is enabled on your account.

-
- Email: {{updateModel.email}} -
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-

Setting up two-step login with email is easy, just follow these steps:

-

1. Enter the email that you wish to receive verification codes

-
- - -
- - Verification code email was sent. - An error occurred when trying to send the email. -

- 2. Enter the resulting 6 digit verification code from the email -

-
- - -
-
-
-
- - -
-
diff --git a/src/app/settings/views/settingsTwoStepRecover.html b/src/app/settings/views/settingsTwoStepRecover.html deleted file mode 100644 index 82b6a84d..00000000 --- a/src/app/settings/views/settingsTwoStepRecover.html +++ /dev/null @@ -1,48 +0,0 @@ -
- -

- Two-step Login recovery code -

-
-
-
-

Enter your master password to view your recovery code.

-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-
- - -
-
-
-
-
-

Your two-step login recovery code:

-

{{code}}

-
-
- You have not enabled any two-step login providers yet. After you have enabled a two-step login provider you can - check back here for your recovery code. -
-
-
- - -
-
diff --git a/src/app/settings/views/settingsTwoStepU2f.html b/src/app/settings/views/settingsTwoStepU2f.html deleted file mode 100644 index 1a2e3cff..00000000 --- a/src/app/settings/views/settingsTwoStepU2f.html +++ /dev/null @@ -1,93 +0,0 @@ -
- -

- Two-step Login fido u2f -

-
-
-
-

Enter your master password to modify two-step login settings.

-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-
- - -
-
-
-
-
-

Warning

-

- Due to platform limitations, FIDO U2F cannot be used on all Bitwarden applications. You should enable - another two-step login provider so that you can access your account when FIDO U2F cannot be used. -

-

Supported platforms:

-
    -
  • - Web vault on a desktop/laptop with a U2F enabled browser (Chrome, Opera, Vivaldi, Brave, or Firefox with addon). -
    • -
  • Browser extensions on Chrome, Opera, Vivaldi, or Brave.
    • -
-
-
-
-

Enabled

-

Two-step log via FIDO U2F is enabled on your account.

-
-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-

To add a new FIDO U2F Security Key to your account:

-
    -
  1. Plug the security key into your computer's USB port.
    2. -
  2. If the security key has a button, touch it.
    3. -
-
-
-
-

-

Waiting for you to touch the button on your security key...

-
-
-

-

Success!

- Click the "Enable" button below to enable this security key for two-step login. -
-
-

-

Error!

-

There was a problem reading the security key.

- -
-
-
-
-
- - -
-
diff --git a/src/app/settings/views/settingsTwoStepYubi.html b/src/app/settings/views/settingsTwoStepYubi.html deleted file mode 100644 index d9e92004..00000000 --- a/src/app/settings/views/settingsTwoStepYubi.html +++ /dev/null @@ -1,127 +0,0 @@ -
- -

- Two-step Login yubikey -

-
-
-
-

Enter your master password to modify two-step login settings.

-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-
- - -
-
-
-
-
-

Warning

-

- Due to platform limitations, YubiKeys cannot be used on all Bitwarden applications. You should enable - another two-step login provider so that you can access your account when YubiKeys cannot be used. -

-

Supported platforms:

-
    -
  • Web vault on a device with a USB port that can accept your YubiKey.
    • -
  • Browser extensions.
    • -
  • - Android on a device with - - NFC capabilities - . Read more here. -
    • -
-
-
-
-

Enabled

-

Two-step log via YubiKey is enabled on your account.

-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-

To add a new YubiKey to your account:

-
    -
  1. Plug the YubiKey (NEO or 4 series) into your computer's USB port.
    2. -
  2. Select in the first empty Key field below.
    3. -
  3. Touch the YubiKey's button.
    4. -
  4. Save the form.
    5. -
-
-
- - - [remove] - -
- {{updateModel.key1.existingKey}} -
- -
-
- - - [remove] - -
- {{updateModel.key2.existingKey}} -
- -
-
- - - [remove] - -
- {{updateModel.key3.existingKey}} -
- -
- NFC Support -
- -
-

- If one of your YubiKeys supports NFC (such as a YubiKey NEO), you will be prompted on mobile devices whenever NFC - availability is detected. -

-
-
- - - -
-
diff --git a/src/app/settings/views/settingsUpdateKey.html b/src/app/settings/views/settingsUpdateKey.html deleted file mode 100644 index d72523f0..00000000 --- a/src/app/settings/views/settingsUpdateKey.html +++ /dev/null @@ -1,47 +0,0 @@ -
- -

Update Encryption Key

-
-
-
-

- This is NOT a security notification indicating that anything is wrong or has been compromised on your - account. If interested, you can - read more details here. -

-
-

- You are currently using an outdated encryption scheme. We've moved to larger encryption keys - that provide better security and access to newer features. -

-

- Updating your encryption key is quick and easy. Just type your master password below and you're done! - This update will eventually become mandatory. -

-
-
-

Warning

- After updating your encryption key, you are required to log out and back in to all Bitwarden applications that you - are currently using (such as the mobile app or browser extensions). Failure to log out and back - in (which downloads your new encryption key) may result in data corruption. We will attempt to log you out - automatically, however it may be delayed. -
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-
- - -
-
diff --git a/src/app/tools/toolsController.js b/src/app/tools/toolsController.js deleted file mode 100644 index fba3fe88..00000000 --- a/src/app/tools/toolsController.js +++ /dev/null @@ -1,20 +0,0 @@ -angular - .module('bit.tools') - - .controller('toolsController', function ($scope, $uibModal, apiService, toastr, authService) { - $scope.import = function () { - $uibModal.open({ - animation: true, - templateUrl: 'app/tools/views/toolsImport.html', - controller: 'toolsImportController' - }); - }; - - $scope.export = function () { - $uibModal.open({ - animation: true, - templateUrl: 'app/tools/views/toolsExport.html', - controller: 'toolsExportController' - }); - }; - }); diff --git a/src/app/tools/toolsExportController.js b/src/app/tools/toolsExportController.js deleted file mode 100644 index 5d6aa0bd..00000000 --- a/src/app/tools/toolsExportController.js +++ /dev/null @@ -1,145 +0,0 @@ -angular - .module('bit.tools') - - .controller('toolsExportController', function ($scope, apiService, $uibModalInstance, cipherService, $q, - toastr, $analytics, constants) { - $analytics.eventTrack('toolsExportController', { category: 'Modal' }); - $scope.export = function (model) { - $scope.startedExport = true; - var decCiphers = [], - decFolders = []; - - var folderPromise = apiService.folders.list({}, function (folders) { - decFolders = cipherService.decryptFolders(folders.Data); - }).$promise; - - var ciphersPromise = apiService.ciphers.list({}, function (ciphers) { - decCiphers = cipherService.decryptCiphers(ciphers.Data); - }).$promise; - - $q.all([folderPromise, ciphersPromise]).then(function () { - if (!decCiphers.length) { - toastr.error('Nothing to export.', 'Error!'); - $scope.close(); - return; - } - - var foldersDict = {}; - for (var i = 0; i < decFolders.length; i++) { - foldersDict[decFolders[i].id] = decFolders[i]; - } - - try { - var exportCiphers = []; - for (i = 0; i < decCiphers.length; i++) { - // only export logins and secure notes - if (decCiphers[i].type !== constants.cipherType.login && - decCiphers[i].type !== constants.cipherType.secureNote) { - continue; - } - - var cipher = { - folder: decCiphers[i].folderId && (decCiphers[i].folderId in foldersDict) ? - foldersDict[decCiphers[i].folderId].name : null, - favorite: decCiphers[i].favorite ? 1 : null, - type: null, - name: decCiphers[i].name, - notes: decCiphers[i].notes, - fields: null, - // Login props - login_uri: null, - login_username: null, - login_password: null, - login_totp: null - }; - - var j; - if (decCiphers[i].fields) { - for (j = 0; j < decCiphers[i].fields.length; j++) { - if (!cipher.fields) { - cipher.fields = ''; - } - else { - cipher.fields += '\n'; - } - - cipher.fields += ((decCiphers[i].fields[j].name || '') + ': ' + decCiphers[i].fields[j].value); - } - } - - switch (decCiphers[i].type) { - case constants.cipherType.login: - cipher.type = 'login'; - cipher.login_username = decCiphers[i].login.username; - cipher.login_password = decCiphers[i].login.password; - cipher.login_totp = decCiphers[i].login.totp; - - if (decCiphers[i].login.uris && decCiphers[i].login.uris.length) { - cipher.login_uri = []; - for (j = 0; j < decCiphers[i].login.uris.length; j++) { - cipher.login_uri.push(decCiphers[i].login.uris[j].uri); - } - } - break; - case constants.cipherType.secureNote: - cipher.type = 'note'; - break; - default: - continue; - } - - exportCiphers.push(cipher); - } - - var csvString = Papa.unparse(exportCiphers); - var csvBlob = new Blob([csvString]); - - // IE hack. ref http://msdn.microsoft.com/en-us/library/ie/hh779016.aspx - if (window.navigator.msSaveOrOpenBlob) { - window.navigator.msSaveBlob(csvBlob, makeFileName()); - } - else { - var a = window.document.createElement('a'); - a.href = window.URL.createObjectURL(csvBlob, { type: 'text/plain' }); - a.download = makeFileName(); - document.body.appendChild(a); - // IE: "Access is denied". - // ref: https://connect.microsoft.com/IE/feedback/details/797361/ie-10-treats-blob-url-as-cross-origin-and-denies-access - a.click(); - document.body.removeChild(a); - } - - $analytics.eventTrack('Exported Data'); - toastr.success('Your data has been exported. Check your browser\'s downloads folder.', 'Success!'); - $scope.close(); - } - catch (err) { - toastr.error('Something went wrong. Please try again.', 'Error!'); - $scope.close(); - } - }, function () { - toastr.error('Something went wrong. Please try again.', 'Error!'); - $scope.close(); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - - function makeFileName() { - var now = new Date(); - var dateString = - now.getFullYear() + '' + padNumber(now.getMonth() + 1, 2) + '' + padNumber(now.getDate(), 2) + - padNumber(now.getHours(), 2) + '' + padNumber(now.getMinutes(), 2) + - padNumber(now.getSeconds(), 2); - - return 'bitwarden_export_' + dateString + '.csv'; - } - - function padNumber(number, width, paddingCharacter) { - paddingCharacter = paddingCharacter || '0'; - number = number + ''; - return number.length >= width ? number : new Array(width - number.length + 1).join(paddingCharacter) + number; - } - }); diff --git a/src/app/tools/toolsImportController.js b/src/app/tools/toolsImportController.js deleted file mode 100644 index 39f53523..00000000 --- a/src/app/tools/toolsImportController.js +++ /dev/null @@ -1,344 +0,0 @@ -angular - .module('bit.tools') - - .controller('toolsImportController', function ($scope, $state, apiService, $uibModalInstance, cryptoService, cipherService, - toastr, importService, $analytics, $sce, validationService) { - $analytics.eventTrack('toolsImportController', { category: 'Modal' }); - $scope.model = { source: '' }; - $scope.source = {}; - $scope.splitFeatured = true; - - $scope.options = [ - { - id: 'bitwardencsv', - name: 'Bitwarden (csv)', - featured: true, - sort: 1, - instructions: $sce.trustAsHtml('Export using the web vault (vault.bitwarden.com). ' + - 'Log into the web vault and navigate to "Tools" > "Export".') - }, - { - id: 'lastpass', - name: 'LastPass (csv)', - featured: true, - sort: 2, - instructions: $sce.trustAsHtml('See detailed instructions on our help site at ' + - '' + - 'https://help.bitwarden.com/article/import-from-lastpass/') - }, - { - id: 'chromecsv', - name: 'Chrome (csv)', - featured: true, - sort: 3, - instructions: $sce.trustAsHtml('See detailed instructions on our help site at ' + - '' + - 'https://help.bitwarden.com/article/import-from-chrome/') - }, - { - id: 'firefoxpasswordexportercsv', - name: 'Firefox Password Exporter (csv)', - featured: true, - sort: 4, - instructions: $sce.trustAsHtml('Use the ' + - '' + - 'FF Password Exporter application to export your passwords to a CSV file.') - }, - { - id: 'keepass2xml', - name: 'KeePass 2 (xml)', - featured: true, - sort: 5, - instructions: $sce.trustAsHtml('Using the KeePass 2 desktop application, navigate to "File" > "Export" and ' + - 'select the KeePass XML (2.x) option.') - }, - { - id: 'keepassxcsv', - name: 'KeePassX (csv)', - instructions: $sce.trustAsHtml('Using the KeePassX desktop application, navigate to "Database" > ' + - '"Export to CSV file" and save the CSV file.') - }, - { - id: 'dashlanecsv', - name: 'Dashlane (csv)', - featured: true, - sort: 7, - instructions: $sce.trustAsHtml('Using the Dashlane desktop application, navigate to "File" > "Export" > ' + - '"Unsecured archive (readable) in CSV format" and save the CSV file.') - }, - { - id: '1password1pif', - name: '1Password (1pif)', - featured: true, - sort: 6, - instructions: $sce.trustAsHtml('See detailed instructions on our help site at ' + - '' + - 'https://help.bitwarden.com/article/import-from-1password/') - }, - { - id: '1password6wincsv', - name: '1Password 6 Windows (csv)', - instructions: $sce.trustAsHtml('See detailed instructions on our help site at ' + - '' + - 'https://help.bitwarden.com/article/import-from-1password/') - }, - { - id: 'roboformhtml', - name: 'RoboForm (html)', - instructions: $sce.trustAsHtml('Using the RoboForm Editor desktop application, navigate to "RoboForm" ' + - '(top left) > "Print List" > "Logins". When the following print dialog pops up click on the "Save" button ' + - 'and save the HTML file.') - }, - { - id: 'keepercsv', - name: 'Keeper (csv)', - instructions: $sce.trustAsHtml('Log into the Keeper web vault (keepersecurity.com/vault). Navigate to "Backup" ' + - '(top right) and find the "Export to Text File" option. Click "Export Now" to save the TXT/CSV file.') - }, - { - id: 'enpasscsv', - name: 'Enpass (csv)', - instructions: $sce.trustAsHtml('Using the Enpass desktop application, navigate to "File" > "Export" > ' + - '"As CSV". Select "Yes" to the warning alert and save the CSV file. Note that the importer only fully ' + - 'supports files exported while Enpass is set to the English language, so adjust your settings accordingly.') - }, - { - id: 'safeincloudxml', - name: 'SafeInCloud (xml)', - instructions: $sce.trustAsHtml('Using the SaveInCloud desktop application, navigate to "File" > "Export" > ' + - '"As XML" and save the XML file.') - }, - { - id: 'pwsafexml', - name: 'Password Safe (xml)', - instructions: $sce.trustAsHtml('Using the Password Safe desktop application, navigate to "File" > ' + - '"Export To" > "XML format..." and save the XML file.') - }, - { - id: 'stickypasswordxml', - name: 'Sticky Password (xml)', - instructions: $sce.trustAsHtml('Using the Sticky Password desktop application, navigate to "Menu" ' + - '(top right) > "Export" > "Export all". Select the unencrypted format XML option and then the ' + - '"Save to file" button. Save the XML file.') - }, - { - id: 'msecurecsv', - name: 'mSecure (csv)', - instructions: $sce.trustAsHtml('Using the mSecure desktop application, navigate to "File" > ' + - '"Export" > "CSV File..." and save the CSV file.') - }, - { - id: 'truekeycsv', - name: 'True Key (csv)', - instructions: $sce.trustAsHtml('Using the True Key desktop application, click the gear icon (top right) and ' + - 'then navigate to "App Settings". Click the "Export" button, enter your password and save the CSV file.') - }, - { - id: 'passwordbossjson', - name: 'Password Boss (json)', - instructions: $sce.trustAsHtml('Using the Password Boss desktop application, navigate to "File" > ' + - '"Export data" > "Password Boss JSON - not encrypted" and save the JSON file.') - }, - { - id: 'zohovaultcsv', - name: 'Zoho Vault (csv)', - instructions: $sce.trustAsHtml('Log into the Zoho web vault (vault.zoho.com). Navigate to "Tools" > ' + - '"Export Secrets". Select "All Secrets" and click the "Zoho Vault Format CSV" button. Highlight ' + - 'and copy the data from the textarea. Open a text editor like Notepad and paste the data. Save the ' + - 'data from the text editor as zoho_export.csv.') - }, - { - id: 'splashidcsv', - name: 'SplashID (csv)', - instructions: $sce.trustAsHtml('Using the SplashID Safe desktop application, click on the SplashID ' + - 'blue lock logo in the top right corner. Navigate to "Export" > "Export as CSV" and save the CSV file.') - }, - { - id: 'passworddragonxml', - name: 'Password Dragon (xml)', - instructions: $sce.trustAsHtml('Using the Password Dragon desktop application, navigate to "File" > ' + - '"Export" > "To XML". In the dialog that pops up select "All Rows" and check all fields. Click ' + - 'the "Export" button and save the XML file.') - }, - { - id: 'padlockcsv', - name: 'Padlock (csv)', - instructions: $sce.trustAsHtml('Using the Padlock desktop application, click the hamburger icon ' + - 'in the top left corner and navigate to "Settings". Click the "Export Data" option. Ensure that ' + - 'the "CSV" option is selected from the dropdown. Highlight and copy the data from the textarea. ' + - 'Open a text editor like Notepad and paste the data. Save the data from the text editor as ' + - 'padlock_export.csv.') - }, - { - id: 'clipperzhtml', - name: 'Clipperz (html)', - instructions: $sce.trustAsHtml('Log into the Clipperz web application (clipperz.is/app). Click the ' + - 'hamburger menu icon in the top right to expand the navigation bar. Navigate to "Data" > ' + - '"Export". Click the "download HTML+JSON" button to save the HTML file.') - }, - { - id: 'avirajson', - name: 'Avira (json)', - instructions: $sce.trustAsHtml('Using the Avira browser extension, click your username in the top ' + - 'right corner and navigate to "Settings". Locate the "Export Data" section and click "Export". ' + - 'In the dialog that pops up, click the "Export Password Manager Data" button to save the ' + - 'TXT/JSON file.') - }, - { - id: 'saferpasscsv', - name: 'SaferPass (csv)', - instructions: $sce.trustAsHtml('Using the SaferPass browser extension, click the hamburger icon ' + - 'in the top left corner and navigate to "Settings". Click the "Export accounts" button to ' + - 'save the CSV file.') - }, - { - id: 'upmcsv', - name: 'Universal Password Manager (csv)', - instructions: $sce.trustAsHtml('Using the Universal Password Manager desktop application, navigate ' + - 'to "Database" > "Export" and save the CSV file.') - }, - { - id: 'ascendocsv', - name: 'Ascendo DataVault (csv)', - instructions: $sce.trustAsHtml('Using the Ascendo DataVault desktop application, navigate ' + - 'to "Tools" > "Export". In the dialog that pops up, select the "All Items (DVX, CSV)" ' + - 'option. Click the "Ok" button to save the CSV file.') - }, - { - id: 'meldiumcsv', - name: 'Meldium (csv)', - instructions: $sce.trustAsHtml('Using the Meldium web vault, navigate to "Settings". ' + - 'Locate the "Export data" function and click "Show me my data" to save the CSV file.') - }, - { - id: 'passkeepcsv', - name: 'PassKeep (csv)', - instructions: $sce.trustAsHtml('Using the PassKeep mobile app, navigate to "Backup/Restore". ' + - 'Locate the "CSV Backup/Restore" section and click "Backup to CSV" to save the CSV file.') - }, - { - id: 'operacsv', - name: 'Opera (csv)', - instructions: $sce.trustAsHtml('The process for importing from Opera is exactly the same as ' + - 'importing from Google Chrome. See detailed instructions on our help site at ' + - '' + - 'https://help.bitwarden.com/article/import-from-chrome/') - }, - { - id: 'vivaldicsv', - name: 'Vivaldi (csv)', - instructions: $sce.trustAsHtml('The process for importing from Vivaldi is exactly the same as ' + - 'importing from Google Chrome. See detailed instructions on our help site at ' + - '' + - 'https://help.bitwarden.com/article/import-from-chrome/') - }, - { - id: 'gnomejson', - name: 'GNOME Passwords and Keys/Seahorse (json)', - instructions: $sce.trustAsHtml('Make sure you have python-keyring and python-gnomekeyring installed. ' + - 'Save the GNOME Keyring Import/Export ' + - 'python script by Luke Plant to your desktop as pw_helper.py. Open terminal and run ' + - 'chmod +rx Desktop/pw_helper.py and then ' + - 'python Desktop/pw_helper.py export Desktop/my_passwords.json. Then upload ' + - 'the resulting my_passwords.json file here to Bitwarden.') - } - ]; - - $scope.setSource = function () { - for (var i = 0; i < $scope.options.length; i++) { - if ($scope.options[i].id === $scope.model.source) { - $scope.source = $scope.options[i]; - break; - } - } - }; - $scope.setSource(); - - $scope.import = function (model, form) { - if (!model.source || model.source === '') { - validationService.addError(form, 'source', 'Select the format of the import file.', true); - return; - } - - var file = document.getElementById('file').files[0]; - if (!file && (!model.fileContents || model.fileContents === '')) { - validationService.addError(form, 'file', 'Select the import file or copy/paste the import file contents.', true); - return; - } - - $scope.processing = true; - importService.import(model.source, file || model.fileContents, importSuccess, importError); - }; - - function importSuccess(folders, ciphers, folderRelationships) { - if (!folders.length && !ciphers.length) { - importError('Nothing was imported.'); - return; - } - else if (ciphers.length) { - var halfway = Math.floor(ciphers.length / 2); - var last = ciphers.length - 1; - if (cipherIsBadData(ciphers[0]) && cipherIsBadData(ciphers[halfway]) && cipherIsBadData(ciphers[last])) { - importError('Data is not formatted correctly. Please check your import file and try again.'); - return; - } - } - - apiService.ciphers.import({ - folders: cipherService.encryptFolders(folders), - ciphers: cipherService.encryptCiphers(ciphers), - folderRelationships: folderRelationships - }, function () { - $uibModalInstance.dismiss('cancel'); - $state.go('backend.user.vault', { refreshFromServer: true }).then(function () { - $analytics.eventTrack('Imported Data', { label: $scope.model.source }); - toastr.success('Data has been successfully imported into your vault.', 'Import Success'); - }); - }, importError); - } - - function cipherIsBadData(cipher) { - return (cipher.name === null || cipher.name === '--') && - (cipher.login && (cipher.login.password === null || cipher.login.password === '')); - } - - function importError(error) { - $analytics.eventTrack('Import Data Failed', { label: $scope.model.source }); - $uibModalInstance.dismiss('cancel'); - - if (error) { - var data = error.data; - if (data && data.ValidationErrors) { - var message = ''; - for (var key in data.ValidationErrors) { - if (!data.ValidationErrors.hasOwnProperty(key)) { - continue; - } - - for (var i = 0; i < data.ValidationErrors[key].length; i++) { - message += (key + ': ' + data.ValidationErrors[key][i] + ' '); - } - } - - if (message !== '') { - toastr.error(message); - return; - } - } - else if (data && data.Message) { - toastr.error(data.Message); - return; - } - else { - toastr.error(error); - return; - } - } - - toastr.error('Something went wrong. Try again.', 'Oh No!'); - } - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/tools/toolsModule.js b/src/app/tools/toolsModule.js deleted file mode 100644 index 98191f49..00000000 --- a/src/app/tools/toolsModule.js +++ /dev/null @@ -1,2 +0,0 @@ -angular - .module('bit.tools', ['ui.bootstrap', 'toastr']); diff --git a/src/app/tools/views/tools.html b/src/app/tools/views/tools.html deleted file mode 100644 index 242994eb..00000000 --- a/src/app/tools/views/tools.html +++ /dev/null @@ -1,32 +0,0 @@ -
-

- Tools - helpful utilities -

-
-
-
-
-

Import/Export

-
-
-

- Quickly import your logins and other data from a previous export or from another - password management application. -

-

You can also export all of your vault data in .csv format.

-
-
- - -
-
-
-
-

Password Generator

-
-
- Password generator is currently available in all other client applications. Coming soon to the web vault! -
-
-
diff --git a/src/app/tools/views/toolsExport.html b/src/app/tools/views/toolsExport.html deleted file mode 100644 index 2a2ecf05..00000000 --- a/src/app/tools/views/toolsExport.html +++ /dev/null @@ -1,33 +0,0 @@ -
- - -
-
-
-

Enter your master password to continue.

-
-

Warning

- This export contains your unencrypted data in .csv format. You should not store or send the file - over unsecure channels (such as email). Delete it immediately after you are done using it. -
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-
- - -
-
-
-

-

Please wait. We are now exporting all of your data to a .csv file.

-
diff --git a/src/app/tools/views/toolsImport.html b/src/app/tools/views/toolsImport.html deleted file mode 100644 index b0d28d74..00000000 --- a/src/app/tools/views/toolsImport.html +++ /dev/null @@ -1,48 +0,0 @@ -
- - -
-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -
-
-

{{source.name}} Instructions

-
-
-
- - -
-
- - -
-
-
- - -
-
-
-

-

Please wait. We are now importing all of your data. Do not close this window. You will be redirected to your vault when the import has completed.

-
diff --git a/src/app/vault/vaultAddCipherController.js b/src/app/vault/vaultAddCipherController.js deleted file mode 100644 index d35bf5b0..00000000 --- a/src/app/vault/vaultAddCipherController.js +++ /dev/null @@ -1,156 +0,0 @@ -angular - .module('bit.vault') - - .controller('vaultAddCipherController', function ($scope, apiService, $uibModalInstance, cryptoService, cipherService, - passwordService, selectedFolder, $analytics, checkedFavorite, $rootScope, authService, $uibModal, constants, - $filter, selectedType) { - $analytics.eventTrack('vaultAddCipherController', { category: 'Modal' }); - $scope.folders = $rootScope.vaultFolders; - $scope.constants = constants; - $scope.selectedType = selectedType ? selectedType.toString() : constants.cipherType.login.toString(); - $scope.cipher = { - folderId: selectedFolder ? selectedFolder.id : null, - favorite: checkedFavorite === true, - type: selectedType || constants.cipherType.login, - login: { - uris: [{ - uri: null, - match: null, - matchValue: null - }] - }, - identity: {}, - card: {}, - secureNote: { - type: 0 - } - }; - - authService.getUserProfile().then(function (profile) { - $scope.useTotp = profile.premium; - }); - - $scope.typeChanged = function () { - $scope.cipher.type = parseInt($scope.selectedType); - }; - - $scope.savePromise = null; - $scope.save = function () { - if ($scope.cipher.type === constants.cipherType.login && $scope.cipher.login.uris.length === 1 && - ($scope.cipher.login.uris[0].uri == null || $scope.cipher.login.uris[0].uri === '')) { - $scope.cipher.login.uris = null; - } - - var cipher = cipherService.encryptCipher($scope.cipher); - $scope.savePromise = apiService.ciphers.post(cipher, function (cipherResponse) { - $analytics.eventTrack('Created Cipher'); - var decCipher = cipherService.decryptCipherPreview(cipherResponse); - $uibModalInstance.close(decCipher); - }).$promise; - }; - - $scope.generatePassword = function () { - if (!$scope.cipher.login.password || confirm('Are you sure you want to overwrite the current password?')) { - $analytics.eventTrack('Generated Password From Add'); - $scope.cipher.login.password = passwordService.generatePassword({ length: 14, special: true }); - } - }; - - $scope.addUri = function () { - if (!$scope.cipher.login) { - return; - } - - if (!$scope.cipher.login.uris) { - $scope.cipher.login.uris = []; - } - - $scope.cipher.login.uris.push({ - uri: null, - match: null, - matchValue: null - }); - }; - - $scope.removeUri = function (uri) { - if (!$scope.cipher.login || !$scope.cipher.login.uris) { - return; - } - - var index = $scope.cipher.login.uris.indexOf(uri); - if (index > -1) { - $scope.cipher.login.uris.splice(index, 1); - } - }; - - $scope.uriMatchChanged = function (uri) { - if ((!uri.matchValue && uri.matchValue !== 0) || uri.matchValue === '') { - uri.match = null; - } - else { - uri.match = parseInt(uri.matchValue); - } - }; - - $scope.addField = function () { - if (!$scope.cipher.fields) { - $scope.cipher.fields = []; - } - - $scope.cipher.fields.push({ - type: constants.fieldType.text.toString(), - name: null, - value: null - }); - }; - - $scope.removeField = function (field) { - var index = $scope.cipher.fields.indexOf(field); - if (index > -1) { - $scope.cipher.fields.splice(index, 1); - } - }; - - $scope.toggleFavorite = function () { - $scope.cipher.favorite = !$scope.cipher.favorite; - }; - - $scope.clipboardSuccess = function (e) { - e.clearSelection(); - selectPassword(e); - }; - - $scope.clipboardError = function (e, password) { - if (password) { - selectPassword(e); - } - alert('Your web browser does not support easy clipboard copying. Copy it manually instead.'); - }; - - $scope.folderSort = function (item) { - if (!item.id) { - return ''; - } - - return item.name.toLowerCase(); - }; - - function selectPassword(e) { - var target = $(e.trigger).parent().prev(); - if (target.attr('type') === 'text') { - target.select(); - } - } - - $scope.close = function () { - $uibModalInstance.dismiss('close'); - }; - - $scope.showUpgrade = function () { - $uibModal.open({ - animation: true, - templateUrl: 'app/views/premiumRequired.html', - controller: 'premiumRequiredController' - }); - }; - }); diff --git a/src/app/vault/vaultAddFolderController.js b/src/app/vault/vaultAddFolderController.js deleted file mode 100644 index 536407a4..00000000 --- a/src/app/vault/vaultAddFolderController.js +++ /dev/null @@ -1,19 +0,0 @@ -angular - .module('bit.vault') - - .controller('vaultAddFolderController', function ($scope, apiService, $uibModalInstance, cryptoService, cipherService, $analytics) { - $analytics.eventTrack('vaultAddFolderController', { category: 'Modal' }); - $scope.savePromise = null; - $scope.save = function (model) { - var folder = cipherService.encryptFolder(model); - $scope.savePromise = apiService.folders.post(folder, function (response) { - $analytics.eventTrack('Created Folder'); - var decFolder = cipherService.decryptFolder(response); - $uibModalInstance.close(decFolder); - }).$promise; - }; - - $scope.close = function () { - $uibModalInstance.dismiss('close'); - }; - }); diff --git a/src/app/vault/vaultAttachmentsController.js b/src/app/vault/vaultAttachmentsController.js deleted file mode 100644 index 7556ad37..00000000 --- a/src/app/vault/vaultAttachmentsController.js +++ /dev/null @@ -1,122 +0,0 @@ -angular - .module('bit.vault') - - .controller('vaultAttachmentsController', function ($scope, apiService, $uibModalInstance, cryptoService, cipherService, - cipherId, $analytics, validationService, toastr, $timeout, authService, $uibModal) { - $analytics.eventTrack('vaultAttachmentsController', { category: 'Modal' }); - $scope.cipher = {}; - $scope.readOnly = true; - $scope.loading = true; - $scope.isPremium = true; - $scope.canUseAttachments = true; - var closing = false; - - authService.getUserProfile().then(function (profile) { - $scope.isPremium = profile.premium; - return apiService.ciphers.get({ id: cipherId }).$promise; - }).then(function (cipher) { - $scope.cipher = cipherService.decryptCipher(cipher); - $scope.readOnly = !$scope.cipher.edit; - $scope.canUseAttachments = $scope.isPremium || $scope.cipher.organizationId; - $scope.loading = false; - }, function () { - $scope.loading = false; - }); - - $scope.save = function (form) { - var fileEl = document.getElementById('file'); - var files = fileEl.files; - if (!files || !files.length) { - validationService.addError(form, 'file', 'Select a file.', true); - return; - } - - $scope.savePromise = cipherService.encryptAttachmentFile(getKeyForCipher(), files[0]).then(function (encValue) { - var fd = new FormData(); - var blob = new Blob([encValue.data], { type: 'application/octet-stream' }); - fd.append('data', blob, encValue.fileName); - return apiService.ciphers.postAttachment({ id: cipherId }, fd).$promise; - }).then(function (response) { - $analytics.eventTrack('Added Attachment'); - $scope.cipher = cipherService.decryptCipher(response); - - // reset file input - // ref: https://stackoverflow.com/a/20552042 - fileEl.type = ''; - fileEl.type = 'file'; - fileEl.value = ''; - }, function (e) { - var errors = validationService.parseErrors(e); - toastr.error(errors.length ? errors[0] : 'An error occurred.'); - }); - }; - - $scope.download = function (attachment) { - attachment.loading = true; - - if (!$scope.canUseAttachments) { - attachment.loading = false; - alert('Premium membership is required to use this feature.'); - return; - } - - cipherService.downloadAndDecryptAttachment(getKeyForCipher(), attachment, true).then(function (res) { - $timeout(function () { - attachment.loading = false; - }); - }, function () { - $timeout(function () { - attachment.loading = false; - }); - }); - }; - - function getKeyForCipher() { - if ($scope.cipher.organizationId) { - return cryptoService.getOrgKey($scope.cipher.organizationId); - } - - return null; - } - - $scope.remove = function (attachment) { - if (!confirm('Are you sure you want to delete this attachment (' + attachment.fileName + ')?')) { - return; - } - - attachment.loading = true; - apiService.ciphers.delAttachment({ id: cipherId, attachmentId: attachment.id }).$promise.then(function () { - attachment.loading = false; - $analytics.eventTrack('Deleted Attachment'); - var index = $scope.cipher.attachments.indexOf(attachment); - if (index > -1) { - $scope.cipher.attachments.splice(index, 1); - } - }, function () { - toastr.error('Cannot delete attachment.'); - attachment.loading = false; - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - - $scope.$on('modal.closing', function (e, reason, closed) { - if (closing) { - return; - } - - e.preventDefault(); - closing = true; - $uibModalInstance.close(!!$scope.cipher.attachments && $scope.cipher.attachments.length > 0); - }); - - $scope.showUpgrade = function () { - $uibModal.open({ - animation: true, - templateUrl: 'app/views/premiumRequired.html', - controller: 'premiumRequiredController' - }); - }; - }); diff --git a/src/app/vault/vaultCipherCollectionsController.js b/src/app/vault/vaultCipherCollectionsController.js deleted file mode 100644 index 9af1d0d7..00000000 --- a/src/app/vault/vaultCipherCollectionsController.js +++ /dev/null @@ -1,128 +0,0 @@ -angular - .module('bit.vault') - - .controller('vaultCipherCollectionsController', function ($scope, apiService, $uibModalInstance, cipherService, - cipherId, $analytics) { - $analytics.eventTrack('vaultCipherCollectionsController', { category: 'Modal' }); - $scope.cipher = {}; - $scope.readOnly = false; - $scope.loadingCipher = true; - $scope.loadingCollections = true; - $scope.selectedCollections = {}; - $scope.collections = []; - - var cipherAndCols = null; - $uibModalInstance.opened.then(function () { - apiService.ciphers.getDetails({ id: cipherId }).$promise.then(function (cipher) { - $scope.loadingCipher = false; - - $scope.readOnly = !cipher.Edit; - if (cipher.Edit && cipher.OrganizationId) { - if (cipher.Type === 1) { - $scope.cipher = cipherService.decryptCipherPreview(cipher); - } - - var collections = {}; - if (cipher.CollectionIds) { - for (var i = 0; i < cipher.CollectionIds.length; i++) { - collections[cipher.CollectionIds[i]] = null; - } - } - - return { - cipher: cipher, - cipherCollections: collections - }; - } - - return null; - }).then(function (result) { - if (!result) { - $scope.loadingCollections = false; - return false; - } - - cipherAndCols = result; - return apiService.collections.listMe({ writeOnly: true }).$promise; - }).then(function (response) { - if (response === false) { - return; - } - - var collections = []; - var selectedCollections = {}; - var writeableCollections = response.Data; - - for (var i = 0; i < writeableCollections.length; i++) { - // clean out selectCollections that aren't from this organization - if (writeableCollections[i].OrganizationId !== cipherAndCols.cipher.OrganizationId) { - continue; - } - - if (writeableCollections[i].Id in cipherAndCols.cipherCollections) { - selectedCollections[writeableCollections[i].Id] = true; - } - - var decCollection = cipherService.decryptCollection(writeableCollections[i]); - collections.push(decCollection); - } - - $scope.loadingCollections = false; - $scope.collections = collections; - $scope.selectedCollections = selectedCollections; - }); - }); - - $scope.toggleCollectionSelectionAll = function ($event) { - var collections = {}; - if ($event.target.checked) { - for (var i = 0; i < $scope.collections.length; i++) { - collections[$scope.collections[i].id] = true; - } - } - - $scope.selectedCollections = collections; - }; - - $scope.toggleCollectionSelection = function (id) { - if (id in $scope.selectedCollections) { - delete $scope.selectedCollections[id]; - } - else { - $scope.selectedCollections[id] = true; - } - }; - - $scope.collectionSelected = function (collection) { - return collection.id in $scope.selectedCollections; - }; - - $scope.allSelected = function () { - return Object.keys($scope.selectedCollections).length === $scope.collections.length; - }; - - $scope.submit = function () { - var request = { - collectionIds: [] - }; - - for (var id in $scope.selectedCollections) { - if ($scope.selectedCollections.hasOwnProperty(id)) { - request.collectionIds.push(id); - } - } - - $scope.submitPromise = apiService.ciphers.putCollections({ id: cipherId }, request) - .$promise.then(function (response) { - $analytics.eventTrack('Edited Cipher Collections'); - $uibModalInstance.close({ - action: 'collectionsEdit', - collectionIds: request.collectionIds - }); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js deleted file mode 100644 index f4bf780f..00000000 --- a/src/app/vault/vaultController.js +++ /dev/null @@ -1,535 +0,0 @@ -angular - .module('bit.vault') - - .controller('vaultController', function ($scope, $uibModal, apiService, $filter, cryptoService, authService, toastr, - cipherService, $q, $localStorage, $timeout, $rootScope, $state, $analytics, constants, validationService) { - $scope.loadingCiphers = true; - $scope.loadingGroupings = true; - $scope.ciphers = []; - $scope.folders = []; - $scope.collections = []; - $scope.constants = constants; - $scope.filter = undefined; - $scope.selectedType = undefined; - $scope.selectedFolder = undefined; - $scope.selectedCollection = undefined; - $scope.selectedFavorites = false; - $scope.selectedAll = true; - $scope.selectedTitle = 'All'; - $scope.selectedIcon = 'fa-th'; - - if ($state.params.refreshFromServer) { - $rootScope.vaultFolders = $rootScope.vaultCollections = $rootScope.vaultCiphers = null; - } - - $scope.$on('$viewContentLoaded', function () { - $timeout(function () { - if ($('body').hasClass('control-sidebar-open')) { - $("#search").focus(); - } - }, 500); - - if (($rootScope.vaultFolders || $rootScope.vaultCollections) && $rootScope.vaultCiphers) { - $scope.loadingCiphers = $scope.loadingGroupings = false; - loadCipherData($rootScope.vaultCiphers); - return; - } - - loadDataFromServer(); - }); - - function loadDataFromServer() { - var decFolders = [{ - id: null, - name: 'No Folder' - }]; - - var decCollections = []; - - var collectionPromise = apiService.collections.listMe({ writeOnly: false }, function (collections) { - for (var i = 0; i < collections.Data.length; i++) { - var decCollection = cipherService.decryptCollection(collections.Data[i], null, true); - decCollections.push(decCollection); - } - }).$promise; - - var folderPromise = apiService.folders.list({}, function (folders) { - for (var i = 0; i < folders.Data.length; i++) { - var decFolder = cipherService.decryptFolderPreview(folders.Data[i]); - decFolders.push(decFolder); - } - }).$promise; - - var groupingPromise = $q.all([collectionPromise, folderPromise]).then(function () { - $rootScope.vaultCollections = decCollections; - $rootScope.vaultFolders = decFolders; - $scope.loadingGroupings = false; - }); - - apiService.ciphers.list({}, function (ciphers) { - var decCiphers = []; - - for (var i = 0; i < ciphers.Data.length; i++) { - var decCipher = cipherService.decryptCipherPreview(ciphers.Data[i]); - decCiphers.push(decCipher); - } - - groupingPromise.then(function () { - loadCipherData(decCiphers); - }); - }); - } - - function loadCipherData(decCiphers) { - $rootScope.vaultCiphers = $scope.ciphers = $filter('orderBy')(decCiphers, ['sort', 'name', 'subTitle']); - - var chunks = chunk($rootScope.vaultCiphers, 200); - if (chunks.length > 0) { - $scope.ciphers = chunks[0]; - var delay = 200; - angular.forEach(chunks, function (value, index) { - delay += 200; - - // skip the first chuck - if (index > 0) { - $timeout(function () { - Array.prototype.push.apply($scope.ciphers, value); - }, delay); - } - }); - } - - $scope.loadingCiphers = false; - } - - function sortScopedCipherData() { - $rootScope.vaultCiphers = $scope.ciphers = $filter('orderBy')($rootScope.vaultCiphers, ['name', 'subTitle']); - } - - function chunk(arr, len) { - var chunks = [], - i = 0, - n = arr.length; - while (i < n) { - chunks.push(arr.slice(i, i += len)); - } - return chunks; - } - - $scope.groupingSort = function (item) { - if (!item.id) { - return ''; - } - - return item.name.toLowerCase(); - }; - - $scope.clipboardError = function (e) { - alert('Your web browser does not support easy clipboard copying. ' + - 'Edit the item and copy it manually instead.'); - }; - - $scope.editCipher = function (cipher) { - var editModel = $uibModal.open({ - animation: true, - templateUrl: 'app/vault/views/vaultEditCipher.html', - controller: 'vaultEditCipherController', - resolve: { - cipherId: function () { return cipher.id; } - } - }); - - editModel.result.then(function (returnVal) { - if (returnVal.action === 'edit') { - var index = $scope.ciphers.indexOf(cipher); - if (index > -1) { - // restore collection ids since those cannot change on edit here. - returnVal.data.collectionIds = $rootScope.vaultCiphers[index].collectionIds; - $rootScope.vaultCiphers[index] = returnVal.data; - } - sortScopedCipherData(); - } - else if (returnVal.action === 'partialEdit') { - cipher.folderId = returnVal.data.folderId; - cipher.favorite = returnVal.data.favorite; - } - else if (returnVal.action === 'delete') { - removeCipherFromScopes(cipher); - } - }); - }; - - $scope.$on('vaultAddCipher', function (event, args) { - $scope.addCipher(); - }); - - $scope.addCipher = function () { - var addModel = $uibModal.open({ - animation: true, - templateUrl: 'app/vault/views/vaultAddCipher.html', - controller: 'vaultAddCipherController', - resolve: { - selectedFolder: function () { return $scope.selectedFolder; }, - selectedType: function () { return $scope.selectedType; }, - checkedFavorite: function () { return $scope.selectedFavorites; } - } - }); - - addModel.result.then(function (addedCipher) { - $rootScope.vaultCiphers.push(addedCipher); - sortScopedCipherData(); - }); - }; - - $scope.deleteCipher = function (cipher) { - if (!confirm('Are you sure you want to delete this item (' + cipher.name + ')?')) { - return; - } - - apiService.ciphers.del({ id: cipher.id }, function () { - $analytics.eventTrack('Deleted Item'); - removeCipherFromScopes(cipher); - }); - }; - - $scope.attachments = function (cipher) { - authService.getUserProfile().then(function (profile) { - return { - isPremium: profile.premium, - orgUseStorage: cipher.organizationId && !!profile.organizations[cipher.organizationId].maxStorageGb - }; - }).then(function (perms) { - if (!cipher.hasAttachments) { - if (cipher.organizationId && !perms.orgUseStorage) { - $uibModal.open({ - animation: true, - templateUrl: 'app/views/paidOrgRequired.html', - controller: 'paidOrgRequiredController', - resolve: { - orgId: function () { return cipher.organizationId; } - } - }); - return; - } - - if (!cipher.organizationId && !perms.isPremium) { - $uibModal.open({ - animation: true, - templateUrl: 'app/views/premiumRequired.html', - controller: 'premiumRequiredController' - }); - return; - } - } - - if (!cipher.organizationId && !cryptoService.getEncKey()) { - toastr.error('You cannot use this feature until you update your encryption key.', 'Feature Unavailable'); - return; - } - - var attachmentModel = $uibModal.open({ - animation: true, - templateUrl: 'app/vault/views/vaultAttachments.html', - controller: 'vaultAttachmentsController', - resolve: { - cipherId: function () { return cipher.id; } - } - }); - - attachmentModel.result.then(function (hasAttachments) { - cipher.hasAttachments = hasAttachments; - }); - }); - }; - - $scope.editFolder = function (folder) { - if (!folder.id) { - return; - } - - var editModel = $uibModal.open({ - animation: true, - templateUrl: 'app/vault/views/vaultEditFolder.html', - controller: 'vaultEditFolderController', - size: 'sm', - resolve: { - folderId: function () { return folder.id; } - } - }); - - editModel.result.then(function (editedFolder) { - folder.name = editedFolder.name; - }); - }; - - $scope.$on('vaultAddFolder', function (event, args) { - $scope.addFolder(); - }); - - $scope.addFolder = function () { - var addModel = $uibModal.open({ - animation: true, - templateUrl: 'app/vault/views/vaultAddFolder.html', - controller: 'vaultAddFolderController', - size: 'sm' - }); - - addModel.result.then(function (addedFolder) { - $rootScope.vaultFolders.push(addedFolder); - }); - }; - - $scope.deleteFolder = function (folder) { - if (!folder.id) { - return; - } - - if (!confirm('Are you sure you want to delete this folder (' + folder.name + ')? ' + - 'Any items will be moved to "No Folder".')) { - return; - } - - apiService.folders.del({ id: folder.id }, function () { - $analytics.eventTrack('Deleted Folder'); - var index = $rootScope.vaultFolders.indexOf(folder); - if (index > -1) { - $rootScope.vaultFolders.splice(index, 1); - for(var i = 0; i < $rootScope.vaultCiphers.length; i++) { - if($rootScope.vaultCiphers[i].folderId === folder.id) { - $rootScope.vaultCiphers[i].folderId = null; - } - } - $scope.filterAll(); - } - }); - }; - - $scope.share = function (cipher) { - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/vault/views/vaultShareCipher.html', - controller: 'vaultShareCipherController', - resolve: { - cipherId: function () { return cipher.id; } - } - }); - - modal.result.then(function (returned) { - cipher.organizationId = returned.orgId; - cipher.collectionIds = returned.collectionIds || []; - }); - }; - - $scope.editCollections = function (cipher) { - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/vault/views/vaultCipherCollections.html', - controller: 'vaultCipherCollectionsController', - resolve: { - cipherId: function () { return cipher.id; } - } - }); - - modal.result.then(function (response) { - if (response.collectionIds && !response.collectionIds.length) { - removeCipherFromScopes(cipher); - } - else if (response.collectionIds) { - cipher.collectionIds = response.collectionIds; - } - }); - }; - - $scope.filterCollection = function (col) { - resetSelected(); - $scope.selectedCollection = col; - $scope.selectedIcon = 'fa-cube'; - $scope.filter = function (c) { - return c.collectionIds && c.collectionIds.indexOf(col.id) > -1; - }; - fixLayout(); - }; - - $scope.filterFolder = function (f) { - resetSelected(); - $scope.selectedFolder = f; - $scope.selectedIcon = 'fa-folder-open' + (!f.id ? '-o' : ''); - $scope.filter = function (c) { - return c.folderId === f.id; - }; - fixLayout(); - }; - - $scope.filterType = function (t) { - resetSelected(); - $scope.selectedType = t; - switch (t) { - case constants.cipherType.login: - $scope.selectedTitle = 'Login'; - $scope.selectedIcon = 'fa-globe'; - break; - case constants.cipherType.card: - $scope.selectedTitle = 'Card'; - $scope.selectedIcon = 'fa-credit-card'; - break; - case constants.cipherType.identity: - $scope.selectedTitle = 'Identity'; - $scope.selectedIcon = 'fa-id-card-o'; - break; - case constants.cipherType.secureNote: - $scope.selectedTitle = 'Secure Note'; - $scope.selectedIcon = 'fa-sticky-note-o'; - break; - default: - break; - } - $scope.filter = function (c) { - return c.type === t; - }; - fixLayout(); - }; - - $scope.filterFavorites = function () { - resetSelected(); - $scope.selectedFavorites = true; - $scope.selectedTitle = 'Favorites'; - $scope.selectedIcon = 'fa-star'; - $scope.filter = function (c) { - return !!c.favorite; - }; - fixLayout(); - }; - - $scope.filterAll = function () { - resetSelected(); - $scope.selectedAll = true; - $scope.selectedTitle = 'All'; - $scope.selectedIcon = 'fa-th'; - $scope.filter = null; - fixLayout(); - }; - - function resetSelected() { - $scope.selectedFolder = undefined; - $scope.selectedCollection = undefined; - $scope.selectedType = undefined; - $scope.selectedFavorites = false; - $scope.selectedAll = false; - } - - function fixLayout() { - if ($.AdminLTE && $.AdminLTE.layout) { - $timeout(function () { - $.AdminLTE.layout.fix(); - }, 0); - } - } - - $scope.cipherFilter = function () { - return function (cipher) { - return !$scope.filter || $scope.filter(cipher); - }; - }; - - $scope.unselectAll = function () { - selectAll(false); - }; - - $scope.selectAll = function () { - selectAll(true); - }; - - $scope.select = function ($event) { - var checkbox = $($event.currentTarget).closest('tr').find('input[name="cipherSelection"]'); - checkbox.prop('checked', !checkbox.prop('checked')); - }; - - function distinct(value, index, self) { - return self.indexOf(value) === index; - } - - function getSelectedCiphers() { - return $('input[name="cipherSelection"]:checked').map(function () { - return $(this).val(); - }).get().filter(distinct); - } - - function selectAll(select) { - $('input[name="cipherSelection"]').prop('checked', select); - } - - $scope.bulkMove = function () { - var ids = getSelectedCiphers(); - if (ids.length === 0) { - alert('You have not selected anything.'); - return; - } - - var modal = $uibModal.open({ - animation: true, - templateUrl: 'app/vault/views/vaultMoveCiphers.html', - controller: 'vaultMoveCiphersController', - size: 'sm', - resolve: { - ids: function () { return ids; } - } - }); - - modal.result.then(function (folderId) { - for (var i = 0; i < ids.length; i++) { - var cipher = $filter('filter')($rootScope.vaultCiphers, { id: ids[i] }); - if (cipher.length) { - cipher[0].folderId = folderId; - } - } - - selectAll(false); - sortScopedCipherData(); - toastr.success('Items have been moved!'); - }); - }; - - $scope.bulkDelete = function () { - var ids = getSelectedCiphers(); - if (ids.length === 0) { - alert('You have not selected anything.'); - return; - } - - if (!confirm('Are you sure you want to delete the selected items (total: ' + ids.length + ')?')) { - return; - } - - $scope.actionLoading = true; - apiService.ciphers.delMany({ ids: ids }, function () { - $analytics.eventTrack('Bulk Deleted Items'); - - for (var i = 0; i < ids.length; i++) { - var cipher = $filter('filter')($rootScope.vaultCiphers, { id: ids[i] }); - if (cipher.length && cipher[0].edit) { - removeCipherFromScopes(cipher[0]); - } - } - - selectAll(false); - $scope.actionLoading = false; - toastr.success('Items have been deleted!'); - }, function (e) { - var errors = validationService.parseErrors(e); - toastr.error(errors.length ? errors[0] : 'An error occurred.'); - $scope.actionLoading = false; - }); - }; - - function removeCipherFromScopes(cipher) { - var index = $rootScope.vaultCiphers.indexOf(cipher); - if (index > -1) { - $rootScope.vaultCiphers.splice(index, 1); - } - - index = $scope.ciphers.indexOf(cipher); - if (index > -1) { - $scope.ciphers.splice(index, 1); - } - } - }); diff --git a/src/app/vault/vaultEditCipherController.js b/src/app/vault/vaultEditCipherController.js deleted file mode 100644 index 635cdadd..00000000 --- a/src/app/vault/vaultEditCipherController.js +++ /dev/null @@ -1,180 +0,0 @@ -angular - .module('bit.vault') - - .controller('vaultEditCipherController', function ($scope, apiService, $uibModalInstance, cryptoService, cipherService, - passwordService, cipherId, $analytics, $rootScope, authService, $uibModal, constants, $filter) { - $analytics.eventTrack('vaultEditCipherController', { category: 'Modal' }); - $scope.folders = $rootScope.vaultFolders; - $scope.cipher = {}; - $scope.readOnly = false; - $scope.constants = constants; - - authService.getUserProfile().then(function (profile) { - $scope.useTotp = profile.premium; - return apiService.ciphers.get({ id: cipherId }).$promise; - }).then(function (cipher) { - $scope.cipher = cipherService.decryptCipher(cipher); - $scope.readOnly = !$scope.cipher.edit; - $scope.useTotp = $scope.useTotp || $scope.cipher.organizationUseTotp; - setUriMatchValues(); - }); - - $scope.save = function (model) { - if ($scope.readOnly) { - $scope.savePromise = apiService.ciphers.putPartial({ id: cipherId }, { - folderId: model.folderId, - favorite: model.favorite - }, function (response) { - $analytics.eventTrack('Partially Edited Cipher'); - $uibModalInstance.close({ - action: 'partialEdit', - data: { - id: cipherId, - favorite: model.favorite, - folderId: model.folderId && model.folderId !== '' ? model.folderId : null - } - }); - }).$promise; - } - else { - var cipher = cipherService.encryptCipher(model, $scope.cipher.type); - $scope.savePromise = apiService.ciphers.put({ id: cipherId }, cipher, function (cipherResponse) { - $analytics.eventTrack('Edited Cipher'); - var decCipher = cipherService.decryptCipherPreview(cipherResponse); - $uibModalInstance.close({ - action: 'edit', - data: decCipher - }); - }).$promise; - } - }; - - $scope.generatePassword = function () { - if (!$scope.cipher.login.password || confirm('Are you sure you want to overwrite the current password?')) { - $analytics.eventTrack('Generated Password From Edit'); - $scope.cipher.login.password = passwordService.generatePassword({ length: 14, special: true }); - } - }; - - $scope.addUri = function () { - if (!$scope.cipher.login) { - return; - } - - if (!$scope.cipher.login.uris) { - $scope.cipher.login.uris = []; - } - - $scope.cipher.login.uris.push({ - uri: null, - match: null, - matchValue: null - }); - }; - - $scope.removeUri = function (uri) { - if (!$scope.cipher.login || !$scope.cipher.login.uris) { - return; - } - - var index = $scope.cipher.login.uris.indexOf(uri); - if (index > -1) { - $scope.cipher.login.uris.splice(index, 1); - } - }; - - $scope.uriMatchChanged = function (uri) { - if ((!uri.matchValue && uri.matchValue !== 0) || uri.matchValue === '') { - uri.match = null; - } - else { - uri.match = parseInt(uri.matchValue); - } - }; - - $scope.addField = function () { - if (!$scope.cipher.fields) { - $scope.cipher.fields = []; - } - - $scope.cipher.fields.push({ - type: constants.fieldType.text.toString(), - name: null, - value: null - }); - }; - - $scope.removeField = function (field) { - var index = $scope.cipher.fields.indexOf(field); - if (index > -1) { - $scope.cipher.fields.splice(index, 1); - } - }; - - $scope.toggleFavorite = function () { - $scope.cipher.favorite = !$scope.cipher.favorite; - }; - - $scope.clipboardSuccess = function (e) { - e.clearSelection(); - selectPassword(e); - }; - - $scope.clipboardError = function (e, password) { - if (password) { - selectPassword(e); - } - alert('Your web browser does not support easy clipboard copying. Copy it manually instead.'); - }; - - $scope.folderSort = function (item) { - if (!item.id) { - return ''; - } - - return item.name.toLowerCase(); - }; - - function selectPassword(e) { - var target = $(e.trigger).parent().prev(); - if (target.attr('type') === 'text') { - target.select(); - } - } - - $scope.delete = function () { - if (!confirm('Are you sure you want to delete this item (' + $scope.cipher.name + ')?')) { - return; - } - - apiService.ciphers.del({ id: $scope.cipher.id }, function () { - $analytics.eventTrack('Deleted Cipher From Edit'); - $uibModalInstance.close({ - action: 'delete', - data: $scope.cipher.id - }); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - - $scope.showUpgrade = function () { - $uibModal.open({ - animation: true, - templateUrl: 'app/views/premiumRequired.html', - controller: 'premiumRequiredController' - }); - }; - - function setUriMatchValues() { - if ($scope.cipher.login && $scope.cipher.login.uris) { - for (var i = 0; i < $scope.cipher.login.uris.length; i++) { - $scope.cipher.login.uris[i].matchValue = - $scope.cipher.login.uris[i].match || $scope.cipher.login.uris[i].match === 0 ? - $scope.cipher.login.uris[i].match.toString() : ''; - } - } - } - }); diff --git a/src/app/vault/vaultEditFolderController.js b/src/app/vault/vaultEditFolderController.js deleted file mode 100644 index 438bfe43..00000000 --- a/src/app/vault/vaultEditFolderController.js +++ /dev/null @@ -1,25 +0,0 @@ -angular - .module('bit.vault') - - .controller('vaultEditFolderController', function ($scope, apiService, $uibModalInstance, cryptoService, cipherService, folderId, $analytics) { - $analytics.eventTrack('vaultEditFolderController', { category: 'Modal' }); - $scope.folder = {}; - - apiService.folders.get({ id: folderId }, function (folder) { - $scope.folder = cipherService.decryptFolder(folder); - }); - - $scope.savePromise = null; - $scope.save = function (model) { - var folder = cipherService.encryptFolder(model); - $scope.savePromise = apiService.folders.put({ id: folderId }, folder, function (response) { - $analytics.eventTrack('Edited Folder'); - var decFolder = cipherService.decryptFolder(response); - $uibModalInstance.close(decFolder); - }).$promise; - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/vault/vaultModule.js b/src/app/vault/vaultModule.js deleted file mode 100644 index 84125898..00000000 --- a/src/app/vault/vaultModule.js +++ /dev/null @@ -1,2 +0,0 @@ -angular - .module('bit.vault', ['ui.bootstrap', 'ngclipboard']); diff --git a/src/app/vault/vaultMoveCiphersController.js b/src/app/vault/vaultMoveCiphersController.js deleted file mode 100644 index a4f13c3e..00000000 --- a/src/app/vault/vaultMoveCiphersController.js +++ /dev/null @@ -1,28 +0,0 @@ -angular - .module('bit.vault') - - .controller('vaultMoveCiphersController', function ($scope, apiService, $uibModalInstance, ids, $analytics, - $rootScope, $filter) { - $analytics.eventTrack('vaultMoveCiphersController', { category: 'Modal' }); - $scope.folders = $rootScope.vaultFolders; - $scope.count = ids.length; - - $scope.save = function () { - $scope.savePromise = apiService.ciphers.moveMany({ ids: ids, folderId: $scope.folderId }, function () { - $analytics.eventTrack('Bulk Moved Ciphers'); - $uibModalInstance.close($scope.folderId || null); - }).$promise; - }; - - $scope.folderSort = function (item) { - if (!item.id) { - return '!'; - } - - return item.name.toLowerCase(); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - }); diff --git a/src/app/vault/vaultShareCipherController.js b/src/app/vault/vaultShareCipherController.js deleted file mode 100644 index bb959e0e..00000000 --- a/src/app/vault/vaultShareCipherController.js +++ /dev/null @@ -1,184 +0,0 @@ -angular - .module('bit.vault') - - .controller('vaultShareCipherController', function ($scope, apiService, $uibModalInstance, authService, cipherService, - cipherId, $analytics, $state, cryptoService, $q, toastr) { - $analytics.eventTrack('vaultShareCipherController', { category: 'Modal' }); - $scope.model = {}; - $scope.cipher = {}; - $scope.collections = []; - $scope.selectedCollections = {}; - $scope.organizations = []; - var organizationCollectionCounts = {}; - $scope.loadingCollections = true; - $scope.loading = true; - $scope.readOnly = false; - - apiService.ciphers.get({ id: cipherId }).$promise.then(function (cipher) { - $scope.readOnly = !cipher.Edit; - if (cipher.Edit) { - $scope.cipher = cipherService.decryptCipher(cipher); - } - - return cipher.Edit; - }).then(function (canEdit) { - $scope.loading = false; - if (!canEdit) { - return; - } - - return authService.getUserProfile(); - }).then(function (profile) { - if (profile && profile.organizations) { - var orgs = [], - setFirstOrg = false; - - for (var i in profile.organizations) { - if (profile.organizations.hasOwnProperty(i) && profile.organizations[i].enabled) { - orgs.push({ - id: profile.organizations[i].id, - name: profile.organizations[i].name - }); - - organizationCollectionCounts[profile.organizations[i].id] = 0; - - if (!setFirstOrg) { - setFirstOrg = true; - $scope.model.organizationId = profile.organizations[i].id; - } - } - } - - $scope.organizations = orgs; - - apiService.collections.listMe({ writeOnly: true }, function (response) { - var collections = []; - for (var i = 0; i < response.Data.length; i++) { - var decCollection = cipherService.decryptCollection(response.Data[i]); - decCollection.organizationId = response.Data[i].OrganizationId; - collections.push(decCollection); - organizationCollectionCounts[decCollection.organizationId]++; - } - - $scope.collections = collections; - $scope.loadingCollections = false; - }); - } - }); - - $scope.toggleCollectionSelectionAll = function ($event) { - var collections = {}; - if ($event.target.checked) { - for (var i = 0; i < $scope.collections.length; i++) { - if ($scope.model.organizationId && $scope.collections[i].organizationId === $scope.model.organizationId) { - collections[$scope.collections[i].id] = true; - } - } - } - - $scope.selectedCollections = collections; - }; - - $scope.toggleCollectionSelection = function (id) { - if (id in $scope.selectedCollections) { - delete $scope.selectedCollections[id]; - } - else { - $scope.selectedCollections[id] = true; - } - }; - - $scope.collectionSelected = function (collection) { - return collection.id in $scope.selectedCollections; - }; - - $scope.allSelected = function () { - if (!$scope.model.organizationId) { - return false; - } - - return Object.keys($scope.selectedCollections).length === organizationCollectionCounts[$scope.model.organizationId]; - }; - - $scope.orgChanged = function () { - $scope.selectedCollections = {}; - }; - - $scope.submitPromise = null; - $scope.submit = function (model) { - var orgKey = cryptoService.getOrgKey(model.organizationId); - - var errorOnUpload = false; - var attachmentSharePromises = []; - if ($scope.cipher.attachments) { - for (var i = 0; i < $scope.cipher.attachments.length; i++) { - /* jshint ignore:start */ - (function (attachment) { - var promise = cipherService.downloadAndDecryptAttachment(null, attachment, false) - .then(function (decData) { - return cryptoService.encryptToBytes(decData.buffer, orgKey); - }).then(function (encData) { - if (errorOnUpload) { - return; - } - - var fd = new FormData(); - var blob = new Blob([encData], { type: 'application/octet-stream' }); - var encFilename = cryptoService.encrypt(attachment.fileName, orgKey); - fd.append('data', blob, encFilename); - - return apiService.ciphers.postShareAttachment({ - id: cipherId, - attachmentId: attachment.id, - orgId: model.organizationId - }, fd).$promise; - }, function (err) { - errorOnUpload = true; - }); - attachmentSharePromises.push(promise); - })($scope.cipher.attachments[i]); - /* jshint ignore:end */ - } - } - - var returnedCollectionIds = null; - $scope.submitPromise = $q.all(attachmentSharePromises).then(function () { - if (errorOnUpload) { - return; - } - - $scope.cipher.organizationId = model.organizationId; - - var request = { - collectionIds: [], - cipher: cipherService.encryptCipher($scope.cipher, $scope.cipher.type, null, true) - }; - - for (var id in $scope.selectedCollections) { - if ($scope.selectedCollections.hasOwnProperty(id)) { - request.collectionIds.push(id); - } - } - - returnedCollectionIds = request.collectionIds; - return apiService.ciphers.putShare({ id: cipherId }, request).$promise; - }).then(function (response) { - $analytics.eventTrack('Shared Cipher'); - toastr.success('Item has been shared.'); - $uibModalInstance.close({ - orgId: model.organizationId, - collectionIds: returnedCollectionIds - }); - }); - }; - - $scope.close = function () { - $uibModalInstance.dismiss('cancel'); - }; - - $scope.createOrg = function () { - $state.go('backend.user.settingsCreateOrg').then(function () { - $uibModalInstance.dismiss('cancel'); - }); - }; - }); diff --git a/src/app/vault/views/vault.html b/src/app/vault/views/vault.html deleted file mode 100644 index 49b8e90a..00000000 --- a/src/app/vault/views/vault.html +++ /dev/null @@ -1,235 +0,0 @@ -
-
- - -
-

- My Vault - - , - , & - - -

-
-
-
-

Loading...

-
-
-
-

- - {{selectedFolder ? selectedFolder.name : selectedCollection ? selectedCollection.name : selectedTitle}} - -

-
-
- - -
-
-
-
-
-

No items to list.

- -
-
- - - - - - - - - -
-
- - -
- 		- - - - - - {{cipher.name}} - - - -
- {{cipher.subTitle}} -
-
-
-
-
- diff --git a/src/app/vault/views/vaultAddCipher.html b/src/app/vault/views/vaultAddCipher.html deleted file mode 100644 index 13ed776d..00000000 --- a/src/app/vault/views/vaultAddCipher.html +++ /dev/null @@ -1,616 +0,0 @@ -
- -

Add New Item

-
-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
-
-
- - -
-
-
-
-
-
- * - -
-
-
-
- - -
-
-
-
-
-
-
- -
- - - - -
-
-
-
-
-
- - -
- -
- - - - -
-
-
-
-
-
-
-
- - -
-
-
-
-
- - - {{fromOrg ? 'UPGRADE' : 'PREMIUM'}} - -
-
-
-
-
-
-
- -
- - - - - - - -
-
-
-
-
- - -
-
-
- - - - Remove URI - -
-
-
-
- - New URI - -

-
-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- -
- - - - -
-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- -
- - - - -
-
-
-
-
-
-
-
-
- - -
-
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
-
-
- -
- - - - -
-
-
-
-
-
- -
-
- - -
-
-

Custom Fields

-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
- -
- -
- - - - -
-
- -
-
-
-
- - - - Remove Custom Field - -
-
-
-
- - New Custom Field - -
-
- - - -
-
diff --git a/src/app/vault/views/vaultAddFolder.html b/src/app/vault/views/vaultAddFolder.html deleted file mode 100644 index 91a18133..00000000 --- a/src/app/vault/views/vaultAddFolder.html +++ /dev/null @@ -1,24 +0,0 @@ -
- - -
-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- * - -
-
-
- - -
-
\ No newline at end of file diff --git a/src/app/vault/views/vaultAttachments.html b/src/app/vault/views/vaultAttachments.html deleted file mode 100644 index 75f9f123..00000000 --- a/src/app/vault/views/vaultAttachments.html +++ /dev/null @@ -1,75 +0,0 @@ -
- -

- Secure Attachments {{cipher.name}} -

-
-
-
-
- Loading... -
-
- There are no attachments for this item. -
-
- - - - - - - - -
-
- - -
- 		- {{attachment.fileName}} - - - {{attachment.size}} -
-
-
-
-

Add New Attachment

-
-

Premium Membership Required

-

Premium membership is required to use this feature.

- -
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- - -

Maximum size per file is 100 MB.

-
-
-
-
- - -
-
diff --git a/src/app/vault/views/vaultCipherCollections.html b/src/app/vault/views/vaultCipherCollections.html deleted file mode 100644 index 6f72f89b..00000000 --- a/src/app/vault/views/vaultCipherCollections.html +++ /dev/null @@ -1,55 +0,0 @@ -
- -

Collections {{cipher.name}}

-
-
-
-

Edit the collections that this item is being shared with.

-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- Loading... -
-
-

No collections to manage.

-
-
- - - - - - - - - - - - - -
- - Name
- - - {{collection.name}} -
-
-
-
- - -
-
\ No newline at end of file diff --git a/src/app/vault/views/vaultEditCipher.html b/src/app/vault/views/vaultEditCipher.html deleted file mode 100644 index 4f0d0e01..00000000 --- a/src/app/vault/views/vaultEditCipher.html +++ /dev/null @@ -1,621 +0,0 @@ -
- -

- Item Information {{cipher.name}} -

-
-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
-
-
- * - -
-
-
-
- - -
-
-
- -
-
-
-
- -
- - - - -
-
-
-
-
-
- - -
- -
- - - - -
-
-
-
-
-
-
-
- - -
-
-
-
-
- - - {{fromOrg ? 'UPGRADE' : 'PREMIUM'}} - -
-
-
-
-
-
-
- -
- - - - - - - -
-
-
-
-
- - -
-
-
- - - - Remove URI - -
-
-
-
- -
-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- -
- - - - -
-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
-
- -
- - - - -
-
-
-
-
-
-
-
-
- - -
-
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
-
-
- -
- - - - -
-
-
-
-
-
- -
- -
- - -
-
-
-

Custom Fields

-
-
-
-
-
- - -
-
-
-
- - -
-
-
-
-
- -
- -
- - - - -
-
- -
-
-
-
- - - - Remove Custom Field - -
-
-
-
- - New Custom Field - -
-
- - - - -
-
diff --git a/src/app/vault/views/vaultEditFolder.html b/src/app/vault/views/vaultEditFolder.html deleted file mode 100644 index be6d34eb..00000000 --- a/src/app/vault/views/vaultEditFolder.html +++ /dev/null @@ -1,24 +0,0 @@ -
- - -
-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-
- * - -
-
-
- - -
-
\ No newline at end of file diff --git a/src/app/vault/views/vaultMoveCiphers.html b/src/app/vault/views/vaultMoveCiphers.html deleted file mode 100644 index afef7db6..00000000 --- a/src/app/vault/views/vaultMoveCiphers.html +++ /dev/null @@ -1,34 +0,0 @@ -
- -

- Move Items -

-
-
-
-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-

- Select a folder that you would like to move the {{count}} selected - to. -

-
- - -
-
-
- - -
-
diff --git a/src/app/vault/views/vaultShareCipher.html b/src/app/vault/views/vaultShareCipher.html deleted file mode 100644 index 99938443..00000000 --- a/src/app/vault/views/vaultShareCipher.html +++ /dev/null @@ -1,75 +0,0 @@ -
- -

Share Item {{cipher.name}}

-
-
-
-

Choose an organization that you wish to share this item with.

-
-

Errors have occurred

-
    -
  • {{e}}
    • -
-
-

Loading...

-
-

No Organizations

-

You do not belong to any organizations. Organizations allow you to share items with other Bitwarden users.

- - Create an Organization - -
-
-
- * - -
-

Collection Access

-
-

Loading...

-
-
-

No Collections

-

You do not have write access to any collections for this organization.

-
-
- - - - - - - - - - - - - -
- - Name
- - - {{collection.name}} -
-
-
-
-
- - -
-
diff --git a/src/app/views/backendLayout.html b/src/app/views/backendLayout.html deleted file mode 100644 index cd076260..00000000 --- a/src/app/views/backendLayout.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
- -
- - Copyright © , 8bit Solutions LLC -
-
diff --git a/src/app/views/frontendLayout.html b/src/app/views/frontendLayout.html deleted file mode 100644 index 47e1b0a2..00000000 --- a/src/app/views/frontendLayout.html +++ /dev/null @@ -1,2 +0,0 @@ -
-
\ No newline at end of file diff --git a/src/app/views/organizationLayout.html b/src/app/views/organizationLayout.html deleted file mode 100644 index 934495ee..00000000 --- a/src/app/views/organizationLayout.html +++ /dev/null @@ -1,110 +0,0 @@ -
- - -
- - - -
-
diff --git a/src/app/views/paidOrgRequired.html b/src/app/views/paidOrgRequired.html deleted file mode 100644 index 1452976a..00000000 --- a/src/app/views/paidOrgRequired.html +++ /dev/null @@ -1,13 +0,0 @@ -
- -

Paid Plan Required

-
-
- This feature is not available for free organizations. Switch to a paid plan to unlock more features. -
-
- - -
\ No newline at end of file diff --git a/src/app/views/premiumRequired.html b/src/app/views/premiumRequired.html deleted file mode 100644 index 38939f06..00000000 --- a/src/app/views/premiumRequired.html +++ /dev/null @@ -1,36 +0,0 @@ -
- -

Premium Required

-
-
-

This features requires a premium membership. Sign up for premium and get:

-
    -
  • - - 1 GB of encrypted file storage. -
    • -
  • - - Additional two-step login options such as YubiKey, FIDO U2F, and Duo. -
    • -
  • - - TOTP verification code (2FA) generator for logins in your vault. -
    • -
  • - - Priority customer support. -
    • -
  • - - All future premium features. More coming soon! -
    • -
- All for just {{10 | currency:"$":0}} /year. -
-
- - -
\ No newline at end of file diff --git a/src/app/views/userLayout.html b/src/app/views/userLayout.html deleted file mode 100644 index 0f7d1dc3..00000000 --- a/src/app/views/userLayout.html +++ /dev/null @@ -1,160 +0,0 @@ -
- - -
- - - -
-
-

Update Your Browser

- You are using an unsupported web browser. The web vault may not function properly. - Update your browser now. -
-
-

Update Your Encryption Key

- You are currently using an outdated encryption scheme. - Learn more and update now. -
-
-

Verify Your Email

-
- Verify your account's email address to unlock access to all features. - Send verification email now. - -
-
- Check your email inbox for a verification link. - Send verification email again. - -
-
-
-
diff --git a/src/images/boxed-bg-2x.png b/src/images/boxed-bg-2x.png deleted file mode 100644 index 2050e8aa04a0e6b5c2ecaf13502488a965b2a0b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 84138 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

@1b!Id0GMw{r(gw)+8+lbOopSLNS+ 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 z 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

rl5%ZX>1f z#>^T4Fq4;70cZfLAR!4)_aY&jc?C+52FE0XI$ma=5|yp@#ZnldS%l=~Eb&TO{Awf6 zIvZ>7%7F+yGWZdn2m#he02Y?^XTXplApDGSO{6o80|{>!Mbn_!GwiqeJU zRT*hoSH?-#Sp7GUFr%H6+XkWPkh_SWKPM)$BtXF-zJa>!t!~}a>NQCJ+M85qXiz+{ zaLQa6quOppDtIKy07$71fk+Z|D*$p=l37XxN6YF(25U#J#Ee$fFZybEjm&B$M;um2 zVp;)}i?x6db{{7Nvl6uoHb3tI>VnVujAApeL@+Bw3yhI_Hx1g}rP%332_S*N$tq|I zC}HTf?|~OH^%y&S+phTC!J5uCIivNpBf;n#GpgsQ1c=ZyX5MbsC4B2{){zL9;FzE|GK;7r2*$n%A_62aUW^DMU|b%<(*>npF))k{I;$61XZJ`F0jEe4 zSwX?zqEtYwu4at)$NN4Sf?nzo;@;MkCbIk(^uQvKkQix9Dn)}+Xpux2vXe#NtlQwO z*SpAD2kyeF@MyD~YtINx+2gV0u9bXg^bKrqdgf1DAEd! zTp7n|^}e!3V)P=I2VSx4S!P9$-r>>A^Nb`9AOawxRGC|_Egkq|Rv25xZD zl}li}6tf;8((2eE9eg&7S1^iADomZ`-OpPTSSd=>Q4pL&`ejDvXro7XRThC-DR&kR zqu=*17a>Ilm=}DQku$aNdcx~ ztTF6966g2X4Ii{4KfiO#&k@2gtY*dhh!Z2FWGi6@FruwO3M9N*^v=$|=j-sEk&t-3 z8Cd4iO&)Vii}w|00P2*W1{L*>uzE|Gd4T| zuN05b_iKxd!<;wDGoznj=UFVx#++lsJj$^Kq0%fGdAUgP+2EFWjU$)`9DQ-*k%05| zo!Ah!{$GnLo~d*+Fsw|L!G~?#kr3>xN$VFj<|9*K>;n0Li%)k`T3bvcArwPW zo+UC51VloK2G3_#LRiw;qCwe?+aITrELt^f36#iU8Hym7l^+?~YByISzScF>?Sxdb^`EHR)+t4Sk-hG_;Sz*?{c zizonw9WSG#P;Zp<=C;>`zg*^JXb(!P!5*ow2x}9zrVYWgk)f>hf+Hbk z1uaO{VqHh*g4(1dpDPB;GT|XTYCfOBxch^b^tk&q=yJrrWLY2 zNLcb$YLOS9tkyTGP2hS_<}I zCNs19ezQU=kx&8q9Q|0Du}BzVOp+iNL(w~WP*}|FP!F-QI(h}F(FzhYJLj>-!AY!0 zVQS0@zM@gne!A(%hI%)KaU&%#b=}rz2YDmR(SAgV4HNAc2$! zxxvy4IPwTf^Ny^Xh%lm_lH`c^7K<~vUGz#X+Gha2Si34KX(bDAWZ?{w_7(pO z2%rYLw2l%9f3ag2QOhnt}I`T9SDOU~lN9X=%8L!7J#P(W20r35sXK(`>uVEkeCJImCMFf zs}vplj4;MPDif;gms81pQLtmD#SQq%cvje@AJh<>PCQZYfZ&u}Dx z2)iU2y~|BoRw9*A&NXs%LP8?dzs7H04-?B`Mhj3BuC^ zSY)K%DPYtcZe;MRC4nA-=k!X{dj=zZD(9j?l_8Y_)`Wb~pT@_c%Mwf&ukLm~LhS*h-i0U*4nR9D$@14H{c% z0jWk*0JKU$0O`{B3rxUBP9PIh>HM3A;L+nVS0ufV~?sTwzwN&`2|)C z}Z~ygVvy3BP_y!S7RH8 zD8UFjhSCC8apE@p8Y~8Hp%=S>It?*|<-y38b-)M%6Sj(VA;J(KA&pZ9qJ&Lj?3XYH zAxkI%A{gncWuc>8dHHk%2#_|Ah_i_ueK+ZgkU<770g*o+*wRVj?7{Ed$2^ z|`E^7uTpAlQ=utJC} zM*g%;N}3DauQ7?WH2avEV3H`eMz15UXib`wDK76=CEZI(B1Rd7QvOn-K4|v&VW<5_ zD`_wg+dI~E?fv}7-UCQ4Vaj1wrYm)jHu1e}>E+&}z0>PUP3qhC0l*Z*lK86oI8p*? zj3h;x*qDK##7+v%Xh5?O2=pLnXP$j$v;iZ=vG(`FN#0qFB+MS9g5`rGp-2sse5)3f@?eoD|On2UV;^10+reVO^f2rt#i{B&?`}( z0u+hq#9J?GkZiwagH=&Ux)o}Sh?H>6U)|f_zsAA!C22J)j|N;J0Q68hL3!tDF|6=| zF9a2(@Kf05}bHq{fvpW!Y~_g)^wy0 zK&%^Yvoh9F z5}9{^7yxq^B*|Ff03-nKkvJY7B<;M`ObouMwdz0E5!SepOj>cFMhVtvh4vtM1|AR+ z{&6YXq$FRkfN%tu-dfE-(sF!$Z=45#h<7O#$NI@sayPNMpi&^cZE|}lsHl}pvtBX8 zP!B~%Xh8MYLHcVFfq1>Y5F~>%WqrFsNWMz@jI^`!eqQtu3qnIQgfw-j3O-Q{qyvms z{vgP6&;&9B#fUwcBo>?E)oez!0$vmei7^<@Mss|-s$L1a0HCCdkc`S@xQfLqem}n` z0dspBf^qz{fK0Jq1pylR0!Dov2QgxKrmjR(H{O`KwO4JTJ3+Jtu%7K@+}dF5jTGC( zo>zl*o0nF^{-}K;c_|y8d0UrvrTA8LN-J>^%{$Nk4Y4R*>1HubbE!~6ux&@~ zTCCgvxz}Qb1QBfMopU~bXokU^-8aaKN(i%#Udx`5uCsI%%QerADjEhf zi13>eY)}KO(}KS=g_T^HA;c+A+ra!@2&p5ow9$^xKeP%>8{uo)E#Z$CdPREMLR~O6 zf&}(y5OFV2>cS*IAK$vlwV$}YnL$1%P^UwB=J`FcZe6RIIsb`>$Z_#AnkU5TyWkij zSrsNImW7ZETA9)Ez&SdD!|Vc*VKinmCk6cNH}fOLQCe$#MstKH8!3U@$aNTuK=y*g ztg>e$3q}?IRg!4=5)i{kSU-ZFSVZ7B=>Cu5w|PRCf8e^$3FxXgZJJcBbZxtZ+uAq2 zZ7U2nEt8)mv=zC&NW_}y)wqZjyej|UPZ*M`Yzm1LSkwzV>YHjnKR^HO?5hc8Ua6K4 zQbPZhtQ*`6NR5fAgWsGPkSE^d%#>F}dePcqL32jzK4`{bMx&T&P;^$(?wYeo;%lwQ zOOb^WS;lCkfoQ#Ek7|>gYg3VdFQowSLr5`6j0uqKiY+D#TA@pDDBL!MVz3K0Nn09K zZQI^c(=C+#Ft=8kc5aRH!FYUy_(hgJkh+$SnWoZAC;^ot9d_I7yFl@ zb0lgT$>u=fUDhkf6pyso8GSEwz^$QXn2p- zY@*EUvqnJJK}E|Ry$jme!Jz#h$4*w_9JFYU%^E!VeKqOs*uCwx{j zD8uZQ14Jmq^13opj)d3>=>bVu9SCx1QOp-i6AX(GKv)1{C0NK4^qTEiER32uw-i&i zZG^{?hg4MUwJISKm38sYW1L&1+${HAwQW^qHO5Y7zBMmtDm~KBqZ^1{X&W|45(qeR z=G_HiR;or`A)FavCYl3n_!;=#SB7?d_IUA%k~2$x$63%60L?o)&!7>~?D@|CU662L zW;WL&f5`VNhDM`czqeW`ELt-NAuM5++5wG0tiI?7l!|!J5OC^vY#CwKURGMD9AW5) z(qz>LB{kdh)*)pr7so8vxeuYY;wCP3TopUHmE)1qTS|HR-~VpBD^^Ik_x_=v;l31n zsb#O2e_lb*AcPv;^T521IMlpI(vP(GgI^`HYLp@it8(Qw)ZA}J~8`{_x3U1Q^D;lV*UQ{r6s^iP!TTQHScWMixGsUP| z)VDV#Lhs*uBuT2ok)AP5Rz7c;lWA3UpJD8h>=CSE+ZI?-vaq3`jsQL2T`at_YB@!u z5)$hbp;GK1u}GvSwpOxzO$yk!RAO8nC?byA#<{d#tbrQIZW{xXm>P_OTZ4Sk!fOLV#O0G_{qcZIaxC+p13EhWI|WqljrWm8xh7zFksrkN0O13Z>P&o8L*NjrQun zw;7dmF|cOF10J!fh%O_HCJ&l@tp>$K1YRUl*E?Y+$6=FE$G_%YHSF-Az={-#H7V71OYnN&OjdyUNCV}5S5K`}RJi`4`do2cLvs7p0zO(o-cB43?VFCsU$OHj(ux~jB9 z)teMS5scvJ3eCvYKKhY2u9aX?D?*x5jKjK)7&gv!5QAZABos*=Nj6fGs#*do zS_&R%v`7n;rC znhEb+7f9ib+#COO$3$a`3&@wkidAWo8Syiz;<&kud#jGt8rJ*vn(J0}S~u;VbR;5n z^wHv!trsHB!a76*2v!pW2*4OgkM`KkihwO(0ElEH+DaM|07KyiXd&KQL}US@v4mEn pl5o?uw^GVdU5wi-f}3FX{{h%klW^oXT0j5*002ovPDHLkV1k3?^n(BZ diff --git a/src/js/analytics.js b/src/js/analytics.js deleted file mode 100644 index 3cab7e7a..00000000 --- a/src/js/analytics.js +++ /dev/null @@ -1,10 +0,0 @@ -// @if !selfHosted -(function (i, s, o, g, r, a, m) { - i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () { - (i[r].q = i[r].q || []).push(arguments) - }, i[r].l = 1 * new Date(); a = s.createElement(o), - m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m) -})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga'); - -ga('create', 'UA-81915606-3', 'auto'); -// @endif diff --git a/src/js/fallback-scripts.js b/src/js/fallback-scripts.js deleted file mode 100644 index 76f50c13..00000000 --- a/src/js/fallback-scripts.js +++ /dev/null @@ -1,9 +0,0 @@ -function loadScriptIfMissing(condition, path) { - if (!condition) { - document.write('