Page MenuHomePhorge
Differential D1894

Room Security Options - Password
ClosedPublic
Actions

Authored by machniak on Nov 27 2020, 12:43 PM.
Tags
None
Referenced Files
F19026566: D1894.1742075404.diff
Fri, Mar 14, 10:50 PM
F19026382: D1894.1742069964.diff
Fri, Mar 14, 9:19 PM
F19025534: D1894.1742049068.diff
Fri, Mar 14, 3:31 PM
F19025192: D1894.1742046204.diff
Fri, Mar 14, 2:43 PM
Subscribers
vanmeeuwen
Restricted Project

Details

Reviewers
vanmeeuwen
Group Reviewers
Restricted Project
Commits
rK0794370955ad: Room Security Options - Password
Test Plan

./phpunit

Diff Detail

Repository
rK kolab
Branch
dev/room-security-options
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 31966
Build 12193: arc lint + arc unit

Event Timeline

machniak requested review of this revision.Nov 27 2020, 12:43 PM
machniak created this revision.
Harbormaster completed remote builds in B31966: Diff 5218.Nov 27 2020, 12:43 PM
machniak updated this revision to Diff 5242.Dec 1 2020, 2:32 PM
  • Comment out room locking options
Harbormaster completed remote builds in B31990: Diff 5242.Dec 1 2020, 2:32 PM
vanmeeuwen updated this revision to Diff 5248.Dec 4 2020, 10:31 AM
vanmeeuwen subscribed.
  • We're getting superfluous log messages from the web socket router
Harbormaster completed remote builds in B31996: Diff 5248.Dec 4 2020, 10:31 AM
vanmeeuwen accepted this revision.Dec 4 2020, 10:36 AM
This revision is now accepted and ready to land.Dec 4 2020, 10:36 AM
Closed by commit rK0794370955ad: Room Security Options - Password. · Explain WhyDec 4 2020, 10:38 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
src/
app/
Http/
Controllers/
API/
V4/
91 lines
OpenVidu/
8 lines
resources/
js/
2 lines
lang/
en/
4 lines
themes/
30 lines
4 lines
vue/
Meet/
117 lines
110 lines
routes/
3 lines
tests/
Browser/
Meet/
5 lines
129 lines
15 lines
Pages/
Meet/
1 line
Feature/
Controller/
129 lines

Diff 5218

View Options

src/app/Http/Controllers/API/V4/OpenViduController.php

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Linesclass EntitlementObserver
* *
* @param \App\Entitlement $entitlement The entitlement. * @param \App\Entitlement $entitlement The entitlement.
* *
* @return void * @return void
*/ */
public function deleted(Entitlement $entitlement) public function deleted(Entitlement $entitlement)
{ {
if (!$entitlement->entitleable->trashed()) { if (!$entitlement->entitleable->trashed()) {
// TODO: This is useless, remove this, but also maybe refactor the whole method,
// i.e. move job invoking to App\Handlers (don't depend on SKU title).
mollekopfUnsubmitted
Not Done
Inline Actions

So you think this is here to trigger an update job via the listener? Could be, it was added here: 66f0930de7bb3db29a5ead4148c96b3f38f8d370 (for ldap backend support)

This deserves at least a comment though, it's a very in-transparent way to trigger an update job.

mollekopf: So you think this is here to trigger an update job via the listener? Could be, it was added…
vanmeeuwenUnsubmitted
Not Done
Inline Actions

I think this is a circumvention for the bubbling of an \App\User::delete() on to its individual \App\User::entitlements() getting deleted in its observer.

vanmeeuwen: I think this is a circumvention for the bubbling of an `\App\User::delete()` on to its…
// Also make sure the transaction is always being created
$entitlement->entitleable->updated_at = Carbon::now(); $entitlement->entitleable->updated_at = Carbon::now();
$entitlement->entitleable->save(); $entitlement->entitleable->save();
$entitlement->createTransaction(\App\Transaction::ENTITLEMENT_DELETED); $entitlement->createTransaction(\App\Transaction::ENTITLEMENT_DELETED);
} }
// Remove all configured 2FA methods from Roundcube database // Remove all configured 2FA methods from Roundcube database
if ($entitlement->sku->title == '2fa') { if ($entitlement->sku->title == '2fa') {
Show All 12 Linesclass EntitlementObserver
* Handle the entitlement "deleting" event. * Handle the entitlement "deleting" event.
* *
* @param \App\Entitlement $entitlement The entitlement. * @param \App\Entitlement $entitlement The entitlement.
* *
* @return void * @return void
*/ */
public function deleting(Entitlement $entitlement) public function deleting(Entitlement $entitlement)
{ {
$entitlement->wallet->chargeEntitlement($entitlement); // Disable updating of updated_at column on delete, we need it unchanged to later
// charge the wallet for the uncharged period before the entitlement has been deleted
$entitlement->timestamps = false;
} }
} }
View Options

src/app/OpenVidu/Room.php

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Linesclass EntitlementObserver
* *
* @param \App\Entitlement $entitlement The entitlement. * @param \App\Entitlement $entitlement The entitlement.
* *
* @return void * @return void
*/ */
public function deleted(Entitlement $entitlement) public function deleted(Entitlement $entitlement)
{ {
if (!$entitlement->entitleable->trashed()) { if (!$entitlement->entitleable->trashed()) {
// TODO: This is useless, remove this, but also maybe refactor the whole method,
// i.e. move job invoking to App\Handlers (don't depend on SKU title).
mollekopfUnsubmitted
Not Done
Inline Actions

So you think this is here to trigger an update job via the listener? Could be, it was added here: 66f0930de7bb3db29a5ead4148c96b3f38f8d370 (for ldap backend support)

This deserves at least a comment though, it's a very in-transparent way to trigger an update job.

mollekopf: So you think this is here to trigger an update job via the listener? Could be, it was added…
vanmeeuwenUnsubmitted
Not Done
Inline Actions

I think this is a circumvention for the bubbling of an \App\User::delete() on to its individual \App\User::entitlements() getting deleted in its observer.

vanmeeuwen: I think this is a circumvention for the bubbling of an `\App\User::delete()` on to its…
// Also make sure the transaction is always being created
$entitlement->entitleable->updated_at = Carbon::now(); $entitlement->entitleable->updated_at = Carbon::now();
$entitlement->entitleable->save(); $entitlement->entitleable->save();
$entitlement->createTransaction(\App\Transaction::ENTITLEMENT_DELETED); $entitlement->createTransaction(\App\Transaction::ENTITLEMENT_DELETED);
} }
// Remove all configured 2FA methods from Roundcube database // Remove all configured 2FA methods from Roundcube database
if ($entitlement->sku->title == '2fa') { if ($entitlement->sku->title == '2fa') {
Show All 12 Linesclass EntitlementObserver
* Handle the entitlement "deleting" event. * Handle the entitlement "deleting" event.
* *
* @param \App\Entitlement $entitlement The entitlement. * @param \App\Entitlement $entitlement The entitlement.
* *
* @return void * @return void
*/ */
public function deleting(Entitlement $entitlement) public function deleting(Entitlement $entitlement)
{ {
$entitlement->wallet->chargeEntitlement($entitlement); // Disable updating of updated_at column on delete, we need it unchanged to later
// charge the wallet for the uncharged period before the entitlement has been deleted
$entitlement->timestamps = false;
} }
} }
View Options

src/resources/js/meet.js

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Linesclass EntitlementObserver
* *
* @param \App\Entitlement $entitlement The entitlement. * @param \App\Entitlement $entitlement The entitlement.
* *
* @return void * @return void
*/ */
public function deleted(Entitlement $entitlement) public function deleted(Entitlement $entitlement)
{ {
if (!$entitlement->entitleable->trashed()) { if (!$entitlement->entitleable->trashed()) {
// TODO: This is useless, remove this, but also maybe refactor the whole method,
// i.e. move job invoking to App\Handlers (don't depend on SKU title).
mollekopfUnsubmitted
Not Done
Inline Actions

So you think this is here to trigger an update job via the listener? Could be, it was added here: 66f0930de7bb3db29a5ead4148c96b3f38f8d370 (for ldap backend support)

This deserves at least a comment though, it's a very in-transparent way to trigger an update job.

mollekopf: So you think this is here to trigger an update job via the listener? Could be, it was added…
vanmeeuwenUnsubmitted
Not Done
Inline Actions

I think this is a circumvention for the bubbling of an \App\User::delete() on to its individual \App\User::entitlements() getting deleted in its observer.

vanmeeuwen: I think this is a circumvention for the bubbling of an `\App\User::delete()` on to its…
// Also make sure the transaction is always being created
$entitlement->entitleable->updated_at = Carbon::now(); $entitlement->entitleable->updated_at = Carbon::now();
$entitlement->entitleable->save(); $entitlement->entitleable->save();
$entitlement->createTransaction(\App\Transaction::ENTITLEMENT_DELETED); $entitlement->createTransaction(\App\Transaction::ENTITLEMENT_DELETED);
} }
// Remove all configured 2FA methods from Roundcube database // Remove all configured 2FA methods from Roundcube database
if ($entitlement->sku->title == '2fa') { if ($entitlement->sku->title == '2fa') {
Show All 12 Linesclass EntitlementObserver
* Handle the entitlement "deleting" event. * Handle the entitlement "deleting" event.
* *
* @param \App\Entitlement $entitlement The entitlement. * @param \App\Entitlement $entitlement The entitlement.
* *
* @return void * @return void
*/ */
public function deleting(Entitlement $entitlement) public function deleting(Entitlement $entitlement)
{ {
$entitlement->wallet->chargeEntitlement($entitlement); // Disable updating of updated_at column on delete, we need it unchanged to later
// charge the wallet for the uncharged period before the entitlement has been deleted
$entitlement->timestamps = false;
} }
} }
View Options

src/resources/lang/en/meet.php

Show First 20 Lines • Show All 72 Lines • ▼ Show 20 Linesclass EntitlementObserver
* *
* @param \App\Entitlement $entitlement The entitlement. * @param \App\Entitlement $entitlement The entitlement.
* *
* @return void * @return void
*/ */
public function deleted(Entitlement $entitlement) public function deleted(Entitlement $entitlement)
{ {
if (!$entitlement->entitleable->trashed()) { if (!$entitlement->entitleable->trashed()) {
// TODO: This is useless, remove this, but also maybe refactor the whole method,
// i.e. move job invoking to App\Handlers (don't depend on SKU title).
mollekopfUnsubmitted
Not Done
Inline Actions

So you think this is here to trigger an update job via the listener? Could be, it was added here: 66f0930de7bb3db29a5ead4148c96b3f38f8d370 (for ldap backend support)

This deserves at least a comment though, it's a very in-transparent way to trigger an update job.

mollekopf: So you think this is here to trigger an update job via the listener? Could be, it was added…
vanmeeuwenUnsubmitted
Not Done
Inline Actions

I think this is a circumvention for the bubbling of an \App\User::delete() on to its individual \App\User::entitlements() getting deleted in its observer.

vanmeeuwen: I think this is a circumvention for the bubbling of an `\App\User::delete()` on to its…
// Also make sure the transaction is always being created
$entitlement->entitleable->updated_at = Carbon::now(); $entitlement->entitleable->updated_at = Carbon::now();
$entitlement->entitleable->save(); $entitlement->entitleable->save();
$entitlement->createTransaction(\App\Transaction::ENTITLEMENT_DELETED); $entitlement->createTransaction(\App\Transaction::ENTITLEMENT_DELETED);
} }
// Remove all configured 2FA methods from Roundcube database // Remove all configured 2FA methods from Roundcube database
if ($entitlement->sku->title == '2fa') { if ($entitlement->sku->title == '2fa') {
Show All 12 Linesclass EntitlementObserver
* Handle the entitlement "deleting" event. * Handle the entitlement "deleting" event.
* *
* @param \App\Entitlement $entitlement The entitlement. * @param \App\Entitlement $entitlement The entitlement.
* *
* @return void * @return void
*/ */
public function deleting(Entitlement $entitlement) public function deleting(Entitlement $entitlement)
{ {
$entitlement->wallet->chargeEntitlement($entitlement); // Disable updating of updated_at column on delete, we need it unchanged to later
// charge the wallet for the uncharged period before the entitlement has been deleted
$entitlement->timestamps = false;
} }
} }
View Options

src/resources/themes/forms.scss

Loading...
View Options

src/resources/themes/meet.scss

Loading...
View Options

src/resources/vue/Meet/Room.vue

Loading...
View Options

src/resources/vue/Meet/SessionSecurityOptions.vue

Loading...
View Options

src/routes/api.php

Loading...
View Options

src/tests/Browser/Meet/RoomControlsTest.php

Loading...
View Options

src/tests/Browser/Meet/RoomSecurityTest.php

Loading...
View Options

src/tests/Browser/Meet/RoomSetupTest.php

Loading...
View Options

src/tests/Browser/Pages/Meet/Room.php

Loading...
View Options

src/tests/Feature/Controller/OpenViduTest.php

Loading...