resolved conflicts

1 files changed, 2 insertions, 2 deletions

diff --git a/src/server/ApiManagers/GooglePhotosManager.ts b/src/server/ApiManagers/GooglePhotosManager.ts
index 88219423d..be17b698e 100644
--- a/src/server/ApiManagers/GooglePhotosManager.ts
+++ b/src/server/ApiManagers/GooglePhotosManager.ts
@@ -3,7 +3,7 @@ import { Method, _error, _success, _invalid } from "../RouteManager";
 import * as path from "path";
 import { GoogleApiServerUtils } from "../apis/google/GoogleApiServerUtils";
 import { BatchedArray, TimeUnit } from "array-batcher";
-import { Opt } from "../../new_fields/Doc";
+import { Opt } from "../../fields/Doc";
 import { DashUploadUtils, InjectSize, SizeSuffix } from "../DashUploadUtils";
 import { Database } from "../database";
 import { red } from "colors";
@@ -56,7 +56,7 @@ export default class GooglePhotosManager extends ApiManager {
                 const { media } = req.body;
 
                 // first we need to ensure that we know the google account to which these photos will be uploaded
-                const token = await GoogleApiServerUtils.retrieveAccessToken(user.id);
+                const token = (await GoogleApiServerUtils.retrieveCredentials(user.id))?.credentials?.access_token;
                 if (!token) {
                     return _error(res, authenticationError);
                 }