7641848477

Committed 24 Jan 2024 02:43PM CUT coverage: 84.48% (+0.003%) from 84.477%

Build # 7641848477

Build Type

push

github

Committed by

web-flow

Commit Message

fix: [#4582] UserAssignedIdentity(WorkloadIdentity) auth fails with 'scope https://api.botframework.com is not valid' (#4607)

* Add scope post-fix in managedIdentityAuthenticator.

* Fix unit test

Run Details

9986 of 13105 branches covered (0.0%)

Branch coverage included in aggregate %.

3 of 3 new or added lines in 1 file covered. (100.0%)

20414 of 22880 relevant lines covered (89.22%)

7192.27 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

12.5

/libraries/botbuilder-dialogs-adaptive/src/entityAssignmentComparer.ts

/**
 * @module adaptive-expressions
 */
/**
 * Copyright (c) Microsoft Corporation. All rights reserved.
 * Licensed under the MIT License.
 */
import { AdaptiveEvents } from './adaptiveEvents';
import { EntityAssignment } from './entityAssignment';

/**
 * Compare two entity assignments to determine their relative priority.
 *
 * @remarks
 * Compare by event: assignEntity, chooseProperty, chooseEntity
 * Then by operations in order from schema (usually within assignEntity).
 * Then by unexpected before expected.
 * Then by oldest turn first.
 * Then by minimum position in utterance.
 */
export class EntityAssignmentComparer {
    private static eventPreference = [
        AdaptiveEvents.assignEntity,
        AdaptiveEvents.chooseProperty,
        AdaptiveEvents.chooseEntity,
    ];

    /**
     * Initializes a new instance of the [EntityAssignmentComparer](xref:botbuilder-dialogs-adaptive.EntityAssignmentComparer) class.
     *
     * @param operationPreference Preference on operations.
     */
    constructor(private operationPreference: string[]) {}

    /**
     * Compares [EntityAssignment](xref:botbuilder-dialogs-adaptive.EntityAssignment) x against y to determine its relative priority.
     *
     * @param x First entity assigment to compare.
     * @param y Second entity assigment to compare.
     * @returns Numerical value representing x's relative priority.
     */
    compare(x: Partial<EntityAssignment>, y: Partial<EntityAssignment>): number {
        // Order by event.
        let comparison: number =
            EntityAssignmentComparer.eventPreference.indexOf(x.event) -
            EntityAssignmentComparer.eventPreference.indexOf(y.event);
        if (comparison === 0) {
            // Order by operations.
            comparison = this.operationPreference.indexOf(x.operation) - this.operationPreference.indexOf(y.operation);
            if (comparison === 0) {
                // Unexpected before expected.
                if (x.isExpected === y.isExpected) {
                    comparison = 0;
                } else {
                    comparison = x.isExpected ? -1 : 1;
                }

                if (comparison === 0) {
                    // Order by position in utterance.
                    comparison = x.value?.start - y.value?.start;
                }
            }
        }

        return comparison;
    }
}

1	/**
2	* @module adaptive-expressions
3	*/
4	/**
5	* Copyright (c) Microsoft Corporation. All rights reserved.
6	* Licensed under the MIT License.
7	*/
8	import { AdaptiveEvents } from './adaptiveEvents';	2✔
9	import { EntityAssignment } from './entityAssignment';
10
11	/**
12	* Compare two entity assignments to determine their relative priority.
13	*
14	* @remarks
15	* Compare by event: assignEntity, chooseProperty, chooseEntity
16	* Then by operations in order from schema (usually within assignEntity).
17	* Then by unexpected before expected.
18	* Then by oldest turn first.
19	* Then by minimum position in utterance.
20	*/
21	export class EntityAssignmentComparer {	2✔
22	private static eventPreference = [	2✔
23	AdaptiveEvents.assignEntity,
24	AdaptiveEvents.chooseProperty,
25	AdaptiveEvents.chooseEntity,
26	];
27
28	/**
29	* Initializes a new instance of the [EntityAssignmentComparer](xref:botbuilder-dialogs-adaptive.EntityAssignmentComparer) class.
30	*
31	* @param operationPreference Preference on operations.
32	*/
33	constructor(private operationPreference: string[]) {}	8✔
34
35	/**
36	* Compares [EntityAssignment](xref:botbuilder-dialogs-adaptive.EntityAssignment) x against y to determine its relative priority.
37	*
38	* @param x First entity assigment to compare.
39	* @param y Second entity assigment to compare.
40	* @returns Numerical value representing x's relative priority.
41	*/
42	compare(x: Partial<EntityAssignment>, y: Partial<EntityAssignment>): number {
43	// Order by event.
44	let comparison: number =
45	EntityAssignmentComparer.eventPreference.indexOf(x.event) -	×
46	EntityAssignmentComparer.eventPreference.indexOf(y.event);
47	if (comparison === 0) {	×
48	// Order by operations.
49	comparison = this.operationPreference.indexOf(x.operation) - this.operationPreference.indexOf(y.operation);	×
50	if (comparison === 0) {	×
51	// Unexpected before expected.
52	if (x.isExpected === y.isExpected) {	×
53	comparison = 0;	×
54	} else {
55	comparison = x.isExpected ? -1 : 1;	×
56	}
57
58	if (comparison === 0) {	×
59	// Order by position in utterance.
60	comparison = x.value?.start - y.value?.start;	×
61	}
62	}
63	}
64
65	return comparison;	×
66	}
67	}

microsoft / botbuilder-js / 7641848477

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous