Skip to content

FOUR-14137 - Enable External Integration with BambooHR (develop) #6348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryancooley merged 9 commits into from
Mar 9, 2024
Merged

FOUR-14137 - Enable External Integration with BambooHR (develop) #6348

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d0f1e4c
Apply eslint in SettingDriverAuthorization component
eiresendez Jan 4, 2024
6fae3e8
Add AuthSchemes connection components
eiresendez Jan 4, 2024
0be7eb7
Fix typo in import statement and update component name
eiresendez Jan 5, 2024
8f63a94
Add BamboohrConnectionProperties component
eiresendez Jan 8, 2024
990bf81
Update authorization button and remove unnecessary code
eiresendez Jan 8, 2024
9c4db26
Update authorization logic
eiresendez Jan 9, 2024
b229b22
Update connection properties components
eiresendez Jan 10, 2024
0d0e5fa
Fix authentication scheme console error and update connection properties
eiresendez Jan 11, 2024
037abd5
Refactor driver authorization logic when AuthScheme is None
eiresendez Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add AuthSchemes connection components
  • Loading branch information
@eiresendez
eiresendez committed Mar 6, 2024
commit 6fae3e86ca1fa0cbb403afbb4d472ef57204f3e1
146 changes: 23 additions & 123 deletions resources/js/admin/settings/components/SettingDriverAuthorization.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</b-badge>
</div>
<div v-else>
Empty
{{ $t("Empty") }}
</div>
<b-modal
v-model="showModal"
Expand All @@ -28,9 +28,9 @@
<span v-if="setting.name">{{ $t(setting.name) }}</span>
<span v-else>{{ $t(setting.key) }}</span>
</h5>
<small class="form-text text-muted">{{
$t("Configure the driver connection properties.")
}}</small>
<small class="form-text text-muted">
{{ $t("Configure the driver connection properties.") }}
</small>
</div>
<button
type="button"
Expand All @@ -42,104 +42,11 @@
</button>
</template>
<div>
<b-form-group
required
:label="$t('Client ID')"
:description="
formDescription(
'The client ID assigned when you register your application.',
'client_id',
errors
)
"
:invalid-feedback="errorMessage('client_id', errors)"
:state="errorState('client_id', errors)"
>
<b-form-input
v-model="formData.client_id"
required
autofocus
autocomplete="off"
:state="errorState('client_id', errors)"
name="client_id"
data-cy="client_id"
/>
</b-form-group>

<b-form-group
required
:label="$t('Client Secret')"
:description="
formDescription(
'The client secret assigned when you register your application.',
'client_secret',
errors
)
"
:invalid-feedback="errorMessage('client_secret', errors)"
:state="errorState('client_secret', errors)"
>
<b-input-group>
<b-form-input
v-model="formData.client_secret"
required
autofocus
autocomplete="off"
trim
:type="type"
:state="errorState('client_secret', errors)"
name="client_secret"
data-cy="client_secret"
/>
<b-input-group-append>
<b-button
:aria-label="$t('Toggle Show Password')"
variant="secondary"
@click="togglePassword"
>
<i
class="fas"
:class="icon"
/>
</b-button>
</b-input-group-append>
</b-input-group>
</b-form-group>

<b-form-group
required
:label="$t('Redirect URL')"
:description="
formDescription(
'This value must match the callback URL you specify in your app settings.',
'callback_url',
errors
)
"
:invalid-feedback="errorMessage('callback_url', errors)"
:state="errorState('callback_url', errors)"
>
<b-input-group>
<b-form-input
v-model="formData.callback_url"
autofocus
readonly
autocomplete="off"
:state="errorState('callback_url', errors)"
name="callback_url"
data-cy="callback_url"
/>
<b-input-group-append>
<b-button
:aria-label="$t('Copy')"
variant="secondary"
@click="onCopy"
>
<i class="fas fa-copy" />
</b-button>
</b-input-group-append>
</b-input-group>
</b-form-group>
<component
:is="authSchemeToComponent(setting.config.AuthScheme)"
:form-data="formData"
@updateFormData="updateFormData"
/>

<additional-driver-connection-properties
:driver-key="setting?.key"
Expand Down Expand Up @@ -193,9 +100,15 @@
import { FormErrorsMixin, Required } from "SharedComponents";
import settingMixin from "../mixins/setting";
import AdditionalDriverConnectionProperties from "./AdditionalDriverConnectionProperties.vue";
import OAuthConnectionProperties from "./cdata/OauthConnectionProperties.vue";
import NoneConnectionProperties from "./cdata/NoneConnectionProperties.vue";

export default {
components: { AdditionalDriverConnectionProperties },
components: {
AdditionalDriverConnectionProperties,
OAuthConnectionProperties,
NoneConnectionProperties,
},
mixins: [settingMixin, FormErrorsMixin, Required],
props: {
setting: {
Expand All @@ -210,11 +123,7 @@ export default {
data() {
return {
input: "",
formData: {
client_id: "",
client_secret: "",
callback_url: "",
},
formData: {},
selected: null,
showModal: false,
showAuthorizingModal: false,
Expand All @@ -223,6 +132,10 @@ export default {
isInvalid: true,
type: "password",
resetData: true,
componentsMap: {
OAuth: "oauth-connection-properties",
None: "none-connection-properties",
},
};
},
computed: {
Expand Down Expand Up @@ -270,21 +183,8 @@ export default {
this.transformed = this.copy(this.formData);
},
methods: {
onCopy() {
navigator.clipboard.writeText(this.formData.callback_url).then(
() => {
ProcessMaker.alert(
this.$t("The setting was copied to your clipboard."),
"success",
);
},
() => {
ProcessMaker.alert(
this.$t("The setting was not copied to your clipboard."),
"danger",
);
},
);
authSchemeToComponent(scheme) {
return this.componentsMap[scheme] || null;
},
togglePassword() {
if (this.type === "text") {
Expand Down
21 changes: 21 additions & 0 deletions resources/js/admin/settings/components/cdata/NoneConnectionProperties.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<template>
<div />
</template>
<script>
export default {
props: {
formData: {
type: Object,
default: () => ({}),
},
},
data() {
return {
config: {},
};
},
mounted() {
this.config = this.formData;
},
};
</script>
149 changes: 149 additions & 0 deletions resources/js/admin/settings/components/cdata/OauthConnectionProperties.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
<template>
<div>
<b-form-group
required
:label="$t('Client ID')"
:description="
formDescription(
'The client ID assigned when you register your application.',
'client_id',
errors
)
"
:invalid-feedback="errorMessage('client_id', errors)"
:state="errorState('client_id', errors)"
>
<b-form-input
v-model="config.client_id"
required
autofocus
autocomplete="off"
:state="errorState('client_id', errors)"
name="client_id"
data-cy="client_id"
/>
</b-form-group>

<b-form-group
required
:label="$t('Client Secret')"
:description="
formDescription(
'The client secret assigned when you register your application.',
'client_secret',
errors
)
"
:invalid-feedback="errorMessage('client_secret', errors)"
:state="errorState('client_secret', errors)"
>
<b-input-group>
<b-form-input
v-model="config.client_secret"
required
autofocus
autocomplete="off"
trim
:type="type"
:state="errorState('client_secret', errors)"
name="client_secret"
data-cy="client_secret"
/>
<b-input-group-append>
<b-button
:aria-label="$t('Toggle Show Password')"
variant="secondary"
@click="togglePassword"
>
<i
class="fas"
:class="icon"
/>
</b-button>
</b-input-group-append>
</b-input-group>
</b-form-group>

<b-form-group
required
:label="$t('Redirect URL')"
:description="
formDescription(
'This value must match the callback URL you specify in your app settings.',
'callback_url',
errors
)
"
:invalid-feedback="errorMessage('callback_url', errors)"
:state="errorState('callback_url', errors)"
>
<b-input-group>
<b-form-input
v-model="config.callback_url"
autofocus
readonly
autocomplete="off"
:state="errorState('callback_url', errors)"
name="callback_url"
data-cy="callback_url"
/>
<b-input-group-append>
<b-button
:aria-label="$t('Copy')"
variant="secondary"
@click="onCopy"
>
<i class="fas fa-copy" />
</b-button>
</b-input-group-append>
</b-input-group>
</b-form-group>
</div>
</template>
<script>
// eslint-disable-next-line import/no-unresolved
import { FormErrorsMixin } from "SharedComponents";

export default {
mixins: [FormErrorsMixin],
props: {
formData: {
type: Object,
default: () => ({}),
},
},
data() {
return {
config: {
client_id: "",
client_secret: "",
callback_url: "",
},
errors: {},
};
},
watch: {
config: {
deep: true,
handler() {
this.$emit("updateFormData", this.config);
},
},
},
mounted() {
this.config = this.formData;
this.$emit("updateFormData", this.config);
},
methods: {
onCopy() {
this.$copyText(this.config.callback_url).then(() => {
this.$bvToast.toast(this.$t("Copied"), {
title: this.$t("Success"),
variant: "success",
solid: true,
});
});
},
},
};
</script>