fix(instagram): add Instagram OAuth credentials to deployment and ensure explicit redirect URL
All checks were successful
Setup EC2 Tools / setup-server (push) Successful in 2m2s
All checks were successful
Setup EC2 Tools / setup-server (push) Successful in 2m2s
This commit is contained in:
parent
30c6fc5747
commit
6fe93eea7f
2 changed files with 16 additions and 1 deletions
|
|
@ -106,6 +106,14 @@ jobs:
|
||||||
sed -i 's|^FACEBOOK_CLIENT_ID=.*|FACEBOOK_CLIENT_ID=2105308916859392|g' .env
|
sed -i 's|^FACEBOOK_CLIENT_ID=.*|FACEBOOK_CLIENT_ID=2105308916859392|g' .env
|
||||||
sed -i 's|^FACEBOOK_CLIENT_SECRET=.*|FACEBOOK_CLIENT_SECRET=79b51ed72514663f3629aa33610490f9|g' .env
|
sed -i 's|^FACEBOOK_CLIENT_SECRET=.*|FACEBOOK_CLIENT_SECRET=79b51ed72514663f3629aa33610490f9|g' .env
|
||||||
sed -i 's|^FACEBOOK_CLIENT_REDIRECT=.*|FACEBOOK_CLIENT_REDIRECT=\"https://socialmedia.tradhox.com/accounts/facebook/callback\"|g' .env
|
sed -i 's|^FACEBOOK_CLIENT_REDIRECT=.*|FACEBOOK_CLIENT_REDIRECT=\"https://socialmedia.tradhox.com/accounts/facebook/callback\"|g' .env
|
||||||
|
|
||||||
|
# Configure Instagram OAuth
|
||||||
|
grep -q "^INSTAGRAM_CLIENT_ID=" .env || echo "INSTAGRAM_CLIENT_ID=" >> .env
|
||||||
|
grep -q "^INSTAGRAM_CLIENT_SECRET=" .env || echo "INSTAGRAM_CLIENT_SECRET=" >> .env
|
||||||
|
grep -q "^INSTAGRAM_CLIENT_REDIRECT=" .env || echo "INSTAGRAM_CLIENT_REDIRECT=" >> .env
|
||||||
|
sed -i 's|^INSTAGRAM_CLIENT_ID=.*|INSTAGRAM_CLIENT_ID=1857740662320894|g' .env
|
||||||
|
sed -i 's|^INSTAGRAM_CLIENT_SECRET=.*|INSTAGRAM_CLIENT_SECRET=b20e700f7795d4f6765f17bac93a938b|g' .env
|
||||||
|
sed -i 's|^INSTAGRAM_CLIENT_REDIRECT=.*|INSTAGRAM_CLIENT_REDIRECT=\"https://socialmedia.tradhox.com/accounts/instagram/callback\"|g' .env
|
||||||
|
|
||||||
# Ensure web server owns the files after composer finishes writing caches
|
# Ensure web server owns the files after composer finishes writing caches
|
||||||
sudo chown -R www-data:www-data storage bootstrap/cache
|
sudo chown -R www-data:www-data storage bootstrap/cache
|
||||||
|
|
|
||||||
|
|
@ -37,8 +37,11 @@ public function connect(Request $request): Response
|
||||||
|
|
||||||
$this->rememberConnectSession($request, $workspace);
|
$this->rememberConnectSession($request, $workspace);
|
||||||
|
|
||||||
|
$redirectUrl = config('services.instagram.redirect') ?: route('app.social.instagram.callback');
|
||||||
|
|
||||||
$url = Socialite::driver($this->driver)
|
$url = Socialite::driver($this->driver)
|
||||||
->scopes($this->scopes)
|
->scopes($this->scopes)
|
||||||
|
->redirectUrl($redirectUrl)
|
||||||
->redirect()
|
->redirect()
|
||||||
->getTargetUrl();
|
->getTargetUrl();
|
||||||
|
|
||||||
|
|
@ -50,7 +53,11 @@ public function callback(Request $request): InertiaResponse
|
||||||
$workspace = $this->connectWorkspace($request);
|
$workspace = $this->connectWorkspace($request);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$socialUser = Socialite::driver($this->driver)->user();
|
$redirectUrl = config('services.instagram.redirect') ?: route('app.social.instagram.callback');
|
||||||
|
|
||||||
|
$socialUser = Socialite::driver($this->driver)
|
||||||
|
->redirectUrl($redirectUrl)
|
||||||
|
->user();
|
||||||
|
|
||||||
// Instagram API with Instagram Login returns the user directly
|
// Instagram API with Instagram Login returns the user directly
|
||||||
$avatarPath = $socialUser->getAvatar() ? uploadFromUrl($socialUser->getAvatar()) : null;
|
$avatarPath = $socialUser->getAvatar() ? uploadFromUrl($socialUser->getAvatar()) : null;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue