Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions app/Jobs/CreateFirstTermsOfUseVersionJob.php

This file was deleted.

15 changes: 1 addition & 14 deletions app/Jobs/UserCreateJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@

namespace App\Jobs;

use App\TermsOfUseVersion;
use App\User;
use App\UserTermsOfUseAcceptance;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Log;

class UserCreateJob extends Job {
private $email;
Expand All @@ -33,17 +30,7 @@ public function handle() {
'verified' => $this->verified,
]);

$latest = TermsOfUseVersion::latestActiveVersion();
if ($latest) {
UserTermsOfUseAcceptance::create([
'user_id' => $user->id,
'tou_version' => $latest->version,
'tou_accepted_at' => now(),
]);
} else {
Log::warning("No active Terms of Use version found when creating user {$user->email} (ID {$user->id}).");
}

return $user;

}
}
40 changes: 0 additions & 40 deletions app/Jobs/UserTouAcceptanceJob.php

This file was deleted.

37 changes: 0 additions & 37 deletions app/TermsOfUseVersion.php

This file was deleted.

6 changes: 0 additions & 6 deletions app/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@
namespace App;

use App\Notifications\ResetPasswordNotification;
use http\Exception\RuntimeException;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\DatabaseNotification;
use Illuminate\Notifications\DatabaseNotificationCollection;
Expand Down Expand Up @@ -93,10 +91,6 @@ public function managesWikis(): BelongsToMany {
return $this->belongsToMany(Wiki::class, 'wiki_managers');
}

public function touAcceptances(): HasMany {
return $this->hasMany(UserTermsOfUseAcceptance::class, 'user_id');
}

public function hasVerifiedEmail() {
return (bool) $this->verified;
}
Expand Down
34 changes: 0 additions & 34 deletions app/UserTermsOfUseAcceptance.php

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\Schema;

return new class() extends Migration {
/**
* Run the migrations.
*/
public function up(): void {
Schema::dropIfExists('tou_versions');
Schema::dropIfExists('tou_acceptances');
}
};
22 changes: 0 additions & 22 deletions tests/Jobs/CreateFirstTermsOfUseVersionJobTest.php

This file was deleted.

32 changes: 0 additions & 32 deletions tests/Jobs/UserTermsOfUseAcceptanceTest.php

This file was deleted.

39 changes: 0 additions & 39 deletions tests/Jobs/UserTouAcceptanceJobTest.php

This file was deleted.

Loading