diff --git a/apps/backend/src/api/routes/integrations.controller.ts b/apps/backend/src/api/routes/integrations.controller.ts
index 6d89b46e..7c59d784 100644
--- a/apps/backend/src/api/routes/integrations.controller.ts
+++ b/apps/backend/src/api/routes/integrations.controller.ts
@@ -60,6 +60,7 @@ export class IntegrationsController {
identifier: p.providerIdentifier,
inBetweenSteps: p.inBetweenSteps,
refreshNeeded: p.refreshNeeded,
+ display: p.profile,
type: p.type,
time: JSON.parse(p.postingTimes),
changeProfilePicture: !!findIntegration?.changeProfilePicture,
diff --git a/apps/frontend/src/app/layout.tsx b/apps/frontend/src/app/layout.tsx
index 5efa39bb..cb8bb80b 100644
--- a/apps/frontend/src/app/layout.tsx
+++ b/apps/frontend/src/app/layout.tsx
@@ -25,6 +25,7 @@ export default async function AppLayout({ children }: { children: ReactNode }) {
= (props)
- @username
+ {integration?.display || '@username'}
diff --git a/apps/frontend/src/components/media/new.uploader.tsx b/apps/frontend/src/components/media/new.uploader.tsx
index fc53abfa..1fd9aa1c 100644
--- a/apps/frontend/src/components/media/new.uploader.tsx
+++ b/apps/frontend/src/components/media/new.uploader.tsx
@@ -9,6 +9,7 @@ import { FileInput, ProgressBar } from '@uppy/react';
// Uppy styles
import '@uppy/core/dist/style.min.css';
import '@uppy/dashboard/dist/style.min.css';
+import { useVariables } from '@gitroom/react/helpers/variable.context';
export function MultipartFileUploader({
onUploadSuccess,
@@ -58,7 +59,7 @@ export function MultipartFileUploaderAfter({
onUploadSuccess: (result: UploadResult) => void;
allowedFileTypes: string;
}) {
- const storageProvider = process.env.NEXT_PUBLIC_STORAGE_PROVIDER || "local";
+ const {storageProvider, backendUrl} = useVariables();
const fetch = useFetch();
const uppy = useMemo(() => {
@@ -71,7 +72,7 @@ export function MultipartFileUploaderAfter({
},
});
- const { plugin, options } = getUppyUploadPlugin(storageProvider, fetch)
+ const { plugin, options } = getUppyUploadPlugin(storageProvider, fetch, backendUrl)
uppy2.use(plugin, options)
// Set additional metadata when a file is added
uppy2.on('file-added', (file) => {
diff --git a/libraries/nestjs-libraries/src/integrations/social/tiktok.provider.ts b/libraries/nestjs-libraries/src/integrations/social/tiktok.provider.ts
index 6bc13da5..d1d12725 100644
--- a/libraries/nestjs-libraries/src/integrations/social/tiktok.provider.ts
+++ b/libraries/nestjs-libraries/src/integrations/social/tiktok.provider.ts
@@ -115,11 +115,11 @@ export class TiktokProvider extends SocialAbstract implements SocialProvider {
const {
data: {
- user: { avatar_url, display_name, open_id },
+ user: { avatar_url, display_name, open_id, username },
},
} = await (
await fetch(
- 'https://open.tiktokapis.com/v2/user/info/?fields=open_id,avatar_url,display_name',
+ 'https://open.tiktokapis.com/v2/user/info/?fields=open_id,avatar_url,display_name,union_id',
{
method: 'GET',
headers: {
@@ -129,6 +129,8 @@ export class TiktokProvider extends SocialAbstract implements SocialProvider {
)
).json();
+ console.log(username);
+
return {
id: open_id.replace(/-/g, ''),
name: display_name,
@@ -136,7 +138,7 @@ export class TiktokProvider extends SocialAbstract implements SocialProvider {
refreshToken: refresh_token,
expiresIn: dayjs().add(23, 'hours').unix() - dayjs().unix(),
picture: avatar_url,
- username: display_name.toLowerCase(),
+ username: display_name,
};
}
diff --git a/libraries/react-shared-libraries/src/helpers/uppy.upload.ts b/libraries/react-shared-libraries/src/helpers/uppy.upload.ts
index 86d5da70..78bd6002 100644
--- a/libraries/react-shared-libraries/src/helpers/uppy.upload.ts
+++ b/libraries/react-shared-libraries/src/helpers/uppy.upload.ts
@@ -19,7 +19,7 @@ const fetchUploadApiEndpoint = async (
};
// Define the factory to return appropriate Uppy configuration
-export const getUppyUploadPlugin = (provider: string, fetch: any) => {
+export const getUppyUploadPlugin = (provider: string, fetch: any, backendUrl: string) => {
switch (provider) {
case 'cloudflare':
return {
@@ -56,7 +56,7 @@ export const getUppyUploadPlugin = (provider: string, fetch: any) => {
return {
plugin: XHRUpload,
options: {
- endpoint: `${process.env.NEXT_PUBLIC_BACKEND_URL}/media/upload-server`,
+ endpoint: `${backendUrl}/media/upload-server`,
withCredentials: true,
},
};
diff --git a/libraries/react-shared-libraries/src/helpers/variable.context.tsx b/libraries/react-shared-libraries/src/helpers/variable.context.tsx
index 6fb98bb0..dbadde01 100644
--- a/libraries/react-shared-libraries/src/helpers/variable.context.tsx
+++ b/libraries/react-shared-libraries/src/helpers/variable.context.tsx
@@ -7,6 +7,7 @@ interface VariableContextInterface {
isGeneral: boolean;
frontEndUrl: string;
plontoKey: string;
+ storageProvider: 'local' | 'cloudflare',
backendUrl: string;
discordUrl: string;
uploadDirectory: string;
@@ -15,6 +16,7 @@ const VariableContext = createContext({
billingEnabled: false,
isGeneral: true,
frontEndUrl: '',
+ storageProvider: 'local',
plontoKey: '',
backendUrl: '',
discordUrl: '',