Skip to content

[ID-3557, ID-3579][DO NOT MERGE] feat: remove device code auth #487

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.

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

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
VALIDATE_ALL_CODEBASE: true
DEFAULT_BRANCH: main
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
FILTER_REGEX_EXCLUDE: (.*src/Packages/Passport/Runtime/ThirdParty/.*|.*src/Packages/Passport/Runtime/Resources/.*|.*Plugins/.*|.*src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/.*|.*src/Packages/Orderbook|.*src/Packages/ZkEvmApi/.*|.*sample|.*src/Packages/Passport/WebGLTemplates~|.*.github/workflows)
FILTER_REGEX_EXCLUDE: (.*src/Packages/Passport/Runtime/ThirdParty/.*|.*src/Packages/Passport/Runtime/Resources/.*|.*Plugins/.*|.*src/Packages/Passport/Runtime/Assets/ImmutableAndroid.androidlib/.*|.*src/Packages/Orderbook|.*src/Packages/ZkEvmApi/.*|.*sample|.*src/Packages/Passport/WebGLTemplates~|.*.github/workflows|.*src/Packages/Passport/Samples~)
VALIDATE_MARKDOWN: false
VALIDATE_GITLEAKS: false
VALIDATE_JSCPD: false
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,6 @@ sample/Assets/Vuplex*

__pycache__/
*.pyc
.pytest_cache/
.pytest_cache/

xcuserdata/
2 changes: 1 addition & 1 deletion Plugins/Mac/Sources/ImmutableWebView.mm
Original file line number Diff line number Diff line change
Expand Up @@ -424,5 +424,5 @@ void _CImmutableWebViewPlugin_LaunchAuthURL(void *instance, const char *url, con
if (instance == NULL)
return;
CWebViewPlugin *webViewPlugin = (__bridge CWebViewPlugin *)instance;
[webViewPlugin launchAuthURL:url redirectUri: redirectUri];
[webViewPlugin launchAuthURL:url redirectUri:redirectUri];
}
1 change: 0 additions & 1 deletion Plugins/Mac/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ mkdir -p $DSTDIR

cp -r DerivedData/ImmutableWebView.bundle $DSTDIR
rm -rf DerivedData
cp *.bundle.meta $DSTDIR
17 changes: 16 additions & 1 deletion sample/Assets/Editor/MacBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ private static void BuildPlayer(string defaultBuildPath, BuildOptions buildOptio
{
// Clean up AltTester settings after build
AltBuilder.RemoveAltTesterFromScriptingDefineSymbols(BuildTargetGroup.Standalone);

// Clean up custom e2e testing define
var defineSymbols = PlayerSettings.GetScriptingDefineSymbolsForGroup(BuildTargetGroup.Standalone);
defineSymbols = defineSymbols.Replace("IMMUTABLE_E2E_TESTING;", "").Replace(";IMMUTABLE_E2E_TESTING", "").Replace("IMMUTABLE_E2E_TESTING", "");
PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildTargetGroup.Standalone, defineSymbols);

RemoveAltFromScene(buildPlayerOptions.scenes[0]);
}
}
Expand Down Expand Up @@ -66,7 +72,7 @@ private static BuildPlayerOptions CreateBuildPlayerOptions(string buildPath, Bui
{
scenes = new[]
{
"Assets/Scenes/Passport/SelectAuthMethod.unity",
"Assets/Scenes/Passport/Initialisation.unity",
"Assets/Scenes/Passport/UnauthenticatedScene.unity",
"Assets/Scenes/Passport/AuthenticatedScene.unity",
"Assets/Scenes/Passport/ZkEvm/ZkEvmGetBalance.unity",
Expand All @@ -85,6 +91,15 @@ private static BuildPlayerOptions CreateBuildPlayerOptions(string buildPath, Bui
private static void SetupAltTester(BuildPlayerOptions buildPlayerOptions)
{
AltBuilder.AddAltTesterInScriptingDefineSymbolsGroup(BuildTargetGroup.Standalone);

// Add custom define for e2e testing to enable default browser behavior
var defineSymbols = PlayerSettings.GetScriptingDefineSymbolsForGroup(BuildTargetGroup.Standalone);
if (!defineSymbols.Contains("IMMUTABLE_E2E_TESTING"))
{
defineSymbols += ";IMMUTABLE_E2E_TESTING";
PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildTargetGroup.Standalone, defineSymbols);
}

AltBuilder.CreateJsonFileForInputMappingOfAxis();

var instrumentationSettings = new AltInstrumentationSettings();
Expand Down
2 changes: 1 addition & 1 deletion sample/Assets/Editor/MobileBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ private static BuildPlayerOptions CreateBuildPlayerOptions(string buildPath, Bui
{
scenes = new[]
{
"Assets/Scenes/Passport/SelectAuthMethod.unity",
"Assets/Scenes/Passport/Initialisation.unity",
"Assets/Scenes/Passport/UnauthenticatedScene.unity",
"Assets/Scenes/Passport/AuthenticatedScene.unity",
"Assets/Scenes/Passport/ZkEvm/ZkEvmGetBalance.unity",
Expand Down
2 changes: 1 addition & 1 deletion sample/Assets/Editor/WindowsBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ private static BuildPlayerOptions CreateBuildPlayerOptions(string buildPath, Bui
{
scenes = new[]
{
"Assets/Scenes/Passport/SelectAuthMethod.unity",
"Assets/Scenes/Passport/Initialisation.unity",
"Assets/Scenes/Passport/UnauthenticatedScene.unity",
"Assets/Scenes/Passport/AuthenticatedScene.unity",
"Assets/Scenes/Passport/ZkEvm/ZkEvmGetBalance.unity",
Expand Down
4 changes: 2 additions & 2 deletions sample/Assets/Scenes/Passport/AuthenticatedScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -1218,7 +1218,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 66309839}
m_HandleRect: {fileID: 66309838}
m_Direction: 0
m_Value: 1
m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
Expand Down Expand Up @@ -3092,7 +3092,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1741513413}
m_Direction: 2
m_Value: 1
m_Size: 0.99999994
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
Expand Down
Loading
Loading