v2 Release

.dockerignore

@@ -3,6 +3,7 @@ _ide_*
 /.git
 /.idea
 /.tmp
+/database/*.sqlite
 /storage/app/backups/*
 /storage/debugbar/*
 /storage/framework/cache/*

.github/workflows/build-docker.yml

@@ -1,5 +1,5 @@
 ---
-name: Build regular LinkAce Docker image
+name: Build the LinkAce Docker image
 
 on:
   push:
@@ -17,7 +17,6 @@ jobs:
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -28,7 +27,7 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -40,32 +39,14 @@ jobs:
           DOCKER_IMAGE=linkace/linkace
           DOCKER_IMAGE_GITUHB=ghcr.io/kovah/linkace
           VERSION=${GITHUB_REF#refs/tags/}
-          TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:latest,${DOCKER_IMAGE_GITUHB}:${VERSION},${DOCKER_IMAGE_GITUHB}:latest"
+          TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE_GITUHB}:${VERSION}"
           echo "tags=${TAGS}" >> $GITHUB_OUTPUT
 
-      - name: Build and push advanced image
+      - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
           file: ./resources/docker/dockerfiles/release-multiplatform.Dockerfile
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           tags: ${{ steps.prep.outputs.tags }}
-
-      - name: Prepare simple tags
-        id: prep-simple
-        run: |
-          DOCKER_IMAGE=linkace/linkace
-          DOCKER_IMAGE_GITHUB=ghcr.io/kovah/linkace
-          VERSION=${GITHUB_REF#refs/tags/}
-          TAGS="${DOCKER_IMAGE}:${VERSION}-php-nginx,${DOCKER_IMAGE}:php-nginx,${DOCKER_IMAGE}:${VERSION}-simple,${DOCKER_IMAGE}:simple,${DOCKER_IMAGE_GITHUB}:${VERSION}-php-nginx,${DOCKER_IMAGE_GITHUB}:php-nginx,${DOCKER_IMAGE_GITHUB}:${VERSION}-simple,${DOCKER_IMAGE_GITHUB}:simple"
-          echo "tags=${TAGS}" >> $GITHUB_OUTPUT
-
-      - name: Build and push simple image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./resources/docker/dockerfiles/release-multiplatform-simple.Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          push: true
-          tags: ${{ steps.prep-simple.outputs.tags }}

.github/workflows/build-package.yml

@@ -6,20 +6,14 @@ on:
       - main
 
 jobs:
-
-  build-js:
-    name: Build assets for the package
+  build-package:
+    name: Build final dist package
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Reconfigure Git to use HTTP authentication
-        run: >
-          git config --global url."https://github.com/".insteadOf
-          ssh://git@github.com/
+      - uses: actions/checkout@v2
 
       - name: Use Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v2
         with:
           node-version: 20
 
@@ -28,35 +22,6 @@ jobs:
           npm ci
           npm run production
 
-      - name: Upload built assets
-        uses: actions/upload-artifact@v4
-        with:
-          name: assets
-          path: public/assets/dist
-
-      - name: Upload mix manifest
-        uses: actions/upload-artifact@v4
-        with:
-          name: mix-manifest
-          path: public/mix-manifest.json
-
-  build-package:
-    name: Build final dist package
-    runs-on: ubuntu-latest
-    needs: build-js
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: assets
-          path: public/assets/dist
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: mix-manifest
-          path: public
-
       - uses: shivammathur/setup-php@v2
         with:
           php-version: 8.1
@@ -65,7 +30,7 @@ jobs:
       - id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -86,46 +51,30 @@ jobs:
       - name: Remove .env file
         run: rm .env
 
-      - uses: thedoctor0/zip-release@master
-        with:
-          filename: linkace.zip
-          exclusions: '*.git*'
-
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: linkace-package
-          path: linkace.zip
+          path: |
+            .
+            !.git
 
   build-package-docker:
     name: Build final dist package for Docker setup
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
       - name: Rename files
         run: |
           mv .env.docker.production .env
           chmod 0666 .env
-          mv docker-compose.production-simple.yml docker-compose.yml
-
-      - uses: montudor/action-zip@v1
-        with:
-          args: zip -qq linkace-package-docker-simple.zip docker-compose.yml .env LICENSE.md README.md
+          mv docker-compose.production.yml docker-compose.yml
 
       - uses: actions/upload-artifact@v4
         with:
-          name: linkace-docker-simple
-          path: linkace-package-docker-simple.zip
-
-      - name: Rename files
-        run: mv docker-compose.production.yml docker-compose.yml
-
-      - uses: montudor/action-zip@v1
-        with:
-          args: zip -qq linkace-package-docker-advanced.zip docker-compose.yml .env nginx.conf nginx-ssl.conf LICENSE.md README.md
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: linkace-docker-advanced
-          path: linkace-package-docker-advanced.zip
-
+          name: linkace-docker
+          path: |
+            docker-compose.yml
+            .env
+            LICENSE.md
+            README.md

.github/workflows/test.yml

@@ -6,7 +6,7 @@ on:
 jobs:
 
   test-js:
-    name: Test asset generation process on Node 18 LTS
+    name: Test asset generation process on Node
     runs-on: ubuntu-latest
 
     steps:

CONTRIBUTING.md

@@ -84,5 +84,5 @@ docker exec -it linkace-php composer run test
 The Base image for LinkAce contains several packages and PHP extensions needed by LinkAce. It shortens the build time of the release images. This step is not needed by any developer working on LinkAce and is just a documentation for maintainers.
 
 ```bash
-docker buildx build --push --platform "linux/amd64,linux/arm64,linux/arm/v7" -t linkace/base-image:php-8.2-alpine -f resources/docker/dockerfiles/release-base.Dockerfile .
+docker buildx build --push --platform "linux/amd64,linux/arm64,linux/arm/v7" -t linkace/base-image:php-8.3-alpine -f resources/docker/dockerfiles/release-base.Dockerfile .
 ```

README.md

@@ -1,3 +1,5 @@
+<p align="center"><b>:warning: CAUTION! THIS IS A DEVELOPMENT VERSION OF LINKACE! DO NOT USE IT NOW! :warning:</b></p>
+
 <p align="center">
   <img src="https://www.linkace.org/images/linkace-social.jpg" title="Linkace">
 </p>

app/Actions/Fortify/CreateNewUser.php

@@ -2,9 +2,11 @@
 
 namespace App\Actions\Fortify;
 
+use App\Actions\Settings\SetDefaultSettingsForUser;
 use App\Models\User;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
 use Laravel\Fortify\Contracts\CreatesNewUsers;
@@ -13,31 +15,39 @@ class CreateNewUser implements CreatesNewUsers
 {
     use PasswordValidationRules;
 
-    /**
-     * Validate and create a newly registered user.
-     *
-     * @param array $input
-     * @return User
-     * @throws ValidationException
-     */
     public function create(array $input): User
     {
-        Validator::make($input, [
-            'name' => ['required', 'string', 'max:255'],
+        Validator::make($input, self::rules())->validate();
+
+        $user = User::create([
+            'name' => $input['name'],
+            'email' => $input['email'],
+            'password' => Hash::make($input['password']),
+        ]);
+
+        (new SetDefaultSettingsForUser($user))->up();
+
+        return $user;
+    }
+
+    public static function rules(): array
+    {
+        return [
+            'name' => [
+                'required',
+                'string',
+                'max:20',
+                'alpha_dash',
+                Rule::unique(User::class),
+            ],
             'email' => [
                 'required',
                 'string',
                 'email',
                 'max:255',
                 Rule::unique(User::class),
             ],
-            'password' => $this->passwordRules(),
-        ])->validate();
-
-        return User::create([
-            'name' => $input['name'],
-            'email' => $input['email'],
-            'password' => Hash::make($input['password']),
-        ]);
+            'password' => self::passwordRules(),
+        ];
     }
 }

app/Actions/Fortify/CreateUserInvitation.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use App\Models\UserInvitation;
+use Illuminate\Support\Str;
+
+class CreateUserInvitation
+{
+    public static function run(string $email)
+    {
+        return UserInvitation::create([
+            'token' => Str::random(32),
+            'email' => $email,
+            'inviter_id' => auth()->id(),
+            'valid_until' => now()->addDays(3),
+        ]);
+    }
+}

app/Actions/Fortify/PasswordValidationRules.php

@@ -6,12 +6,7 @@
 
 trait PasswordValidationRules
 {
-    /**
-     * Get the validation rules used to validate passwords.
-     *
-     * @return array
-     */
-    protected function passwordRules(): array
+    protected static function passwordRules(): array
     {
         return ['required', 'string', new Password, 'confirmed'];
     }

app/Actions/Fortify/ResetUserPassword.php

@@ -11,17 +11,10 @@ class ResetUserPassword implements ResetsUserPasswords
 {
     use PasswordValidationRules;
 
-    /**
-     * Validate and reset the user's forgotten password.
-     *
-     * @param mixed $user
-     * @param array $input
-     * @throws ValidationException
-     */
     public function reset($user, array $input): void
     {
         Validator::make($input, [
-            'password' => $this->passwordRules(),
+            'password' => self::passwordRules(),
         ])->validate();
 
         $user->forceFill([

app/Actions/Fortify/UpdateUserPassword.php

@@ -11,18 +11,11 @@ class UpdateUserPassword implements UpdatesUserPasswords
 {
     use PasswordValidationRules;
 
-    /**
-     * Validate and update the user's password.
-     *
-     * @param mixed $user
-     * @param array $input
-     * @throws ValidationException
-     */
     public function update($user, array $input): void
     {
         Validator::make($input, [
             'current_password' => ['required', 'string'],
-            'password' => $this->passwordRules(),
+            'password' => self::passwordRules(),
         ])->after(function ($validator) use ($user, $input) {
             if (!Hash::check($input['current_password'], $user->password)) {
                 $validator->errors()->add('current_password', trans('settings.old_password_invalid'));