v2.0.1

- Multiple tries at initial oauth request
- Use correct version number in request headers

Author: hwalker56

.gitignore

@@ -0,0 +1,4 @@
+build/
+.vscode/
+*.elf
+*.dol

CMakeLists.txt

@@ -15,6 +15,7 @@ set(CMAKE_ASM_FLAGS "-x assembler-with-cpp")
 set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused-function -O2 ${CMAKE_CXX_FLAGS} ${MACHDEP}")
 set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-function -O2 ${CMAKE_CXX_FLAGS} ${MACHDEP} -fdiagnostics-color")
 set(CMAKE_EXECUTABLE_SUFFIX ".elf")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/apps/wiilink-account-linker")
 
 include_directories(${LIBOGCDIR}/include)
 include_directories(${DEVKITPRO}/portlibs/wii/include)
@@ -38,5 +39,5 @@ add_executable(WiiLinkAccountLinker
 )
 
 target_link_libraries(WiiLinkAccountLinker
-        PRIVATE curl wiisocket mbedtls mbedcrypto mbedx509 wiiuse bte asnd ogc qrencode z bz2
+        PRIVATE curl wiisocket mbedtls mbedcrypto mbedx509 wiiuse bte asnd ogc z
 )

apps/wiilink-account-linker/icon.png

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<app version="1">
+	<name>WiiLink Account Linker</name>
+	<version>v2.0.1</version>
+	<release_date>20251115000000</release_date>
+	<coder>Sketch</coder>
+	<short_description>Links your Wii to your WiiLink Account!</short_description>
+	<long_description>
+</long_description>
+<ahb_access/>
+</app>

apps/wiilink-account-linker/meta.xml

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+mkdir -p build
+cd build
+cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE=../toolchain-powerpc.cmake -G Ninja ..
+ninja

build.sh

@@ -9,14 +9,22 @@ bool OAuth::StartDeviceFlow() {
   const std::string post_data = std::format("client_id={}&scope=openid+profile+email+goauthentik.io/api", CLIENT_ID);
 
   std::vector<std::string> headers = {
-    "User-Agent: WiiLink Account Linker v0.1",
+    std::format("User-Agent: WiiLink Account Linker {}", version),
     "Content-Type: application/x-www-form-urlencoded"
 };
 
-  m_response = http_post(DEVICE_PATH, post_data, headers);
-  if (m_response.status_code != 200 || m_response.curl_code != CURLE_OK) {
-    // JSON will probably be empty. Return and display message.
-    return false;
+  for (int tries = 0; tries < 5; tries++) {
+    // We do multiple tries here, as sometimes SSO returns 502 for whatever reason
+    m_response = http_post(DEVICE_PATH, post_data, headers);
+
+    if (m_response.status_code == 200 && m_response.curl_code == CURLE_OK) {
+      break;
+    }
+
+    if (tries == 4) {
+      // JSON will probably be empty. Return and display message.
+      return false;
+    }
   }
 
   m_device_code = m_response.j["device_code"];
@@ -46,7 +54,7 @@ std::string OAuth::GetErrorMessage() const{
 bool OAuth::PollToken() {
   const std::string post_data = std::format("grant_type=urn:ietf:params:oauth:grant-type:device_code&client_id={}&device_code={}", CLIENT_ID, GetDeviceCode());
   std::vector<std::string> headers = {
-          "User-Agent: WiiLink Account Linker v0.1",
+          std::format("User-Agent: WiiLink Account Linker {}", version),
           "Content-Type: application/x-www-form-urlencoded"
   };
 
@@ -67,7 +75,7 @@ bool OAuth::PollToken() {
 
 bool OAuth::PerformLink(std::string_view wwfc_cert) {
   std::vector<std::string> headers = {
-    "User-Agent: WiiLink Account Linker v0.1",
+    std::format("User-Agent: WiiLink Account Linker {}", version),
     "Accept: application/json",
     "Content-Type: application/x-www-form-urlencoded",
     std::format("Authorization: {}", m_access_token),

oauth.cpp

@@ -6,6 +6,8 @@
 #include <vector>
 #include <iostream>
 
+const std::string version = "v2.0.1";
+
 struct File {
     void* data;
     size_t size;
@@ -23,7 +25,7 @@ inline void PrintHeader() {
     std::cout << std::endl;
     std::cout << std::endl;
     std::cout << "WiiLink Account Linker - (c) 2025 WiiLink" << std::endl;
-    std::cout << "v2.0" << std::endl;
+    std::cout << version << std::endl;
     std::cout << std::endl;
 }