Merge pull request #170 from armanist/master

Dropbox related refactoring and minor text changes
softberg · Nov 1, 2024 · c801623 · c801623
2 parents 1e5b026 + 07141f3
commit c801623
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 36 deletions.
diff --git a/src/Libraries/Module/Templates/Default/Api/Controllers/OpenApi/OpenApiController.php b/src/Libraries/Module/Templates/Default/Api/Controllers/OpenApi/OpenApiController.php
@@ -24,7 +24,7 @@
  * @OA\Info(
  *    title="Quantum API documentation",
  *    version="2.9.0",
- *    description=" *Quantum Documentation: https://quantum.softberg.org/en/docs/v1/overview"
+ *    description=" *Quantum Documentation: https://quantumphp.io/en/docs/v1/overview"
  *  ),
  * @OA\SecurityScheme(
  *    securityScheme="bearer_token",

diff --git a/src/Libraries/Module/Templates/Demo/Api/Controllers/OpenApi/OpenApiController.php b/src/Libraries/Module/Templates/Demo/Api/Controllers/OpenApi/OpenApiController.php
@@ -22,7 +22,7 @@
  * @OA\Info(
  *    title="Quantum API documentation",
  *    version="2.9.0",
- *    description=" *Quantum Documentation: https://quantum.softberg.org/en/docs/v1/overview"
+ *    description=" *Quantum Documentation: https://quantumphp.io/en/docs/v1/overview"
  *  ),
  * @OA\SecurityScheme(
  *    securityScheme="bearer_token",

diff --git a/src/Libraries/Module/Templates/Demo/Web/Views/auth/signup.php b/src/Libraries/Module/Templates/Demo/Web/Views/auth/signup.php
@@ -33,13 +33,13 @@
                             </div>
                             <div class="row">
                                 <div class="input-field col s12">
-                                    <label class="auth-form-label"><?php _t(\'common.first_name\'); ?></label>
+                                    <label class="auth-form-label"><?php _t(\'common.firstname\'); ?></label>
                                     <input type="text" name="firstname" value="<?php echo old(\'firstname\') ?>" />
                                 </div>
                             </div>
                             <div class="row">
                                 <div class="input-field col s12">
-                                    <label class="auth-form-label"><?php _t(\'common.last_name\'); ?></label>
+                                    <label class="auth-form-label"><?php _t(\'common.lastname\'); ?></label>
                                     <input type="text" name="lastname" value="<?php echo old(\'lastname\') ?>" />
                                 </div>
                             </div>

diff --git a/src/Libraries/Module/Templates/Demo/Web/Views/pages/index.php b/src/Libraries/Module/Templates/Demo/Web/Views/pages/index.php
@@ -14,7 +14,7 @@
             </div>
             <div class=\"index-links\">
                 <a href=\"<?php echo base_url(true) . '/' . current_lang() ?>/about\" class=\"white-text\"><?php _t('common.about') ?></a>
-                <a href=\"https://quantum.softberg.org\" target=\"_blank\" class=\"white-text\"><?php _t('common.learn_more') ?></a>
+                <a href=\"https://quantumphp.io\" target=\"_blank\" class=\"white-text\"><?php _t('common.learn_more') ?></a>
             </div>
         </div>
     </div>

diff --git a/src/Libraries/Module/Templates/Demo/Web/Views/post/form.php b/src/Libraries/Module/Templates/Demo/Web/Views/post/form.php
@@ -11,7 +11,7 @@
                     <?php echo partial(\'partials/messages/error\') ?>
                 <?php endif; ?>
 
-                <?php echo partial(\'post/partials/modal\', [\'item\' => t(\'common.the_image\')]) ?>
+                <?php echo partial(\'post/partials/modal\', [\'item\' => t(\'common.image\')]) ?>
 
                 <div class="card teal accent-4">
                     <div class="card-content">

diff --git a/src/Libraries/Module/Templates/Demo/Web/Views/post/my-posts.php b/src/Libraries/Module/Templates/Demo/Web/Views/post/my-posts.php
@@ -14,7 +14,7 @@
         <h4 class="center-align grey-text"><?php _t(\'common.no_posts\') ?>... <?php _t(\'common.try_creating\') ?></h4>
     <?php endif; ?>
 
-    <?php echo partial(\'post/partials/modal\', [\'item\' => t(\'common.the_post\')]) ?>
+    <?php echo partial(\'post/partials/modal\', [\'item\' => t(\'common.post\')]) ?>
 
     <?php if (auth()->check()): ?>
         <div class="fixed-action-btn">

diff --git a/src/Libraries/Module/Templates/Demo/Web/Views/post/post.php b/src/Libraries/Module/Templates/Demo/Web/Views/post/post.php
@@ -18,5 +18,5 @@
 	        <?php echo $pagination->getPagination(0, 5) ?>
         </div>
     <?php endif; ?>
-    <?php echo partial(\'post/partials/modal\', [\'item\' => t(\'common.the_post\')]) ?>
+    <?php echo partial(\'post/partials/modal\', [\'item\' => t(\'common.post\')]) ?>
 </div>';
diff --git a/src/Libraries/Storage/Adapters/Dropbox/DropboxApp.php b/src/Libraries/Storage/Adapters/Dropbox/DropboxApp.php
@@ -173,6 +173,32 @@ public function fetchTokens(string $code, string $redirectUrl): ?object
         return $response;
     }
 
+    /**
+     * Fetches the access token by refresh token
+     * @param string $refreshToken
+     * @return string
+     * @throws AppException
+     * @throws HttpException
+     * @throws LangException
+     */
+    private function fetchAccessTokenByRefreshToken(string $refreshToken): string
+    {
+        $params = [
+            'refresh_token' => $refreshToken,
+            'grant_type' => 'refresh_token',
+            'client_id' => $this->appKey,
+            'client_secret' => $this->appSecret
+        ];
+
+        $tokenUrl = self::AUTH_TOKEN_URL . '?' . http_build_query($params, '', '&');
+
+        $response = $this->sendRequest($tokenUrl);
+
+        $this->tokenService->saveTokens($response->access_token);
+
+        return $response->access_token;
+    }
+
     /**
      * Sends rpc request
      * @param string $endpoint
@@ -224,17 +250,17 @@ public function path(string $name): array
      * @param string $uri
      * @param mixed|null $data
      * @param array $headers
+     * @param string $method
      * @return mixed|null
      * @throws AppException
      * @throws HttpException
      * @throws LangException
-     * @throws Exception
      */
-    public function sendRequest(string $uri, $data = null, array $headers = [])
+    public function sendRequest(string $uri, $data = null, array $headers = [], string $method = 'POST')
     {
         $this->httpClient
             ->createRequest($uri)
-            ->setMethod('POST')
+            ->setMethod($method)
             ->setData($data)
             ->setHeaders($headers)
             ->start();
@@ -253,7 +279,6 @@ public function sendRequest(string $uri, $data = null, array $headers = [])
                 $refreshToken = $this->tokenService->getRefreshToken();
 
                 $accessToken = $this->fetchAccessTokenByRefreshToken($refreshToken);
-                $this->tokenService->saveTokens($accessToken);
 
                 $prevHeaders['Authorization'] = 'Bearer ' . $accessToken;
 
@@ -267,30 +292,6 @@ public function sendRequest(string $uri, $data = null, array $headers = [])
         return $responseBody;
     }
 
-    /**
-     * Fetches the access token by refresh token
-     * @param string $refreshToken
-     * @return string
-     * @throws AppException
-     * @throws HttpException
-     * @throws LangException
-     */
-    private function fetchAccessTokenByRefreshToken(string $refreshToken): string
-    {
-        $params = [
-            'refresh_token' => $refreshToken,
-            'grant_type' => 'refresh_token',
-            'client_id' => $this->appKey,
-            'client_secret' => $this->appSecret
-        ];
-
-        $tokenUrl = self::AUTH_TOKEN_URL . '?' . http_build_query($params, '', '&');
-
-        $response = $this->sendRequest($tokenUrl);
-
-        return $response->access_token;
-    }
-
     /**
      * Checks if the access token need refresh
      * @param int $code