Skip to content

Commit ff0d2ea

Browse files
committed
Merge branch 'next' of github.com:devforth/adminforth into update-docs-fot-the-2fa
AdminForth/1304/plugins-frontend-api.-improve-
2 parents 7a94ae9 + 5e5aa93 commit ff0d2ea

3 files changed

Lines changed: 42 additions & 3 deletions

File tree

dev-demo/Taskfile.yaml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ tasks:
153153
exit 0
154154
fi
155155
156-
CI=true pnpm add adminforth@latest --save-peer
156+
CI=true pnpm add adminforth@3.0.2 --save-peer
157157
158158
git add package.json
159159
if [ -e pnpm-lock.yaml ]; then
@@ -230,4 +230,22 @@ tasks:
230230
vars:
231231
DIR: "{{.PLUGINS_DIR}}"
232232
REPOS:
233-
ref: .PLUGINS
233+
ref: .PLUGINS
234+
235+
update_adminforth_adapters:
236+
desc: Update adminforth to latest in adapter repositories, commit, and push
237+
cmds:
238+
- task: update_adminforth_repos
239+
vars:
240+
DIR: "{{.ADAPTERS_DIR}}"
241+
REPOS:
242+
ref: .ADAPTERS
243+
244+
update_adminforth_connectors:
245+
desc: Update adminforth to latest in connector repositories, commit, and push
246+
cmds:
247+
- task: update_adminforth_repos
248+
vars:
249+
DIR: "{{.CONNECTORS_DIR}}"
250+
REPOS:
251+
ref: .CONNECTORS

dev-demo/custom/SystemTest.vue

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@
2020
<Button @click="doTest2faCall">
2121
Test 2FA API Call
2222
</Button>
23+
24+
<Button @click="get2FaConfirmationResultWindow">
25+
2fa window.get2FaConfirmationResult (global window api)
26+
</Button>
27+
<Button @click="get2FaConfirmationResultTwoFactorsAuth">
28+
2fa twoFactorsAuth.get2FaConfirmationResult
29+
</Button>
2330
</div>
2431
</template>
2532

@@ -32,7 +39,9 @@ import { callApi } from '@/utils';
3239
3340
const { alert } = useAdminforth();
3441
import adminforth from '@/adminforth';
42+
import { useTwoFactorsAuth } from '@/custom/plugins/TwoFactorsAuthPlugin/use2faApi.ts';
3543
44+
const twoFactorsAuth = useTwoFactorsAuth();
3645
3746
const valueStart = ref()
3847
@@ -89,4 +98,14 @@ async function doTest2faCall() {
8998
console.error('2FA API error:', error);
9099
}
91100
}
101+
102+
async function get2FaConfirmationResultWindow() {
103+
const verificationResult = await window.adminforthTwoFaModal.get2FaConfirmationResult(); // this will ask user to enter code
104+
console.log('2FA verification result (window):', verificationResult);
105+
}
106+
107+
async function get2FaConfirmationResultTwoFactorsAuth() {
108+
const verificationResult = await twoFactorsAuth.get2FaConfirmationResult(); // this will ask user to enter code
109+
console.log('2FA verification result (twoFactorsAuth):', verificationResult);
110+
}
92111
</script>

dev-demo/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@
1616
"migrate:clickhouse": "pnpm exec clickhouse-migrations migrate --host=http://localhost:28124 --user=demo --password=demo --db=demo --migrations-home=./migrations/clickhouse_migrations",
1717
"install-plugins": "task pull_plugins && task pnpm_plugins",
1818
"install-adapters": "task pull_adapters && task pnpm_adapters",
19+
"install-connectors": "task pull_connectors && task pnpm_connectors",
1920
"pull-plugins": "task pull_plugins",
2021
"pull-adapters": "task pull_adapters",
22+
"pull-connectors": "task pull_connectors",
2123
"build-adminforth": "cd ../adminforth && pnpm i && pnpm build && pnpm link ./",
2224
"migrate:all": "pnpm migrate:sqlite && pnpm migrate:mysql && pnpm migrate:postgres && pnpm migrate:clickhouse",
2325
"preinstall": "node scripts/check-node.js",
2426
"check-docker": "node scripts/check-docker.js",
2527
"check-task": "node scripts/check-task.js",
26-
"setup-dev-demo": "[ -f .env ] || cp .env.local .env && pnpm preinstall && pnpm check-docker && pnpm check-task && pnpm build-adminforth && pnpm install-plugins && pnpm install-adapters && pnpm install && pnpm link ../adminforth && bash ./scripts/run_inventory.sh"
28+
"setup-dev-demo": "[ -f .env ] || cp .env.local .env && pnpm preinstall && pnpm check-docker && pnpm check-task && pnpm build-adminforth && pnpm install-plugins && pnpm install-adapters && pnpm install-connectors && pnpm install && pnpm link ../adminforth && bash ./scripts/run_inventory.sh"
2729
},
2830
"author": "",
2931
"license": "ISC",

0 commit comments

Comments
 (0)