Add domainId support to OAuth provider

Author: Daman Arora

ui/src/config/section/config.js

@@ -79,8 +79,8 @@ export default {
       icon: 'login-outlined',
       docHelp: 'adminguide/accounts.html#using-an-ldap-server-for-user-authentication',
       permission: ['listOauthProvider'],
-      columns: ['provider', 'enabled', 'description', 'clientid', 'secretkey', 'redirecturi'],
-      details: ['provider', 'description', 'enabled', 'clientid', 'secretkey', 'redirecturi'],
+      columns: ['provider', 'enabled', 'description', 'clientid', 'secretkey', 'redirecturi', 'domainid'],
+      details: ['provider', 'description', 'enabled', 'clientid', 'secretkey', 'redirecturi', 'domainid'],
       actions: [
         {
           api: 'registerOauthProvider',
@@ -89,7 +89,7 @@ export default {
           listView: true,
           dataView: false,
           args: [
-            'provider', 'description', 'clientid', 'redirecturi', 'secretkey'
+            'provider', 'description', 'clientid', 'redirecturi', 'secretkey', 'domainid'
           ],
           mapping: {
             provider: {

ui/src/views/auth/Login.vue

@@ -311,6 +311,18 @@ export default {
           this.form.idp = this.idps[0].id || ''
         }
       })
+      this.fetchOauthProviders()
+      postAPI('forgotPassword', {}).then(response => {
+        this.forgotPasswordEnabled = response.forgotpasswordresponse.enabled
+      }).catch((err) => {
+        if (err?.response?.data === null) {
+          this.forgotPasswordEnabled = true
+        } else {
+          this.forgotPasswordEnabled = false
+        }
+      })
+    },
+    fetchOauthProviders () {
       getAPI('listOauthProvider', {}).then(response => {
         if (response) {
           const oauthproviders = response.listoauthproviderresponse.oauthprovider || []
@@ -329,15 +341,6 @@ export default {
           this.socialLogin = this.googleprovider || this.githubprovider
         }
       })
-      postAPI('forgotPassword', {}).then(response => {
-        this.forgotPasswordEnabled = response.forgotpasswordresponse.enabled
-      }).catch((err) => {
-        if (err?.response?.data === null) {
-          this.forgotPasswordEnabled = true
-        } else {
-          this.forgotPasswordEnabled = false
-        }
-      })
     },
     // handler
     async handleUsernameOrEmail (rule, value) {

ui/src/views/dashboard/VerifyOauth.vue

@@ -47,7 +47,7 @@ export default {
       const code = params.get('code')
       const provider = this.$localStorage.get(OAUTH_PROVIDER)
       this.state.loginBtn = true
-      getAPI('verifyOAuthCodeAndGetUser', { provider: provider, secretcode: code }).then(response => {
+      getAPI('verifyOAuthCodeAndGetUser', { provider: provider, secretcode: code, domain: this.$localStorage.get(OAUTH_DOMAIN) }).then(response => {
         const email = response.verifyoauthcodeandgetuserresponse.oauthemail.email
         const loginParams = {}
         loginParams.email = email