songjianet commented on code in PR #14743:
URL:
https://github.com/apache/dolphinscheduler/pull/14743#discussion_r1293032206
##########
dolphinscheduler-ui/src/views/login/index.tsx:
##########
@@ -38,15 +41,16 @@ import { useLocalesStore } from '@/store/locales/locales'
import { useThemeStore } from '@/store/theme/theme'
import cookies from 'js-cookie'
import { ssoLoginUrl } from '@/service/modules/login'
+import { OAuth2Provider } from '@/service/modules/login/types'
Review Comment:
Please import type.
##########
dolphinscheduler-ui/src/views/login/index.tsx:
##########
@@ -38,15 +41,16 @@ import { useLocalesStore } from '@/store/locales/locales'
import { useThemeStore } from '@/store/theme/theme'
import cookies from 'js-cookie'
import { ssoLoginUrl } from '@/service/modules/login'
+import { OAuth2Provider } from '@/service/modules/login/types'
+
Review Comment:
Please delete enter.
##########
dolphinscheduler-ui/src/views/login/use-login.ts:
##########
@@ -16,23 +16,25 @@
*/
import { useRouter } from 'vue-router'
-import { login } from '@/service/modules/login'
+import { clearCookie, getOauth2Provider, login } from '@/service/modules/login'
import { getUserInfo } from '@/service/modules/users'
import { useUserStore } from '@/store/user/user'
import type { Router } from 'vue-router'
-import type { LoginRes } from '@/service/modules/login/types'
+import { useRoute } from 'vue-router'
+import type { LoginRes, OAuth2Provider } from '@/service/modules/login/types'
import type { UserInfoRes } from '@/service/modules/users/types'
import { useRouteStore } from '@/store/route/route'
import { useTimezoneStore } from '@/store/timezone/timezone'
import cookies from 'js-cookie'
import { queryBaseDir } from '@/service/modules/resources'
+import { reactive, ref } from 'vue'
Review Comment:
Please remove unused references.
##########
dolphinscheduler-ui/src/views/login/index.tsx:
##########
@@ -170,6 +178,15 @@ const login = defineComponent({
</NButton>
</a>
</div>
+ {this.oauth2Providers.length > 0 ? <NDivider >
+ {this.t('login.otherwayLogin')}
+ </NDivider> : <div></div>}
Review Comment:
Don't use Ternary operator, Please user this.oauth2Providers.length > 0 &&
<NDivider>
{this.t('login.otherwayLogin')}
</NDivider>
##########
dolphinscheduler-ui/src/views/login/use-login.ts:
##########
@@ -63,7 +65,49 @@ export function useLogin(state: any) {
})
}
+
+
+ const handleGetOAuth2Provider = () => {
+ getOauth2Provider().then((res: Array<OAuth2Provider> | []) => {
+ oauth2Providers.value = res
+ })
+ }
+
+ const oauth2Providers = ref<Array<OAuth2Provider> | []>([])
+
+ const gotoOAuth2Page = async (oauth2Provider: OAuth2Provider) => {
+ await clearCookie()
+ window.location.href =
`${oauth2Provider.authorizationUri}?client_id=${oauth2Provider.clientId}` +
+
`&redirect_uri=${oauth2Provider.redirectUri}?provider=${oauth2Provider.provider}`
+ }
+
+ const handleRedirect = async () => {
+ debugger
+ const authType = route.query.authType
+ if (authType && authType == 'oauth2') {
Review Comment:
Please use '==='.
##########
dolphinscheduler-ui/src/views/login/use-login.ts:
##########
@@ -63,7 +65,49 @@ export function useLogin(state: any) {
})
}
+
+
+ const handleGetOAuth2Provider = () => {
+ getOauth2Provider().then((res: Array<OAuth2Provider> | []) => {
+ oauth2Providers.value = res
+ })
+ }
+
+ const oauth2Providers = ref<Array<OAuth2Provider> | []>([])
+
+ const gotoOAuth2Page = async (oauth2Provider: OAuth2Provider) => {
+ await clearCookie()
+ window.location.href =
`${oauth2Provider.authorizationUri}?client_id=${oauth2Provider.clientId}` +
+
`&redirect_uri=${oauth2Provider.redirectUri}?provider=${oauth2Provider.provider}`
+ }
+
+ const handleRedirect = async () => {
+ debugger
+ const authType = route.query.authType
+ if (authType && authType == 'oauth2') {
+ const sessionId = route.query.sessionId
+ if (sessionId) {
+ cookies.set('sessionId', String(sessionId), { path: '/' })
+ const userInfoRes: UserInfoRes = await getUserInfo()
+ await userStore.setUserInfo(userInfoRes)
+ const timezone = userInfoRes.timeZone ? userInfoRes.timeZone : 'UTC'
+ await timezoneStore.setTimezone(timezone)
+ router.push('home')
+ }
+ const error = route.query.error
+ if (error) {
+ window.$message.error(error)
+ }
+
Review Comment:
Please delete enter.
##########
dolphinscheduler-ui/src/views/login/use-login.ts:
##########
@@ -63,7 +65,49 @@ export function useLogin(state: any) {
})
}
+
+
+ const handleGetOAuth2Provider = () => {
+ getOauth2Provider().then((res: Array<OAuth2Provider> | []) => {
+ oauth2Providers.value = res
+ })
+ }
+
+ const oauth2Providers = ref<Array<OAuth2Provider> | []>([])
+
+ const gotoOAuth2Page = async (oauth2Provider: OAuth2Provider) => {
+ await clearCookie()
+ window.location.href =
`${oauth2Provider.authorizationUri}?client_id=${oauth2Provider.clientId}` +
+
`&redirect_uri=${oauth2Provider.redirectUri}?provider=${oauth2Provider.provider}`
+ }
+
+ const handleRedirect = async () => {
+ debugger
Review Comment:
Please remove debugger.
##########
dolphinscheduler-ui/src/views/login/use-login.ts:
##########
@@ -63,7 +65,49 @@ export function useLogin(state: any) {
})
}
+
+
+ const handleGetOAuth2Provider = () => {
+ getOauth2Provider().then((res: Array<OAuth2Provider> | []) => {
+ oauth2Providers.value = res
+ })
+ }
+
+ const oauth2Providers = ref<Array<OAuth2Provider> | []>([])
+
+ const gotoOAuth2Page = async (oauth2Provider: OAuth2Provider) => {
+ await clearCookie()
+ window.location.href =
`${oauth2Provider.authorizationUri}?client_id=${oauth2Provider.clientId}` +
+
`&redirect_uri=${oauth2Provider.redirectUri}?provider=${oauth2Provider.provider}`
+ }
+
+ const handleRedirect = async () => {
+ debugger
+ const authType = route.query.authType
+ if (authType && authType == 'oauth2') {
+ const sessionId = route.query.sessionId
+ if (sessionId) {
+ cookies.set('sessionId', String(sessionId), { path: '/' })
+ const userInfoRes: UserInfoRes = await getUserInfo()
+ await userStore.setUserInfo(userInfoRes)
+ const timezone = userInfoRes.timeZone ? userInfoRes.timeZone : 'UTC'
+ await timezoneStore.setTimezone(timezone)
+ router.push('home')
+ }
+ const error = route.query.error
+ if (error) {
+ window.$message.error(error)
+ }
+
+ }
+
Review Comment:
Please delete enter.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
