cgsmith/caloriethingy.com
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing API calls

Browse Source
This commit is contained in:
Chris Smith
2025-02-24 19:56:05 +01:00
parent 6bad9ad90d
commit 30377ad95f
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/controllers/AuthController.php
View File

@@ -66,12 +66,11 @@ class AuthController extends Controller
$user = User::findOne(['email' => $data['email'] ?? null]); $user = User::findOne(['email' => $data['email'] ?? null]);
if (!$user || !Yii::$app->security->validatePassword($data['password'], $user->password_hash)) { if (!$user || !Yii::$app->security->validatePassword($data['password'], $user->password_hash)) {
throw new UnauthorizedHttpException(); throw new UnauthorizedHttpException();
return ['error' => 'Invalid credentials'];
} }
// @todo not sure if it makes sense to generate an auth key each login via the API? // @todo not sure if it makes sense to generate an auth key each login via the API?
$user->generateAuthKey(); $user->generateAuthKey();
$user->save(); $user->save();
return ['token' => $this->generateJwt($user)]; return ['token' => $this->generateJwt($user)];
}e }
} }

3
api/controllers/MealController.php
View File

@@ -29,9 +29,10 @@ class MealController extends ActiveController
{ {
Yii::$app->response->format = Response::FORMAT_JSON; Yii::$app->response->format = Response::FORMAT_JSON;
$model = new MealForm(); $model = new MealForm();
$model->load(Yii::$app->request->post());
$model->picture = UploadedFile::getInstance($model, 'picture'); $model->picture = UploadedFile::getInstance($model, 'picture');
if ($model->upload()) { if ($model->upload()) {
$id = \Yii::$app->gemini->mealInquiry(Yii::getAlias('@frontend/web/'.$model->filepath)); $id = \Yii::$app->gemini->mealInquiry($model);
return array_merge(['meal' => Meal::findOne($id)], $this->actionGetDailySummary()); return array_merge(['meal' => Meal::findOne($id)], $this->actionGetDailySummary());
} }

4
common/components/GeminiApiComponent.php
View File

@@ -39,8 +39,8 @@ class GeminiApiComponent extends \yii\base\Component
"parts" => [ "parts" => [
[ [
"inline_data" => [ "inline_data" => [
"data" => base64_encode(file_get_contents($model->filepath)), "data" => base64_encode(file_get_contents(Yii::getAlias('@frontend/web/') . $model->filepath)),
"mimeType" => FileHelper::getMimeType($model->filepath) "mimeType" => FileHelper::getMimeType(Yii::getAlias('@frontend/web/') . $model->filepath)
] ]
] ]
] ]