diff --git a/Build/4DPop-Git.dmg b/Build/4DPop-Git.dmg index ce50e21..f6d4f41 100644 Binary files a/Build/4DPop-Git.dmg and b/Build/4DPop-Git.dmg differ diff --git a/Build/4DPop-Git.zip b/Build/4DPop-Git.zip index cd21224..cc98c4e 100644 Binary files a/Build/4DPop-Git.zip and b/Build/4DPop-Git.zip differ diff --git a/Build/Components/4DPop Git.4dbase/4DPop Git.4DZ b/Build/Components/4DPop Git.4dbase/4DPop Git.4DZ index 63573b4..9033580 100755 Binary files a/Build/Components/4DPop Git.4dbase/4DPop Git.4DZ and b/Build/Components/4DPop Git.4dbase/4DPop Git.4DZ differ diff --git a/Build/Components/4DPop Git.4dbase/Info.plist b/Build/Components/4DPop Git.4dbase/Info.plist index 4f3861c..7f0d227 100644 --- a/Build/Components/4DPop Git.4dbase/Info.plist +++ b/Build/Components/4DPop Git.4dbase/Info.plist @@ -8,13 +8,13 @@ CFBundleShortVersionString 20R7 CFBundleLongVersionString - 20R7 (184) + 20R7 (185) CFBundleGetInfoString 20R7 CFBundleDisplayName 4DPop Git CFBundleVersion - 185 + 186 NSHumanReadableCopyright ©vdl 2020-2024 diff --git a/Build/Components/4DPop Git.4dbase/Libraries/lib4d-arm64.dylib b/Build/Components/4DPop Git.4dbase/Libraries/lib4d-arm64.dylib index 5b99984..75c3302 100644 Binary files a/Build/Components/4DPop Git.4dbase/Libraries/lib4d-arm64.dylib and b/Build/Components/4DPop Git.4dbase/Libraries/lib4d-arm64.dylib differ diff --git a/Build/Components/4DPop Git.4dbase/Resources/InfoPlist.strings b/Build/Components/4DPop Git.4dbase/Resources/InfoPlist.strings index 1f89182..732918b 100755 Binary files a/Build/Components/4DPop Git.4dbase/Resources/InfoPlist.strings and b/Build/Components/4DPop Git.4dbase/Resources/InfoPlist.strings differ diff --git a/Info.plist b/Info.plist index 4f3861c..7f0d227 100755 --- a/Info.plist +++ b/Info.plist @@ -8,13 +8,13 @@ CFBundleShortVersionString 20R7 CFBundleLongVersionString - 20R7 (184) + 20R7 (185) CFBundleGetInfoString 20R7 CFBundleDisplayName 4DPop Git CFBundleVersion - 185 + 186 NSHumanReadableCopyright ©vdl 2020-2024 diff --git a/Project/Sources/Classes/GithubAPI.4dm b/Project/Sources/Classes/GithubAPI.4dm index ef2eb65..07ff8eb 100644 --- a/Project/Sources/Classes/GithubAPI.4dm +++ b/Project/Sources/Classes/GithubAPI.4dm @@ -273,59 +273,59 @@ Function AuthorizeApp() : Boolean // === === === === === === === === === === === === === === === === === === === === === === === === === === Function getAppToken() : Object - //var $param; $token : Object - //var $ws : 4D.WebServer - //var $oAuth2 : cs.NetKit.OAuth2Provider + var $param; $token : Object + var $ws : 4D:C1709.WebServer + var $oAuth2 : cs:C1710.NetKit.OAuth2Provider - //$token:=Storage.OAuth2 + $token:=Storage:C1525.OAuth2 - //If (This._IsValidAppToken($token)) - - //return $token - - //End if - - //// Start web server if any - //$ws:=WEB Server - - //If (Not($ws.isRunning)) + If (This:C1470._IsValidAppToken($token)) + + return $token + + End if - //$ws.start({\ - rootFolder: Folder(fk database folder).folder("www"); \ - HTTTPort: 8858\ - }) + // Start web server if any + $ws:=WEB Server:C1674 - //End if + If (Not:C34($ws.isRunning)) + + $ws.start({\ + rootFolder: Folder:C1567(fk database folder:K87:14).folder("www"); \ + HTTTPort: 8858\ + }) + + End if - //$param:={\ + $param:={\ token: $token; \ permission: "signedIn"; \ - clientId: This.clientId; \ - clientSecret: This.clientSecret; \ + clientId: This:C1470.clientId; \ + clientSecret: This:C1470.clientSecret; \ redirectURI: "http://127.0.0.1:50993/authorize/"; \ scope: "repo, user"; \ authenticateURI: "https://github.com/login/oauth/authorize"; \ tokenURI: "https://github.com/login/oauth/access_token"; \ timeout: 60; \ - authenticationPage: Folder($ws.rootFolder).file("authentication.htm"); \ - authenticationErrorPage: Folder($ws.rootFolder).file("error.htm")\ + authenticationPage: Folder:C1567($ws.rootFolder).file("authentication.htm"); \ + authenticationErrorPage: Folder:C1567($ws.rootFolder).file("error.htm")\ } - //$oAuth2:=cs.NetKit.OAuth2Provider.new($param) - - //$token:=$oAuth2.getToken() - //This.success:=$token#Null - - //If (This.success) + $oAuth2:=cs:C1710.NetKit.OAuth2Provider.new($param) - //Use (Storage) + $token:=$oAuth2.getToken() + This:C1470.success:=$token#Null:C1517 - //Storage.OAuth2:=OB Copy($token; ck shared) - - //End use - //End if + If (This:C1470.success) + + Use (Storage:C1525) + + Storage:C1525.OAuth2:=OB Copy:C1225($token; ck shared:K85:29) + + End use + End if - //return $token + return $token // *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** Function _IsValidAppToken($token : Object) : Boolean diff --git a/Resources/InfoPlist.strings b/Resources/InfoPlist.strings index 1f89182..732918b 100755 Binary files a/Resources/InfoPlist.strings and b/Resources/InfoPlist.strings differ