Merge pull request #2458 from kalletlak/fix-6217

Support multiple social_auth services Former-commit-id: 228b62766104dfc434924d25a541a9c88be99080
cBioPortal · Jul 1, 2019 · d73b8b8 · d73b8b8
2 parents 0d41e75 + 80d5d13
commit d73b8b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/appShell/App/PortalHeader.tsx b/src/appShell/App/PortalHeader.tsx
@@ -124,7 +124,7 @@ export default class PortalHeader extends React.Component<{ appStore:AppStore },
                             </div>
                         </Then>
                         <Else>
-                            <If condition={AppConfig.serverConfig.authenticationMethod === "social_auth"}>
+                            <If condition={AppConfig.serverConfig.authenticationMethod &&  AppConfig.serverConfig.authenticationMethod.includes("social_auth")}>
                                 <SocialAuthButton appStore={this.props.appStore}/>
                             </If>
                         </Else>

diff --git a/src/pages/studyView/StudyViewPage.tsx b/src/pages/studyView/StudyViewPage.tsx
@@ -185,7 +185,7 @@ export default class StudyViewPage extends React.Component<IStudyViewPageProps,
                                 <ComparisonGroupManager store={this.store} /> :
                                 (<span>
                                     Please log in to use the custom groups feature to save and compare sub-cohorts.
-                                    <If condition={AppConfig.serverConfig.authenticationMethod === "social_auth"}>
+                                    <If condition={AppConfig.serverConfig.authenticationMethod &&  AppConfig.serverConfig.authenticationMethod.includes("social_auth")}>
                                         <div className={"text-center"} style={{padding:20}}>
                                             <SocialAuthButton appStore={this.props.appStore}/>
                                         </div>