marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the branding issue for partners

Browse Source
This commit is contained in:
lalitdeore12@gmail.com
2025-07-21 13:42:52 +05:30
parent 772d8699b6
commit af9c69a2f3
2 changed files with 106 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/go-app/main.go
+67
View File
@@ -1069,6 +1069,72 @@ func handleInfo(resp http.ResponseWriter, request *http.Request) {
activatedAppIds = append(activatedAppIds, app.ID)
}
parsedStatus := []string{}
if len(org.ManagerOrgs) > 0 || userInfo.ActiveOrg.CreatorOrg != "" {
parsedStatus = append(parsedStatus, "sub_org")
parentOrgId := userInfo.ActiveOrg.CreatorOrg
if len(userInfo.ActiveOrg.CreatorOrg) == 0 {
parentOrgId = org.ManagerOrgs[0].Id
}
// Check for licensing/branding of parent and override
parentOrg, err := shuffle.GetOrg(ctx, parentOrgId)
if err == nil {
if parentOrg.LeadInfo.IntegrationPartner {
parsedStatus = append(parsedStatus, "integration_partner")
// except theme take from parent org
org.Branding.EnableChat = parentOrg.Branding.EnableChat
org.Branding.HomeUrl = parentOrg.Branding.HomeUrl
org.Branding.DocumentationLink = parentOrg.Defaults.DocumentationReference
org.Branding.SupportEmail = parentOrg.Branding.SupportEmail
org.Branding.LogoutUrl = parentOrg.Branding.LogoutUrl
org.Branding.BrandColor = parentOrg.Branding.BrandColor
org.Branding.BrandName = parentOrg.Branding.BrandName
org.Branding.GlobalUser = parentOrg.Branding.GlobalUser
if len(org.Branding.Theme) == 0 {
org.Branding.Theme = parentOrg.Branding.Theme
}
userInfo.ActiveOrg.Branding = parentOrg.Branding
userInfo.ActiveOrg.Image = parentOrg.Image
userInfo.ActiveOrg.Branding.DocumentationLink = parentOrg.Defaults.DocumentationReference
userInfo.ActiveOrg.Branding.BrandColor = parentOrg.Branding.BrandColor
userInfo.ActiveOrg.Branding.SupportEmail = org.Branding.SupportEmail
userInfo.ActiveOrg.Branding.LogoutUrl = org.Branding.LogoutUrl
userInfo.ActiveOrg.Branding.BrandName = parentOrg.Branding.BrandName
if len(org.Branding.Theme) == 0 {
userInfo.ActiveOrg.Branding.Theme = parentOrg.Branding.Theme
} else {
userInfo.ActiveOrg.Branding.Theme = org.Branding.Theme
}
// check whether current is global user or not? means is user part of parent org or not
for _, user := range parentOrg.Users {
if user.Id == userInfo.Id && user.Role == "admin" {
userInfo.ActiveOrg.Branding.GlobalUser = true
break
}
}
}
}
} else {
// for parent org branding
if org.LeadInfo.IntegrationPartner {
userInfo.ActiveOrg.Branding.Theme = org.Branding.Theme
userInfo.ActiveOrg.Branding.DocumentationLink = org.Defaults.DocumentationReference
userInfo.ActiveOrg.Branding.SupportEmail = org.Branding.SupportEmail
userInfo.ActiveOrg.Branding.LogoutUrl = org.Branding.LogoutUrl
userInfo.ActiveOrg.Branding.BrandColor = org.Branding.BrandColor
userInfo.ActiveOrg.Branding.BrandName = org.Branding.BrandName
parsedStatus = append(parsedStatus, "integration_partner")
}
}
returnValue := shuffle.HandleInfo{
Success: true,
Username: userInfo.Username,
@@ -1092,6 +1158,7 @@ func handleInfo(resp http.ResponseWriter, request *http.Request) {
Licensed: licensed,
ActiveApps: activatedAppIds,
Theme: userInfo.Theme,
OrgStatus: parsedStatus,
}
returnData, err := json.Marshal(returnValue)
frontend/src/App.jsx
+39 -6
View File
@@ -92,7 +92,7 @@ const App = (message, props) => {
const [dataset, setDataset] = useState(false)
const [isLoaded, setIsLoaded] = useState(false)
const [curpath, setCurpath] = useState(typeof window === "undefined" || window.location === undefined ? "" : window.location.pathname)
const { themeMode, handleThemeChange, setBrandColor, brandColor,setThemeMode} = useContext(Context);
const { themeMode, handleThemeChange, setBrandColor, brandColor,setThemeMode, setSupportEmail, setLogoutUrl, setBrandName} = useContext(Context);
const currentTheme = getTheme(themeMode, brandColor);
const mainColor = currentTheme?.palette?.backgroundColor
const [isPreviousThemeLight, setIsPreviousThemeLight] = useState(false)
@@ -192,11 +192,44 @@ const App = (message, props) => {
{ path: "/" }
);
}
if (responseJson?.theme?.length > 0) {
handleThemeChange(responseJson.theme)
}else{
handleThemeChange("dark")
}
if (responseJson?.org_status?.includes("integration_partner")) {
if (responseJson?.active_org?.branding?.enable_chat !== true) {
// Find the drift chatbox and remove it
}
if (responseJson?.active_org?.branding?.theme?.length > 0 ) {
handleThemeChange(responseJson?.active_org?.branding?.theme)
}
if (responseJson?.active_org?.branding?.brand_color?.length > 0 ) {
setBrandColor(responseJson?.active_org?.branding?.brand_color)
localStorage.setItem("brandColor", responseJson?.active_org?.branding?.brand_color)
}
if (responseJson?.active_org?.branding?.brand_name?.length > 0 ) {
setBrandName(responseJson?.active_org?.branding?.brand_name)
localStorage.setItem("brandName", responseJson?.active_org?.branding?.brand_name)
}
if (responseJson?.active_org?.branding?.support_email?.length > 0 ) {
setSupportEmail(responseJson?.active_org?.branding?.support_email)
}
if (responseJson?.active_org?.branding?.logout_url?.length > 0 ) {
setLogoutUrl(responseJson?.active_org?.branding?.logout_url)
}
} else {
localStorage.removeItem("brandColor")
setBrandColor("#ff8544")
setBrandName("Shuffle")
localStorage.removeItem("brandName")
if(responseJson?.theme?.length > 0){
handleThemeChange(responseJson?.theme)
}else{
handleThemeChange("dark")
}
}
}else {
handleThemeChange("dark")
setThemeMode("dark")