diff --git a/composer.lock b/composer.lock index 6ce09bd..f5a2068 100644 --- a/composer.lock +++ b/composer.lock @@ -62,16 +62,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.334.6", + "version": "3.334.7", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "2b0be3aded849d3b7bb0b53ea3295c7cecdeeee7" + "reference": "8e0104e95a1edba209e077e6c4212b8cca04686f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2b0be3aded849d3b7bb0b53ea3295c7cecdeeee7", - "reference": "2b0be3aded849d3b7bb0b53ea3295c7cecdeeee7", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8e0104e95a1edba209e077e6c4212b8cca04686f", + "reference": "8e0104e95a1edba209e077e6c4212b8cca04686f", "shasum": "" }, "require": { @@ -154,9 +154,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.334.6" + "source": "https://github.com/aws/aws-sdk-php/tree/3.334.7" }, - "time": "2024-12-13T19:18:29+00:00" + "time": "2024-12-16T19:09:36+00:00" }, { "name": "barryvdh/laravel-dompdf", @@ -6366,16 +6366,16 @@ }, { "name": "google/apiclient", - "version": "v2.18.1", + "version": "v2.18.2", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client.git", - "reference": "3f6cb1a970fe2d210823a79de8d5dbae405a9616" + "reference": "d8d201ba8a189a3cd7fb34e4da569f2ed440eee7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/3f6cb1a970fe2d210823a79de8d5dbae405a9616", - "reference": "3f6cb1a970fe2d210823a79de8d5dbae405a9616", + "url": "https://api.github.com/repos/googleapis/google-api-php-client/zipball/d8d201ba8a189a3cd7fb34e4da569f2ed440eee7", + "reference": "d8d201ba8a189a3cd7fb34e4da569f2ed440eee7", "shasum": "" }, "require": { @@ -6429,9 +6429,9 @@ ], "support": { "issues": "https://github.com/googleapis/google-api-php-client/issues", - "source": "https://github.com/googleapis/google-api-php-client/tree/v2.18.1" + "source": "https://github.com/googleapis/google-api-php-client/tree/v2.18.2" }, - "time": "2024-11-24T13:21:03+00:00" + "time": "2024-12-16T22:52:40+00:00" }, { "name": "google/apiclient-services", diff --git a/config/sentry.php b/config/sentry.php index 1251442..c152d7e 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -2,6 +2,12 @@ return [ + // Ignore OAuthServerException eg + // The token violates some mandatory constraints, details: + // - The token is expired + 'ignore_exceptions' => [ + \League\OAuth2\Server\Exception\OAuthServerException::class, + ], // @see https://docs.sentry.io/product/sentry-basics/dsn-explainer/ 'dsn' => env('SENTRY_LARAVEL_DSN', env('SENTRY_DSN')), diff --git a/init_multidomains.sh b/init_multidomains.sh index 5d27f8f..214f8b0 100755 --- a/init_multidomains.sh +++ b/init_multidomains.sh @@ -152,6 +152,39 @@ else echo "Environment variable MULTI_DOMAINS is empty." fi +# Default setup +echo "Default setup" +# This is required for create default laravel envs +if [ -n "$JWT_PUBLIC_KEY_BASE64" ]; then + echo "Storing public RSA key for JWT generation - storage/oauth-public.key" + echo ${JWT_PUBLIC_KEY_BASE64} | base64 -d > storage/oauth-public.key +fi + +if [ -n "$JWT_PRIVATE_KEY_BASE64" ]; then + echo "Storing private RSA key for JWT generation - storage/oauth-private.key" + echo ${JWT_PRIVATE_KEY_BASE64} | base64 -d > storage/oauth-private.key +fi + + +if [ "$DISABLE_DB_MIGRATE" == 'true' ] +then + echo "Disable db migrate" +else + php artisan migrate --force +fi + +# generate passport keys only if storage/oauth-private.key is not set + +FILE=storage/oauth-private.key +if [ -f "$FILE" ]; then + echo "$FILE exists." +else + echo "$FILE does not exist. Generating app keys, passport keys and passport client" + php artisan key:generate --force --no-interaction + php artisan passport:keys --force --no-interaction + php artisan passport:client --personal --no-interaction +fi + touch inited # TODO: Fixme